From bab2f5e14df0c4e9437adfb0b74525d81a6b1a84 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Wed, 7 Oct 2020 19:14:39 -0400
Subject: [PATCH] v0.9.0a: upgrade gradle plugin and R8 config

---
 android/proguard-rules.pro | 4 ++++
 build.gradle               | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
index ee95a4f0a..bc0e5d0db 100644
--- a/android/proguard-rules.pro
+++ b/android/proguard-rules.pro
@@ -2,6 +2,10 @@
 -keepnames class com.shatteredpixel.** { *; }
 -keepnames class com.watabou.** { *; }
 
+# keep members of classes that are instantiated via reflection
+-keepclassmembers class * extends com.watabou.glscripts.Script
+-keepclassmembers class * implements com.watabou.utils.Bundlable
+
 # retained to support meaningful stack traces
 # note that the mapping file must be referenced in order to make sense of line numbers
 # mapping file can be found in core/build/outputs/mapping after running a release build
diff --git a/build.gradle b/build.gradle
index c0b4da671..f3ee41dc7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        //FIXME the version of R8 coming with gradle plugin 4.0.0 causes serious problems
-        //noinspection GradleDependency
-        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath 'com.android.tools.build:gradle:4.0.2'
     }
 }