Aperture: Update dependencies
Change-Id: I5ce06e0065a6344f38aefdabf769b34ca0463a11
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 92701ec..ea379e8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -49,8 +49,8 @@
}
dependencies {
- implementation("androidx.core:core-ktx:1.8.0")
- implementation("androidx.appcompat:appcompat:1.5.0")
+ implementation("androidx.core:core-ktx:1.9.0")
+ implementation("androidx.appcompat:appcompat:1.5.1")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
implementation("androidx.preference:preference:1.2.0")
@@ -74,8 +74,8 @@
implementation("com.google.zxing:core:3.5.0")
// Coil
- implementation("io.coil-kt:coil:2.2.0")
- implementation("io.coil-kt:coil-video:2.2.0")
+ implementation("io.coil-kt:coil:2.2.2")
+ implementation("io.coil-kt:coil-video:2.2.2")
}
tasks.register("generateBp") {
@@ -134,11 +134,7 @@
// We provide our own androidx.camera & lifecycle-common
!group.startsWith("androidx.camera") && artifactId != "lifecycle-common"
}
- group.startsWith("org.jetbrains") -> {
- // kotlin-android-extensions-runtime & kotlin-parcelize-runtime aren't in AOSP
- !artifactId.startsWith("kotlin-android-extensions-runtime") &&
- !artifactId.startsWith("kotlin-parcelize-runtime")
- }
+ group.startsWith("org.jetbrains") -> true
group == "com.google.auto.value" -> true
group == "com.google.guava" -> true
group == "junit" -> true
diff --git a/app/libs/Android.bp b/app/libs/Android.bp
index 39a5042..df75890 100644
--- a/app/libs/Android.bp
+++ b/app/libs/Android.bp
@@ -446,7 +446,7 @@
android_library_import {
name: "Aperture_io.coil-kt_coil-base-nodeps",
- aars: ["io/coil-kt/coil-base/2.2.0/coil-base-2.2.0.aar"],
+ aars: ["io/coil-kt/coil-base/2.2.2/coil-base-2.2.2.aar"],
sdk_version: "31",
min_sdk_version: "14",
apex_available: [
@@ -456,8 +456,8 @@
static_libs: [
"androidx.lifecycle_lifecycle-runtime",
"kotlinx-coroutines-android",
+ "kotlin-stdlib-jdk8",
"Aperture_com.squareup.okhttp3_okhttp",
- "Aperture_org.jetbrains.kotlin_kotlin-parcelize-runtime",
"androidx.annotation_annotation",
"androidx.appcompat_appcompat-resources",
"androidx.collection_collection",
@@ -474,13 +474,13 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "io/coil-kt/coil-base/2.2.0/AndroidManifest.xml",
+ manifest: "io/coil-kt/coil-base/2.2.2/AndroidManifest.xml",
static_libs: [
"Aperture_io.coil-kt_coil-base-nodeps",
"androidx.lifecycle_lifecycle-runtime",
"kotlinx-coroutines-android",
+ "kotlin-stdlib-jdk8",
"Aperture_com.squareup.okhttp3_okhttp",
- "Aperture_org.jetbrains.kotlin_kotlin-parcelize-runtime",
"androidx.annotation_annotation",
"androidx.appcompat_appcompat-resources",
"androidx.collection_collection",
@@ -492,7 +492,7 @@
android_library_import {
name: "Aperture_io.coil-kt_coil-video-nodeps",
- aars: ["io/coil-kt/coil-video/2.2.0/coil-video-2.2.0.aar"],
+ aars: ["io/coil-kt/coil-video/2.2.2/coil-video-2.2.2.aar"],
sdk_version: "31",
min_sdk_version: "14",
apex_available: [
@@ -513,7 +513,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "io/coil-kt/coil-video/2.2.0/AndroidManifest.xml",
+ manifest: "io/coil-kt/coil-video/2.2.2/AndroidManifest.xml",
static_libs: [
"Aperture_io.coil-kt_coil-video-nodeps",
"Aperture_io.coil-kt_coil-base",
@@ -524,7 +524,7 @@
android_library_import {
name: "Aperture_io.coil-kt_coil-nodeps",
- aars: ["io/coil-kt/coil/2.2.0/coil-2.2.0.aar"],
+ aars: ["io/coil-kt/coil/2.2.2/coil-2.2.2.aar"],
sdk_version: "31",
min_sdk_version: "14",
apex_available: [
@@ -544,63 +544,10 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "io/coil-kt/coil/2.2.0/AndroidManifest.xml",
+ manifest: "io/coil-kt/coil/2.2.2/AndroidManifest.xml",
static_libs: [
"Aperture_io.coil-kt_coil-nodeps",
"Aperture_io.coil-kt_coil-base",
],
java_version: "1.7",
}
-
-java_import {
- name: "Aperture_org.jetbrains.kotlin_kotlin-android-extensions-runtime-nodeps",
- jars: ["org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.7.10/kotlin-android-extensions-runtime-1.7.10.jar"],
- sdk_version: "31",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
-}
-
-java_library_static {
- name: "Aperture_org.jetbrains.kotlin_kotlin-android-extensions-runtime",
- sdk_version: "31",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Aperture_org.jetbrains.kotlin_kotlin-android-extensions-runtime-nodeps",
- "kotlin-stdlib",
- ],
- java_version: "1.7",
-}
-
-java_import {
- name: "Aperture_org.jetbrains.kotlin_kotlin-parcelize-runtime-nodeps",
- jars: ["org/jetbrains/kotlin/kotlin-parcelize-runtime/1.7.10/kotlin-parcelize-runtime-1.7.10.jar"],
- sdk_version: "31",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
-}
-
-java_library_static {
- name: "Aperture_org.jetbrains.kotlin_kotlin-parcelize-runtime",
- sdk_version: "31",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Aperture_org.jetbrains.kotlin_kotlin-parcelize-runtime-nodeps",
- "kotlin-stdlib",
- "Aperture_org.jetbrains.kotlin_kotlin-android-extensions-runtime",
- ],
- java_version: "1.7",
-}
diff --git a/app/libs/io/coil-kt/coil-base/2.2.0/coil-base-2.2.0.aar b/app/libs/io/coil-kt/coil-base/2.2.0/coil-base-2.2.0.aar
deleted file mode 100644
index eef581b..0000000
--- a/app/libs/io/coil-kt/coil-base/2.2.0/coil-base-2.2.0.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/io/coil-kt/coil-base/2.2.0/AndroidManifest.xml b/app/libs/io/coil-kt/coil-base/2.2.2/AndroidManifest.xml
similarity index 82%
rename from app/libs/io/coil-kt/coil-base/2.2.0/AndroidManifest.xml
rename to app/libs/io/coil-kt/coil-base/2.2.2/AndroidManifest.xml
index 5d4d96d..f3d72e1 100644
--- a/app/libs/io/coil-kt/coil-base/2.2.0/AndroidManifest.xml
+++ b/app/libs/io/coil-kt/coil-base/2.2.2/AndroidManifest.xml
@@ -4,6 +4,6 @@
<uses-sdk
android:minSdkVersion="21"
- android:targetSdkVersion="32" />
+ android:targetSdkVersion="33" />
</manifest>
\ No newline at end of file
diff --git a/app/libs/io/coil-kt/coil-base/2.2.2/coil-base-2.2.2.aar b/app/libs/io/coil-kt/coil-base/2.2.2/coil-base-2.2.2.aar
new file mode 100644
index 0000000..766db1f
--- /dev/null
+++ b/app/libs/io/coil-kt/coil-base/2.2.2/coil-base-2.2.2.aar
Binary files differ
diff --git a/app/libs/io/coil-kt/coil-video/2.2.0/coil-video-2.2.0.aar b/app/libs/io/coil-kt/coil-video/2.2.0/coil-video-2.2.0.aar
deleted file mode 100644
index 508f41e..0000000
--- a/app/libs/io/coil-kt/coil-video/2.2.0/coil-video-2.2.0.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/io/coil-kt/coil-video/2.2.0/AndroidManifest.xml b/app/libs/io/coil-kt/coil-video/2.2.2/AndroidManifest.xml
similarity index 82%
rename from app/libs/io/coil-kt/coil-video/2.2.0/AndroidManifest.xml
rename to app/libs/io/coil-kt/coil-video/2.2.2/AndroidManifest.xml
index 44fd514..c8ad029 100644
--- a/app/libs/io/coil-kt/coil-video/2.2.0/AndroidManifest.xml
+++ b/app/libs/io/coil-kt/coil-video/2.2.2/AndroidManifest.xml
@@ -4,6 +4,6 @@
<uses-sdk
android:minSdkVersion="21"
- android:targetSdkVersion="32" />
+ android:targetSdkVersion="33" />
</manifest>
\ No newline at end of file
diff --git a/app/libs/io/coil-kt/coil-video/2.2.2/coil-video-2.2.2.aar b/app/libs/io/coil-kt/coil-video/2.2.2/coil-video-2.2.2.aar
new file mode 100644
index 0000000..a3b5ab7
--- /dev/null
+++ b/app/libs/io/coil-kt/coil-video/2.2.2/coil-video-2.2.2.aar
Binary files differ
diff --git a/app/libs/io/coil-kt/coil/2.2.0/AndroidManifest.xml b/app/libs/io/coil-kt/coil/2.2.2/AndroidManifest.xml
similarity index 82%
rename from app/libs/io/coil-kt/coil/2.2.0/AndroidManifest.xml
rename to app/libs/io/coil-kt/coil/2.2.2/AndroidManifest.xml
index 90309ff..e9c5843 100644
--- a/app/libs/io/coil-kt/coil/2.2.0/AndroidManifest.xml
+++ b/app/libs/io/coil-kt/coil/2.2.2/AndroidManifest.xml
@@ -4,6 +4,6 @@
<uses-sdk
android:minSdkVersion="21"
- android:targetSdkVersion="32" />
+ android:targetSdkVersion="33" />
</manifest>
\ No newline at end of file
diff --git a/app/libs/io/coil-kt/coil/2.2.0/coil-2.2.0.aar b/app/libs/io/coil-kt/coil/2.2.2/coil-2.2.2.aar
similarity index 97%
rename from app/libs/io/coil-kt/coil/2.2.0/coil-2.2.0.aar
rename to app/libs/io/coil-kt/coil/2.2.2/coil-2.2.2.aar
index ae1da38..9f30535 100644
--- a/app/libs/io/coil-kt/coil/2.2.0/coil-2.2.0.aar
+++ b/app/libs/io/coil-kt/coil/2.2.2/coil-2.2.2.aar
Binary files differ
diff --git a/app/libs/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.7.10/kotlin-android-extensions-runtime-1.7.10.jar b/app/libs/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.7.10/kotlin-android-extensions-runtime-1.7.10.jar
deleted file mode 100644
index 2474bc4..0000000
--- a/app/libs/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.7.10/kotlin-android-extensions-runtime-1.7.10.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/org/jetbrains/kotlin/kotlin-parcelize-runtime/1.7.10/kotlin-parcelize-runtime-1.7.10.jar b/app/libs/org/jetbrains/kotlin/kotlin-parcelize-runtime/1.7.10/kotlin-parcelize-runtime-1.7.10.jar
deleted file mode 100644
index 0295869..0000000
--- a/app/libs/org/jetbrains/kotlin/kotlin-parcelize-runtime/1.7.10/kotlin-parcelize-runtime-1.7.10.jar
+++ /dev/null
Binary files differ