From b1f28eec0845b064eb310eca4b1fa9f17a47639e Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Thu, 18 Jun 2020 16:48:04 -0400
Subject: [PATCH] v0.8.1: reverted to build tools v3.6 (4.0 causes errors)

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

diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
index 0ff03e0ff..eaaaeb646 100644
--- a/android/proguard-rules.pro
+++ b/android/proguard-rules.pro
@@ -2,10 +2,6 @@
 -keepnames class com.shatteredpixel.** { *; }
 -keepnames class com.watabou.** { *; }
 
-# For some reason optimizing shader classes causes visual errors on AGP 4.0
-# TODO check this every so often, might be a bug that gets resolved
--keep class com.watabou.noosa.NoosaScript* { *; }
-
 # 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 ea99949df..246ee8c90 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        //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.3'
     }
 }