Twelve: Exclude compile time dependencies for guava
j2objc-annotations and checker-qual are only needed when
compiling guava.
However, because of a bug they get pulled in by guava.
Change-Id: Ib59c2ca3ceff7c15bbff1bf61e8b00fce97f3733
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5c26ffe..b3fe070 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -102,7 +102,11 @@
implementation(libs.androidx.viewpager2)
implementation(libs.coil)
implementation(libs.coil.network.okhttp)
- implementation(libs.kotlinx.coroutines.guava)
+ implementation(libs.kotlinx.coroutines.guava) {
+ // Exclude compile time dependencies
+ exclude("com.google.j2objc", "j2objc-annotations")
+ exclude("org.checkerframework", "checker-qual")
+ }
implementation(libs.kotlinx.serialization.json)
implementation(libs.material)
implementation(libs.nier.visualizer) {
diff --git a/app/libs/Android.bp b/app/libs/Android.bp
index 2276b60..e19ef93 100644
--- a/app/libs/Android.bp
+++ b/app/libs/Android.bp
@@ -623,31 +623,6 @@
}
java_import {
- name: "Twelve_com.google.j2objc_j2objc-annotations-nodeps",
- jars: ["com/google/j2objc/j2objc-annotations/3.0.0/j2objc-annotations-3.0.0.jar"],
- sdk_version: "35",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
-}
-
-java_library_static {
- name: "Twelve_com.google.j2objc_j2objc-annotations",
- sdk_version: "35",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Twelve_com.google.j2objc_j2objc-annotations-nodeps",
- ],
- java_version: "1.7",
-}
-
-java_import {
name: "Twelve_com.squareup.okhttp3_okhttp-nodeps",
jars: ["com/squareup/okhttp3/okhttp/4.12.0/okhttp-4.12.0.jar"],
sdk_version: "35",
@@ -912,28 +887,3 @@
],
java_version: "1.7",
}
-
-java_import {
- name: "Twelve_org.checkerframework_checker-qual-nodeps",
- jars: ["org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.jar"],
- sdk_version: "35",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
-}
-
-java_library_static {
- name: "Twelve_org.checkerframework_checker-qual",
- sdk_version: "35",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Twelve_org.checkerframework_checker-qual-nodeps",
- ],
- java_version: "1.7",
-}
diff --git a/app/libs/com/google/j2objc/j2objc-annotations/3.0.0/j2objc-annotations-3.0.0.jar b/app/libs/com/google/j2objc/j2objc-annotations/3.0.0/j2objc-annotations-3.0.0.jar
deleted file mode 100644
index c293336..0000000
--- a/app/libs/com/google/j2objc/j2objc-annotations/3.0.0/j2objc-annotations-3.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/com/google/j2objc/j2objc-annotations/3.0.0/j2objc-annotations-3.0.0.jar.license b/app/libs/com/google/j2objc/j2objc-annotations/3.0.0/j2objc-annotations-3.0.0.jar.license
deleted file mode 100644
index 7cf0522..0000000
--- a/app/libs/com/google/j2objc/j2objc-annotations/3.0.0/j2objc-annotations-3.0.0.jar.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2024 Tom Ball
-
-SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.jar b/app/libs/org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.jar
deleted file mode 100644
index cbb34f8..0000000
--- a/app/libs/org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.jar.license b/app/libs/org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.jar.license
deleted file mode 100644
index 2747b5e..0000000
--- a/app/libs/org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.jar.license
+++ /dev/null
@@ -1,4 +0,0 @@
-SPDX-FileCopyrightText: 2024 Michael Ernst
-SPDX-FileCopyrightText: 2024 Suzanne Millstein
-
-SPDX-License-Identifier: MIT