Skip to content

Commit c81c90b

Browse files
authored
Merge pull request #284 from hotwired/fix-build
Fix R8 build issues
2 parents b6f750f + c4709d2 commit c81c90b

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.0.0'
10+
classpath 'com.android.tools.build:gradle:8.1.0'
1111
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
1212
}
1313
}

turbo/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ android {
7272

7373
dependencies {
7474
implementation fileTree(dir: 'libs', include: ['*.jar'])
75-
implementation 'org.jetbrains.kotlin:kotlin-reflect:1.8.0'
76-
implementation 'com.google.android.material:material:1.8.0'
75+
implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.0'
76+
implementation 'com.google.android.material:material:1.9.0'
7777

7878
// AndroidX
7979
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
@@ -84,12 +84,12 @@ dependencies {
8484
implementation 'com.google.code.gson:gson:2.10.1'
8585

8686
// Networking/API
87-
implementation 'com.squareup.okhttp3:okhttp:4.10.0'
88-
implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
87+
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
88+
implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0'
8989

9090
// Coroutines
91-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
92-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
91+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
92+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
9393

9494
// Exported AndroidX dependencies
9595
api 'androidx.appcompat:appcompat:1.6.1'
@@ -104,12 +104,12 @@ dependencies {
104104
testImplementation 'androidx.test:core:1.5.0' // Robolectric
105105
testImplementation 'androidx.navigation:navigation-testing:2.5.3'
106106
testImplementation 'androidx.arch.core:core-testing:2.2.0'
107-
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
107+
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
108108
testImplementation 'org.assertj:assertj-core:3.24.2'
109109
testImplementation 'org.robolectric:robolectric:4.9.2'
110-
testImplementation 'org.mockito:mockito-core:4.11.0'
110+
testImplementation 'org.mockito:mockito-core:5.2.0'
111111
testImplementation 'com.nhaarman:mockito-kotlin:1.6.0'
112-
testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0'
112+
testImplementation 'com.squareup.okhttp3:mockwebserver:4.11.0'
113113
testImplementation 'junit:junit:4.13.2'
114114
}
115115

turbo/proguard-consumer-rules.pro

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@
1515
-keep class sun.misc.Unsafe { *; }
1616

1717
-keep class dev.hotwire.turbo.** { *; }
18+
19+
# Resolve R8 issue: "ERROR: R8: Missing class java.lang.invoke.StringConcatFactory"
20+
-dontwarn java.lang.invoke.StringConcatFactory

turbo/proguard-rules.pro

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@
2424
-keep class sun.misc.Unsafe { *; }
2525

2626
-keep class dev.hotwire.turbo.** { *; }
27+
28+
# Resolve R8 issue: "ERROR: R8: Missing class java.lang.invoke.StringConcatFactory"
29+
-dontwarn java.lang.invoke.StringConcatFactory

0 commit comments

Comments
 (0)