Fix r8 build error

Drjacky · Aug 7, 2023 · 6909b49 · 6909b49
1 parent 11cc901
commit 6909b49
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -19,3 +19,5 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-dontwarn com.google.errorprone.annotations.**
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,8 +11,12 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+        maven {
+            url = uri("https://storage.googleapis.com/r8-releases/raw")
+        }
     }
     dependencies {
+        classpath(app.web.drjackycv.buildsrc.Depends.ClassPaths.r8)
         classpath(app.web.drjackycv.buildsrc.Depends.ClassPaths.gradle)
         classpath(
             kotlin(

diff --git a/buildSrc/src/main/kotlin/app/web/drjackycv/buildsrc/Depends.kt b/buildSrc/src/main/kotlin/app/web/drjackycv/buildsrc/Depends.kt
@@ -6,7 +6,8 @@ object Depends {
 
     object Versions {
         const val appVersionCode = 1_000_000
-        const val gradleVersion = "8.2.0-alpha14"
+        const val r8Version = "8.1.56"
+        const val gradleVersion = "8.2.0-alpha15"
         const val androidCompileSdkVersion = 33
         const val targetSdkVersion = 33
         const val minSdkVersion = 21
@@ -37,7 +38,7 @@ object Depends {
         const val timberVersion = "5.0.1"
         const val lottieVersion = "4.2.2"
         const val glideVersion = "4.14.2"
-        const val autoDispose = "2.1.1"
+        const val autoDispose = "2.2.1"
         const val dataStorePreferenceVersion = "1.0.0"
         const val coroutinesAndroidVersion = "1.6.4"
 
@@ -62,6 +63,7 @@ object Depends {
     }
 
     object ClassPaths {
+        const val r8 = "com.android.tools:r8:${Versions.r8Version}"
         const val gradle = "com.android.tools.build:gradle:${Versions.gradleVersion}"
         const val kotlin_gradle_plugin = "gradle-plugin"
         const val navigation_safe_args_gradle_plugin =

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx1536m -XX:+UseParallelGC
+org.gradle.jvmargs=-Xms1536m -Xmx4096m -XX:+UseParallelGC
 kotlin.code.style=official
 android.useAndroidX=true
 #android.enableJetifier=true
@@ -14,4 +14,5 @@ android.nonFinalResIds=false
 #android.enableR8=true
 #android.databinding.enableV2=true
 #kapt.use.worker.api=false
-#kotlin.incremental=false
+#kotlin.incremental=false
+android.enableR8.fullMode=false