Glimpse: Bump gradle-generatebp to v1.6
Change-Id: Iee61c5a96396afa8e349309cdf14ea4380bb8382
diff --git a/app/Android.bp b/app/Android.bp
index d4e4d90..806e1f6 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -39,14 +39,11 @@
"Glimpse_androidx.media3_media3-ui",
"androidx.navigation_navigation-fragment-ktx",
"androidx.navigation_navigation-ui-ktx",
- "Glimpse_com.squareup.okhttp3_okhttp",
- "Glimpse_com.squareup.okio_okio-jvm",
"androidx.recyclerview_recyclerview",
"androidx.recyclerview_recyclerview-selection",
"Glimpse_io.coil-kt_coil",
"Glimpse_io.coil-kt_coil-gif",
"Glimpse_io.coil-kt_coil-video",
- "Glimpse_io.github.panpf.zoomimage_zoomimage-core-android",
"Glimpse_io.github.panpf.zoomimage_zoomimage-view-coil",
],
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c767117..bb0a660 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,5 @@
/*
- * SPDX-FileCopyrightText: 2023 The LineageOS Project
+ * SPDX-FileCopyrightText: 2023-2024 The LineageOS Project
* SPDX-License-Identifier: Apache-2.0
*/
@@ -18,7 +18,7 @@
buildscript {
repositories {
- maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.3/.m2")
+ maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.6/.m2")
}
dependencies {
@@ -95,10 +95,6 @@
implementation("androidx.navigation:navigation-fragment-ktx:2.7.6")
implementation("androidx.navigation:navigation-ui-ktx:2.7.6")
- // OkHttp/Okio
- implementation("com.squareup.okhttp3:okhttp:4.12.0")
- implementation("com.squareup.okio:okio-jvm:3.7.0")
-
// Recyclerview
implementation("androidx.recyclerview:recyclerview:1.3.2")
implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
@@ -109,7 +105,6 @@
implementation("io.coil-kt:coil-video:2.5.0")
// ZoomImage
- implementation("io.github.panpf.zoomimage:zoomimage-core-android:1.0.2")
implementation("io.github.panpf.zoomimage:zoomimage-view-coil:1.0.2")
}
@@ -118,9 +113,8 @@
availableInAOSP.set { module: Module ->
when {
module.group.startsWith("androidx") -> {
- // We provide our own androidx.media3 & annotation-jvm
- !module.group.startsWith("androidx.media3") &&
- module.name != "annotation-jvm"
+ // We provide our own androidx.media3
+ !module.group.startsWith("androidx.media3")
}
module.group.startsWith("org.jetbrains") -> true
module.group == "com.google.auto.value" -> true
diff --git a/app/libs/Android.bp b/app/libs/Android.bp
index ba56591..cbd0332 100644
--- a/app/libs/Android.bp
+++ b/app/libs/Android.bp
@@ -5,32 +5,6 @@
// DO NOT EDIT THIS FILE MANUALLY
-java_import {
- name: "Glimpse_androidx.annotation_annotation-jvm-nodeps",
- jars: ["androidx/annotation/annotation-jvm/1.7.0/annotation-jvm-1.7.0.jar"],
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
-}
-
-java_library_static {
- name: "Glimpse_androidx.annotation_annotation-jvm",
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Glimpse_androidx.annotation_annotation-jvm-nodeps",
- "kotlin-stdlib",
- ],
- java_version: "1.7",
-}
-
android_library_import {
name: "Glimpse_androidx.media3_media3-common-nodeps",
aars: ["androidx/media3/media3-common/1.2.1/media3-common-1.2.1.aar"],
@@ -41,8 +15,9 @@
"//apex_available:anyapex",
],
static_libs: [
- "guava",
+ "androidx.annotation_annotation",
"androidx.annotation_annotation-experimental",
+ "guava",
],
}
@@ -57,8 +32,9 @@
manifest: "androidx/media3/media3-common/1.2.1/AndroidManifest.xml",
static_libs: [
"Glimpse_androidx.media3_media3-common-nodeps",
- "guava",
+ "androidx.annotation_annotation",
"androidx.annotation_annotation-experimental",
+ "guava",
],
java_version: "1.7",
}
@@ -74,6 +50,7 @@
],
static_libs: [
"Glimpse_androidx.media3_media3-common",
+ "androidx.annotation_annotation",
],
}
@@ -89,6 +66,7 @@
static_libs: [
"Glimpse_androidx.media3_media3-container-nodeps",
"Glimpse_androidx.media3_media3-common",
+ "androidx.annotation_annotation",
],
java_version: "1.7",
}
@@ -104,6 +82,7 @@
],
static_libs: [
"Glimpse_androidx.media3_media3-common",
+ "androidx.annotation_annotation",
],
}
@@ -119,6 +98,7 @@
static_libs: [
"Glimpse_androidx.media3_media3-database-nodeps",
"Glimpse_androidx.media3_media3-common",
+ "androidx.annotation_annotation",
],
java_version: "1.7",
}
@@ -135,6 +115,7 @@
static_libs: [
"Glimpse_androidx.media3_media3-common",
"Glimpse_androidx.media3_media3-database",
+ "androidx.annotation_annotation",
"androidx.exifinterface_exifinterface",
],
}
@@ -152,6 +133,7 @@
"Glimpse_androidx.media3_media3-datasource-nodeps",
"Glimpse_androidx.media3_media3-common",
"Glimpse_androidx.media3_media3-database",
+ "androidx.annotation_annotation",
"androidx.exifinterface_exifinterface",
],
java_version: "1.7",
@@ -168,6 +150,7 @@
],
static_libs: [
"Glimpse_androidx.media3_media3-common",
+ "androidx.annotation_annotation",
],
}
@@ -183,126 +166,7 @@
static_libs: [
"Glimpse_androidx.media3_media3-decoder-nodeps",
"Glimpse_androidx.media3_media3-common",
- ],
- java_version: "1.7",
-}
-
-android_library_import {
- name: "Glimpse_androidx.media3_media3-exoplayer-dash-nodeps",
- aars: ["androidx/media3/media3-exoplayer-dash/1.2.1/media3-exoplayer-dash-1.2.1.aar"],
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Glimpse_androidx.media3_media3-exoplayer",
- ],
-}
-
-android_library {
- name: "Glimpse_androidx.media3_media3-exoplayer-dash",
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- manifest: "androidx/media3/media3-exoplayer-dash/1.2.1/AndroidManifest.xml",
- static_libs: [
- "Glimpse_androidx.media3_media3-exoplayer-dash-nodeps",
- "Glimpse_androidx.media3_media3-exoplayer",
- ],
- java_version: "1.7",
-}
-
-android_library_import {
- name: "Glimpse_androidx.media3_media3-exoplayer-hls-nodeps",
- aars: ["androidx/media3/media3-exoplayer-hls/1.2.1/media3-exoplayer-hls-1.2.1.aar"],
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Glimpse_androidx.media3_media3-exoplayer",
- ],
-}
-
-android_library {
- name: "Glimpse_androidx.media3_media3-exoplayer-hls",
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- manifest: "androidx/media3/media3-exoplayer-hls/1.2.1/AndroidManifest.xml",
- static_libs: [
- "Glimpse_androidx.media3_media3-exoplayer-hls-nodeps",
- "Glimpse_androidx.media3_media3-exoplayer",
- ],
- java_version: "1.7",
-}
-
-android_library_import {
- name: "Glimpse_androidx.media3_media3-exoplayer-rtsp-nodeps",
- aars: ["androidx/media3/media3-exoplayer-rtsp/1.2.1/media3-exoplayer-rtsp-1.2.1.aar"],
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Glimpse_androidx.media3_media3-exoplayer",
- ],
-}
-
-android_library {
- name: "Glimpse_androidx.media3_media3-exoplayer-rtsp",
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- manifest: "androidx/media3/media3-exoplayer-rtsp/1.2.1/AndroidManifest.xml",
- static_libs: [
- "Glimpse_androidx.media3_media3-exoplayer-rtsp-nodeps",
- "Glimpse_androidx.media3_media3-exoplayer",
- ],
- java_version: "1.7",
-}
-
-android_library_import {
- name: "Glimpse_androidx.media3_media3-exoplayer-smoothstreaming-nodeps",
- aars: ["androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/media3-exoplayer-smoothstreaming-1.2.1.aar"],
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Glimpse_androidx.media3_media3-exoplayer",
- ],
-}
-
-android_library {
- name: "Glimpse_androidx.media3_media3-exoplayer-smoothstreaming",
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- manifest: "androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/AndroidManifest.xml",
- static_libs: [
- "Glimpse_androidx.media3_media3-exoplayer-smoothstreaming-nodeps",
- "Glimpse_androidx.media3_media3-exoplayer",
+ "androidx.annotation_annotation",
],
java_version: "1.7",
}
@@ -319,10 +183,12 @@
static_libs: [
"Glimpse_androidx.media3_media3-common",
"Glimpse_androidx.media3_media3-container",
+ "Glimpse_androidx.media3_media3-database",
"Glimpse_androidx.media3_media3-datasource",
"Glimpse_androidx.media3_media3-decoder",
"Glimpse_androidx.media3_media3-extractor",
- "Glimpse_androidx.media3_media3-database",
+ "androidx.annotation_annotation",
+ "androidx.collection_collection",
"androidx.core_core",
"androidx.exifinterface_exifinterface",
],
@@ -341,10 +207,12 @@
"Glimpse_androidx.media3_media3-exoplayer-nodeps",
"Glimpse_androidx.media3_media3-common",
"Glimpse_androidx.media3_media3-container",
+ "Glimpse_androidx.media3_media3-database",
"Glimpse_androidx.media3_media3-datasource",
"Glimpse_androidx.media3_media3-decoder",
"Glimpse_androidx.media3_media3-extractor",
- "Glimpse_androidx.media3_media3-database",
+ "androidx.annotation_annotation",
+ "androidx.collection_collection",
"androidx.core_core",
"androidx.exifinterface_exifinterface",
],
@@ -352,6 +220,134 @@
}
android_library_import {
+ name: "Glimpse_androidx.media3_media3-exoplayer-dash-nodeps",
+ aars: ["androidx/media3/media3-exoplayer-dash/1.2.1/media3-exoplayer-dash-1.2.1.aar"],
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ static_libs: [
+ "Glimpse_androidx.media3_media3-exoplayer",
+ "androidx.annotation_annotation",
+ ],
+}
+
+android_library {
+ name: "Glimpse_androidx.media3_media3-exoplayer-dash",
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ manifest: "androidx/media3/media3-exoplayer-dash/1.2.1/AndroidManifest.xml",
+ static_libs: [
+ "Glimpse_androidx.media3_media3-exoplayer-dash-nodeps",
+ "Glimpse_androidx.media3_media3-exoplayer",
+ "androidx.annotation_annotation",
+ ],
+ java_version: "1.7",
+}
+
+android_library_import {
+ name: "Glimpse_androidx.media3_media3-exoplayer-hls-nodeps",
+ aars: ["androidx/media3/media3-exoplayer-hls/1.2.1/media3-exoplayer-hls-1.2.1.aar"],
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ static_libs: [
+ "Glimpse_androidx.media3_media3-exoplayer",
+ "androidx.annotation_annotation",
+ ],
+}
+
+android_library {
+ name: "Glimpse_androidx.media3_media3-exoplayer-hls",
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ manifest: "androidx/media3/media3-exoplayer-hls/1.2.1/AndroidManifest.xml",
+ static_libs: [
+ "Glimpse_androidx.media3_media3-exoplayer-hls-nodeps",
+ "Glimpse_androidx.media3_media3-exoplayer",
+ "androidx.annotation_annotation",
+ ],
+ java_version: "1.7",
+}
+
+android_library_import {
+ name: "Glimpse_androidx.media3_media3-exoplayer-rtsp-nodeps",
+ aars: ["androidx/media3/media3-exoplayer-rtsp/1.2.1/media3-exoplayer-rtsp-1.2.1.aar"],
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ static_libs: [
+ "Glimpse_androidx.media3_media3-exoplayer",
+ "androidx.annotation_annotation",
+ ],
+}
+
+android_library {
+ name: "Glimpse_androidx.media3_media3-exoplayer-rtsp",
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ manifest: "androidx/media3/media3-exoplayer-rtsp/1.2.1/AndroidManifest.xml",
+ static_libs: [
+ "Glimpse_androidx.media3_media3-exoplayer-rtsp-nodeps",
+ "Glimpse_androidx.media3_media3-exoplayer",
+ "androidx.annotation_annotation",
+ ],
+ java_version: "1.7",
+}
+
+android_library_import {
+ name: "Glimpse_androidx.media3_media3-exoplayer-smoothstreaming-nodeps",
+ aars: ["androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/media3-exoplayer-smoothstreaming-1.2.1.aar"],
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ static_libs: [
+ "Glimpse_androidx.media3_media3-exoplayer",
+ "androidx.annotation_annotation",
+ ],
+}
+
+android_library {
+ name: "Glimpse_androidx.media3_media3-exoplayer-smoothstreaming",
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ manifest: "androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/AndroidManifest.xml",
+ static_libs: [
+ "Glimpse_androidx.media3_media3-exoplayer-smoothstreaming-nodeps",
+ "Glimpse_androidx.media3_media3-exoplayer",
+ "androidx.annotation_annotation",
+ ],
+ java_version: "1.7",
+}
+
+android_library_import {
name: "Glimpse_androidx.media3_media3-extractor-nodeps",
aars: ["androidx/media3/media3-extractor/1.2.1/media3-extractor-1.2.1.aar"],
sdk_version: "34",
@@ -364,6 +360,7 @@
"Glimpse_androidx.media3_media3-common",
"Glimpse_androidx.media3_media3-container",
"Glimpse_androidx.media3_media3-decoder",
+ "androidx.annotation_annotation",
],
}
@@ -381,6 +378,7 @@
"Glimpse_androidx.media3_media3-common",
"Glimpse_androidx.media3_media3-container",
"Glimpse_androidx.media3_media3-decoder",
+ "androidx.annotation_annotation",
],
java_version: "1.7",
}
@@ -396,6 +394,7 @@
],
static_libs: [
"Glimpse_androidx.media3_media3-common",
+ "androidx.annotation_annotation",
"androidx.media_media",
"androidx.recyclerview_recyclerview",
],
@@ -413,6 +412,7 @@
static_libs: [
"Glimpse_androidx.media3_media3-ui-nodeps",
"Glimpse_androidx.media3_media3-common",
+ "androidx.annotation_annotation",
"androidx.media_media",
"androidx.recyclerview_recyclerview",
],
@@ -429,21 +429,22 @@
"//apex_available:anyapex",
],
static_libs: [
+ "Glimpse_com.google.errorprone_error_prone_annotations",
+ "androidx-constraintlayout_constraintlayout",
+ "androidx.annotation_annotation",
+ "androidx.annotation_annotation-experimental",
"androidx.appcompat_appcompat",
"androidx.cardview_cardview",
"androidx.coordinatorlayout_coordinatorlayout",
- "androidx-constraintlayout_constraintlayout",
"androidx.core_core",
"androidx.drawerlayout_drawerlayout",
"androidx.dynamicanimation_dynamicanimation",
- "androidx.annotation_annotation-experimental",
"androidx.fragment_fragment",
"androidx.lifecycle_lifecycle-runtime",
"androidx.recyclerview_recyclerview",
"androidx.transition_transition",
"androidx.vectordrawable_vectordrawable",
"androidx.viewpager2_viewpager2",
- "Glimpse_com.google.errorprone_error_prone_annotations",
],
}
@@ -458,21 +459,22 @@
manifest: "com/google/android/material/material/1.9.0/AndroidManifest.xml",
static_libs: [
"Glimpse_com.google.android.material_material-nodeps",
+ "Glimpse_com.google.errorprone_error_prone_annotations",
+ "androidx-constraintlayout_constraintlayout",
+ "androidx.annotation_annotation",
+ "androidx.annotation_annotation-experimental",
"androidx.appcompat_appcompat",
"androidx.cardview_cardview",
"androidx.coordinatorlayout_coordinatorlayout",
- "androidx-constraintlayout_constraintlayout",
"androidx.core_core",
"androidx.drawerlayout_drawerlayout",
"androidx.dynamicanimation_dynamicanimation",
- "androidx.annotation_annotation-experimental",
"androidx.fragment_fragment",
"androidx.lifecycle_lifecycle-runtime",
"androidx.recyclerview_recyclerview",
"androidx.transition_transition",
"androidx.vectordrawable_vectordrawable",
"androidx.viewpager2_viewpager2",
- "Glimpse_com.google.errorprone_error_prone_annotations",
],
java_version: "1.7",
}
@@ -523,14 +525,29 @@
],
static_libs: [
"Glimpse_com.squareup.okhttp3_okhttp-nodeps",
+ "Glimpse_com.squareup.okio_okio",
"kotlin-stdlib-jdk8",
],
java_version: "1.7",
}
+java_library_static {
+ name: "Glimpse_com.squareup.okio_okio",
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ static_libs: [
+ "Glimpse_com.squareup.okio_okio-jvm",
+ ],
+ java_version: "1.7",
+}
+
java_import {
name: "Glimpse_com.squareup.okio_okio-jvm-nodeps",
- jars: ["com/squareup/okio/okio-jvm/3.7.0/okio-jvm-3.7.0.jar"],
+ jars: ["com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar"],
sdk_version: "34",
min_sdk_version: "14",
apex_available: [
@@ -549,121 +566,7 @@
],
static_libs: [
"Glimpse_com.squareup.okio_okio-jvm-nodeps",
- "kotlin-stdlib",
- ],
- java_version: "1.7",
-}
-
-android_library_import {
- name: "Glimpse_io.coil-kt_coil-base-nodeps",
- aars: ["io/coil-kt/coil-base/2.5.0/coil-base-2.5.0.aar"],
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "androidx.lifecycle_lifecycle-runtime",
- "kotlinx-coroutines-android",
- "kotlin-stdlib",
- "Glimpse_com.squareup.okhttp3_okhttp",
- "androidx.appcompat_appcompat-resources",
- "androidx.core_core-ktx",
- "androidx.exifinterface_exifinterface",
- "androidx.profileinstaller_profileinstaller",
- ],
-}
-
-android_library {
- name: "Glimpse_io.coil-kt_coil-base",
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- manifest: "io/coil-kt/coil-base/2.5.0/AndroidManifest.xml",
- static_libs: [
- "Glimpse_io.coil-kt_coil-base-nodeps",
- "androidx.lifecycle_lifecycle-runtime",
- "kotlinx-coroutines-android",
- "kotlin-stdlib",
- "Glimpse_com.squareup.okhttp3_okhttp",
- "androidx.appcompat_appcompat-resources",
- "androidx.core_core-ktx",
- "androidx.exifinterface_exifinterface",
- "androidx.profileinstaller_profileinstaller",
- ],
- java_version: "1.7",
-}
-
-android_library_import {
- name: "Glimpse_io.coil-kt_coil-gif-nodeps",
- aars: ["io/coil-kt/coil-gif/2.5.0/coil-gif-2.5.0.aar"],
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Glimpse_io.coil-kt_coil-base",
"kotlin-stdlib-jdk8",
- "androidx.core_core-ktx",
- "androidx.vectordrawable_vectordrawable-animated",
- ],
-}
-
-android_library {
- name: "Glimpse_io.coil-kt_coil-gif",
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- manifest: "io/coil-kt/coil-gif/2.5.0/AndroidManifest.xml",
- static_libs: [
- "Glimpse_io.coil-kt_coil-gif-nodeps",
- "Glimpse_io.coil-kt_coil-base",
- "kotlin-stdlib-jdk8",
- "androidx.core_core-ktx",
- "androidx.vectordrawable_vectordrawable-animated",
- ],
- java_version: "1.7",
-}
-
-android_library_import {
- name: "Glimpse_io.coil-kt_coil-video-nodeps",
- aars: ["io/coil-kt/coil-video/2.5.0/coil-video-2.5.0.aar"],
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Glimpse_io.coil-kt_coil-base",
- "kotlin-stdlib-jdk8",
- "androidx.core_core-ktx",
- ],
-}
-
-android_library {
- name: "Glimpse_io.coil-kt_coil-video",
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- manifest: "io/coil-kt/coil-video/2.5.0/AndroidManifest.xml",
- static_libs: [
- "Glimpse_io.coil-kt_coil-video-nodeps",
- "Glimpse_io.coil-kt_coil-base",
- "kotlin-stdlib-jdk8",
- "androidx.core_core-ktx",
],
java_version: "1.7",
}
@@ -701,6 +604,140 @@
}
android_library_import {
+ name: "Glimpse_io.coil-kt_coil-base-nodeps",
+ aars: ["io/coil-kt/coil-base/2.5.0/coil-base-2.5.0.aar"],
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ static_libs: [
+ "Glimpse_com.squareup.okhttp3_okhttp",
+ "Glimpse_com.squareup.okio_okio",
+ "androidx.annotation_annotation",
+ "androidx.appcompat_appcompat-resources",
+ "androidx.collection_collection",
+ "androidx.core_core-ktx",
+ "androidx.exifinterface_exifinterface",
+ "androidx.lifecycle_lifecycle-runtime",
+ "androidx.profileinstaller_profileinstaller",
+ "kotlin-stdlib",
+ "kotlinx-coroutines-android",
+ ],
+}
+
+android_library {
+ name: "Glimpse_io.coil-kt_coil-base",
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ manifest: "io/coil-kt/coil-base/2.5.0/AndroidManifest.xml",
+ static_libs: [
+ "Glimpse_io.coil-kt_coil-base-nodeps",
+ "Glimpse_com.squareup.okhttp3_okhttp",
+ "Glimpse_com.squareup.okio_okio",
+ "androidx.annotation_annotation",
+ "androidx.appcompat_appcompat-resources",
+ "androidx.collection_collection",
+ "androidx.core_core-ktx",
+ "androidx.exifinterface_exifinterface",
+ "androidx.lifecycle_lifecycle-runtime",
+ "androidx.profileinstaller_profileinstaller",
+ "kotlin-stdlib",
+ "kotlinx-coroutines-android",
+ ],
+ java_version: "1.7",
+}
+
+android_library_import {
+ name: "Glimpse_io.coil-kt_coil-gif-nodeps",
+ aars: ["io/coil-kt/coil-gif/2.5.0/coil-gif-2.5.0.aar"],
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ static_libs: [
+ "Glimpse_io.coil-kt_coil-base",
+ "androidx.core_core-ktx",
+ "androidx.vectordrawable_vectordrawable-animated",
+ "kotlin-stdlib-jdk8",
+ ],
+}
+
+android_library {
+ name: "Glimpse_io.coil-kt_coil-gif",
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ manifest: "io/coil-kt/coil-gif/2.5.0/AndroidManifest.xml",
+ static_libs: [
+ "Glimpse_io.coil-kt_coil-gif-nodeps",
+ "Glimpse_io.coil-kt_coil-base",
+ "androidx.core_core-ktx",
+ "androidx.vectordrawable_vectordrawable-animated",
+ "kotlin-stdlib-jdk8",
+ ],
+ java_version: "1.7",
+}
+
+android_library_import {
+ name: "Glimpse_io.coil-kt_coil-video-nodeps",
+ aars: ["io/coil-kt/coil-video/2.5.0/coil-video-2.5.0.aar"],
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ static_libs: [
+ "Glimpse_io.coil-kt_coil-base",
+ "androidx.core_core-ktx",
+ "kotlin-stdlib-jdk8",
+ ],
+}
+
+android_library {
+ name: "Glimpse_io.coil-kt_coil-video",
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ manifest: "io/coil-kt/coil-video/2.5.0/AndroidManifest.xml",
+ static_libs: [
+ "Glimpse_io.coil-kt_coil-video-nodeps",
+ "Glimpse_io.coil-kt_coil-base",
+ "androidx.core_core-ktx",
+ "kotlin-stdlib-jdk8",
+ ],
+ java_version: "1.7",
+}
+
+java_library_static {
+ name: "Glimpse_io.github.panpf.zoomimage_zoomimage-core",
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ static_libs: [
+ "Glimpse_io.github.panpf.zoomimage_zoomimage-core-android",
+ ],
+ java_version: "1.7",
+}
+
+android_library_import {
name: "Glimpse_io.github.panpf.zoomimage_zoomimage-core-android-nodeps",
aars: ["io/github/panpf/zoomimage/zoomimage-core-android/1.0.2/zoomimage-core-release.aar"],
sdk_version: "34",
@@ -710,12 +747,12 @@
"//apex_available:anyapex",
],
static_libs: [
- "kotlinx-coroutines-android",
+ "androidx.annotation_annotation",
"androidx.exifinterface_exifinterface",
"androidx.lifecycle_lifecycle-common",
"kotlin-stdlib-jdk8",
- "Glimpse_androidx.annotation_annotation-jvm",
- "kotlinx-coroutines-core-jvm",
+ "kotlinx-coroutines-android",
+ "kotlinx-coroutines-core",
],
}
@@ -730,12 +767,12 @@
manifest: "io/github/panpf/zoomimage/zoomimage-core-android/1.0.2/AndroidManifest.xml",
static_libs: [
"Glimpse_io.github.panpf.zoomimage_zoomimage-core-android-nodeps",
- "kotlinx-coroutines-android",
+ "androidx.annotation_annotation",
"androidx.exifinterface_exifinterface",
"androidx.lifecycle_lifecycle-common",
"kotlin-stdlib-jdk8",
- "Glimpse_androidx.annotation_annotation-jvm",
- "kotlinx-coroutines-core-jvm",
+ "kotlinx-coroutines-android",
+ "kotlinx-coroutines-core",
],
java_version: "1.7",
}
@@ -751,6 +788,7 @@
],
static_libs: [
"Glimpse_io.coil-kt_coil",
+ "Glimpse_io.github.panpf.zoomimage_zoomimage-core",
"kotlin-stdlib-jdk8",
],
}
@@ -767,40 +805,7 @@
static_libs: [
"Glimpse_io.github.panpf.zoomimage_zoomimage-core-coil-nodeps",
"Glimpse_io.coil-kt_coil",
- "kotlin-stdlib-jdk8",
- ],
- java_version: "1.7",
-}
-
-android_library_import {
- name: "Glimpse_io.github.panpf.zoomimage_zoomimage-view-coil-nodeps",
- aars: ["io/github/panpf/zoomimage/zoomimage-view-coil/1.0.2/zoomimage-view-coil-1.0.2.aar"],
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Glimpse_io.github.panpf.zoomimage_zoomimage-view",
- "Glimpse_io.github.panpf.zoomimage_zoomimage-core-coil",
- "kotlin-stdlib-jdk8",
- ],
-}
-
-android_library {
- name: "Glimpse_io.github.panpf.zoomimage_zoomimage-view-coil",
- sdk_version: "34",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- manifest: "io/github/panpf/zoomimage/zoomimage-view-coil/1.0.2/AndroidManifest.xml",
- static_libs: [
- "Glimpse_io.github.panpf.zoomimage_zoomimage-view-coil-nodeps",
- "Glimpse_io.github.panpf.zoomimage_zoomimage-view",
- "Glimpse_io.github.panpf.zoomimage_zoomimage-core-coil",
+ "Glimpse_io.github.panpf.zoomimage_zoomimage-core",
"kotlin-stdlib-jdk8",
],
java_version: "1.7",
@@ -816,6 +821,7 @@
"//apex_available:anyapex",
],
static_libs: [
+ "Glimpse_io.github.panpf.zoomimage_zoomimage-core",
"androidx.appcompat_appcompat",
"androidx.core_core-ktx",
"androidx.lifecycle_lifecycle-runtime-ktx",
@@ -834,6 +840,7 @@
manifest: "io/github/panpf/zoomimage/zoomimage-view/1.0.2/AndroidManifest.xml",
static_libs: [
"Glimpse_io.github.panpf.zoomimage_zoomimage-view-nodeps",
+ "Glimpse_io.github.panpf.zoomimage_zoomimage-core",
"androidx.appcompat_appcompat",
"androidx.core_core-ktx",
"androidx.lifecycle_lifecycle-runtime-ktx",
@@ -841,3 +848,37 @@
],
java_version: "1.7",
}
+
+android_library_import {
+ name: "Glimpse_io.github.panpf.zoomimage_zoomimage-view-coil-nodeps",
+ aars: ["io/github/panpf/zoomimage/zoomimage-view-coil/1.0.2/zoomimage-view-coil-1.0.2.aar"],
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ static_libs: [
+ "Glimpse_io.github.panpf.zoomimage_zoomimage-core-coil",
+ "Glimpse_io.github.panpf.zoomimage_zoomimage-view",
+ "kotlin-stdlib-jdk8",
+ ],
+}
+
+android_library {
+ name: "Glimpse_io.github.panpf.zoomimage_zoomimage-view-coil",
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ manifest: "io/github/panpf/zoomimage/zoomimage-view-coil/1.0.2/AndroidManifest.xml",
+ static_libs: [
+ "Glimpse_io.github.panpf.zoomimage_zoomimage-view-coil-nodeps",
+ "Glimpse_io.github.panpf.zoomimage_zoomimage-core-coil",
+ "Glimpse_io.github.panpf.zoomimage_zoomimage-view",
+ "kotlin-stdlib-jdk8",
+ ],
+ java_version: "1.7",
+}
diff --git a/app/libs/androidx/annotation/annotation-jvm/1.7.0/annotation-jvm-1.7.0.jar b/app/libs/androidx/annotation/annotation-jvm/1.7.0/annotation-jvm-1.7.0.jar
deleted file mode 100644
index 3102808..0000000
--- a/app/libs/androidx/annotation/annotation-jvm/1.7.0/annotation-jvm-1.7.0.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/annotation/annotation-jvm/1.7.0/annotation-jvm-1.7.0.jar.license b/app/libs/androidx/annotation/annotation-jvm/1.7.0/annotation-jvm-1.7.0.jar.license
deleted file mode 100644
index b0b532b..0000000
--- a/app/libs/androidx/annotation/annotation-jvm/1.7.0/annotation-jvm-1.7.0.jar.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2013-2024 The Android Open Source Project
-
-SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar b/app/libs/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar
new file mode 100644
index 0000000..ec8ad90
--- /dev/null
+++ b/app/libs/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar
Binary files differ
diff --git a/app/libs/com/squareup/okio/okio-jvm/3.7.0/okio-jvm-3.7.0.jar.license b/app/libs/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar.license
similarity index 100%
rename from app/libs/com/squareup/okio/okio-jvm/3.7.0/okio-jvm-3.7.0.jar.license
rename to app/libs/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar.license
diff --git a/app/libs/com/squareup/okio/okio-jvm/3.7.0/okio-jvm-3.7.0.jar b/app/libs/com/squareup/okio/okio-jvm/3.7.0/okio-jvm-3.7.0.jar
deleted file mode 100644
index 8da081a..0000000
--- a/app/libs/com/squareup/okio/okio-jvm/3.7.0/okio-jvm-3.7.0.jar
+++ /dev/null
Binary files differ