Merge pull request #284 from hotwired/fix-build

Fix R8 build issues
hotwired · Aug 29, 2023 · c81c90b · c81c90b
2 parents b6f750f + c4709d2
commit c81c90b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
     }
 }

diff --git a/turbo/build.gradle b/turbo/build.gradle
@@ -72,8 +72,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.8.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.0'
+    implementation 'com.google.android.material:material:1.9.0'
 
     // AndroidX
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
@@ -84,12 +84,12 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.10.1'
 
     // Networking/API
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0'
 
     // Coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
 
     // Exported AndroidX dependencies
     api 'androidx.appcompat:appcompat:1.6.1'
@@ -104,12 +104,12 @@ dependencies {
     testImplementation 'androidx.test:core:1.5.0' // Robolectric
     testImplementation 'androidx.navigation:navigation-testing:2.5.3'
     testImplementation 'androidx.arch.core:core-testing:2.2.0'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation 'org.robolectric:robolectric:4.9.2'
-    testImplementation 'org.mockito:mockito-core:4.11.0'
+    testImplementation 'org.mockito:mockito-core:5.2.0'
     testImplementation 'com.nhaarman:mockito-kotlin:1.6.0'
-    testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0'
+    testImplementation 'com.squareup.okhttp3:mockwebserver:4.11.0'
     testImplementation 'junit:junit:4.13.2'
 }
 

diff --git a/turbo/proguard-consumer-rules.pro b/turbo/proguard-consumer-rules.pro
@@ -15,3 +15,6 @@
 -keep class sun.misc.Unsafe { *; }
 
 -keep class dev.hotwire.turbo.** { *; }
+
+# Resolve R8 issue: "ERROR: R8: Missing class java.lang.invoke.StringConcatFactory"
+-dontwarn java.lang.invoke.StringConcatFactory
diff --git a/turbo/proguard-rules.pro b/turbo/proguard-rules.pro
@@ -24,3 +24,6 @@
 -keep class sun.misc.Unsafe { *; }
 
 -keep class dev.hotwire.turbo.** { *; }
+
+# Resolve R8 issue: "ERROR: R8: Missing class java.lang.invoke.StringConcatFactory"
+-dontwarn java.lang.invoke.StringConcatFactory