Enable desugaring on all projects

kylecorry31 · Jan 6, 2024 · ec5f9e8 · ec5f9e8
1 parent cfaeb35
commit ec5f9e8
Show file tree

Hide file tree

Showing 21 changed files with 38 additions and 41 deletions.
diff --git a/alerts/build.gradle b/alerts/build.gradle
@@ -29,6 +29,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -60,6 +61,7 @@ dependencies {
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
     implementation "androidx.appcompat:appcompat:${appCompatVersion}"
     implementation "com.google.android.material:material:${materialVersion}"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/battery/build.gradle b/battery/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -56,6 +57,7 @@ afterEvaluate {
 dependencies {
     implementation project(path: ':core')
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/canvas/build.gradle b/canvas/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -55,6 +56,7 @@ afterEvaluate {
 
 dependencies {
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/clipboard/build.gradle b/clipboard/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -56,6 +57,7 @@ afterEvaluate {
 dependencies {
     implementation project(':alerts')
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/compression/build.gradle b/compression/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -55,6 +56,7 @@ afterEvaluate {
 
 dependencies {
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/csv/build.gradle b/csv/build.gradle
@@ -32,6 +32,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -62,6 +63,7 @@ dependencies {
     implementation project(':core')
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
     implementation 'com.github.doyaaaaaken:kotlin-csv-jvm:1.9.2'
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'org.junit.platform:junit-platform-runner:1.10.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.1'

diff --git a/files/build.gradle b/files/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -57,6 +58,7 @@ dependencies {
     implementation project(':core')
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${coroutinesVersion}"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/forms/build.gradle b/forms/build.gradle
@@ -29,6 +29,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -61,6 +62,7 @@ dependencies {
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
     implementation "androidx.appcompat:appcompat:${appCompatVersion}"
     implementation "com.google.android.material:material:${materialVersion}"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/json/build.gradle b/json/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -58,6 +59,7 @@ dependencies {
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
     testImplementation 'junit:junit:4.13.2'
     implementation 'com.google.code.gson:gson:2.10.1'
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/list/build.gradle b/list/build.gradle
@@ -29,6 +29,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -59,6 +60,7 @@ dependencies {
     implementation project(':core')
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/markdown/build.gradle b/markdown/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -58,6 +59,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     implementation "io.noties.markwon:core:4.6.2"
     implementation "io.noties.markwon:linkify:4.6.2"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/print/build.gradle b/print/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -58,6 +59,7 @@ dependencies {
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${coroutinesVersion}"
     implementation 'androidx.print:print:1.0.0'
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/qr/build.gradle b/qr/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -56,6 +57,7 @@ afterEvaluate {
 dependencies {
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
     implementation 'com.google.zxing:core:3.5.2'
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/signal/src/androidTest/java/com/kylecorry/andromeda/signal/ExampleInstrumentedTest.kt b/signal/src/androidTest/java/com/kylecorry/andromeda/signal/ExampleInstrumentedTest.kt
diff --git a/signal/src/test/java/com/kylecorry/andromeda/signal/ExampleUnitTest.kt b/signal/src/test/java/com/kylecorry/andromeda/signal/ExampleUnitTest.kt
diff --git a/sms/build.gradle b/sms/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -56,6 +57,7 @@ afterEvaluate {
 dependencies {
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
     implementation project(path: ':core')
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/speech/build.gradle b/speech/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -56,6 +57,7 @@ afterEvaluate {
 dependencies {
     implementation project(':core')
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/tensorflow/build.gradle b/tensorflow/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -58,4 +59,5 @@ dependencies {
     implementation "org.tensorflow:tensorflow-lite-support:0.4.4"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${coroutinesVersion}"
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
 }
diff --git a/torch/build.gradle b/torch/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -56,6 +57,7 @@ afterEvaluate {
 dependencies {
     implementation project(':core')
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/wkt/build.gradle b/wkt/build.gradle
@@ -32,6 +32,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -60,6 +61,7 @@ afterEvaluate {
 
 dependencies {
     implementation project(':core')
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'org.junit.platform:junit-platform-runner:1.10.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.1'

diff --git a/xml/build.gradle b/xml/build.gradle
@@ -27,6 +27,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -56,6 +57,7 @@ afterEvaluate {
 dependencies {
     implementation project(':core')
     implementation "androidx.core:core-ktx:${coreKtxVersion}"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarVersion}"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'