diff options
author | LuK1337 <priv.luk@gmail.com> | 2023-05-24 20:34:45 +0200 |
---|---|---|
committer | LuK1337 <priv.luk@gmail.com> | 2023-05-24 20:38:05 +0200 |
commit | 4ca4060daa48ee7d6119fda76724b237d4180497 (patch) | |
tree | bcb84f2cc23a3ce05dc0ad02a9da901c459ca145 | |
parent | b2d505b38dbec6e82cfa83c3239d62baf1c79664 (diff) |
Aperture: Update dependencies
Change-Id: I939f2b194be4c24fc08b74ac15377f00d492ec54
24 files changed, 22 insertions, 51 deletions
diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 25fdfc0..d15c0b6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -51,13 +51,13 @@ android { } dependencies { - implementation("androidx.core:core-ktx:1.9.0") + implementation("androidx.core:core-ktx:1.10.1") implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.constraintlayout:constraintlayout:2.1.4") implementation("androidx.exifinterface:exifinterface:1.3.6") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1") implementation("androidx.preference:preference:1.2.0") - implementation("com.google.android.material:material:1.9.0-alpha02") + implementation("com.google.android.material:material:1.10.0-alpha03") // CameraX core library using the camera2 implementation val cameraxVersion = "1.3.0-alpha07" @@ -74,7 +74,7 @@ dependencies { implementation("androidx.camera:camera-extensions:${cameraxVersion}") // Media3 - val media3Version = "1.0.1" + val media3Version = "1.0.2" // For media playback using ExoPlayer implementation("androidx.media3:media3-exoplayer:$media3Version") // For building media playback UIs diff --git a/app/libs/Android.bp b/app/libs/Android.bp index bd7ea0b..785cb5d 100644 --- a/app/libs/Android.bp +++ b/app/libs/Android.bp @@ -9,7 +9,6 @@ android_library_import { "//apex_available:anyapex", ], static_libs: [ - "androidx.annotation_annotation", "Aperture_androidx.camera_camera-core", "androidx.concurrent_concurrent-futures", "androidx.core_core", @@ -29,7 +28,6 @@ android_library { manifest: "androidx/camera/camera-camera2/1.3.0-alpha07/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-camera2-nodeps", - "androidx.annotation_annotation", "Aperture_androidx.camera_camera-core", "androidx.concurrent_concurrent-futures", "androidx.core_core", @@ -49,7 +47,6 @@ android_library_import { "//apex_available:anyapex", ], static_libs: [ - "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.concurrent_concurrent-futures", "androidx.core_core", @@ -73,7 +70,6 @@ android_library { manifest: "androidx/camera/camera-core/1.3.0-alpha07/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-core-nodeps", - "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.concurrent_concurrent-futures", "androidx.core_core", @@ -177,7 +173,6 @@ android_library_import { "//apex_available:anyapex", ], static_libs: [ - "androidx.annotation_annotation", "Aperture_androidx.camera_camera-core", "androidx.concurrent_concurrent-futures", "androidx.core_core", @@ -196,7 +191,6 @@ android_library { manifest: "androidx/camera/camera-video/1.3.0-alpha07/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-video-nodeps", - "androidx.annotation_annotation", "Aperture_androidx.camera_camera-core", "androidx.concurrent_concurrent-futures", "androidx.core_core", @@ -215,7 +209,6 @@ android_library_import { "//apex_available:anyapex", ], static_libs: [ - "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.appcompat_appcompat", "Aperture_androidx.camera_camera-core", @@ -240,7 +233,6 @@ android_library { manifest: "androidx/camera/camera-view/1.3.0-alpha07/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-view-nodeps", - "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.appcompat_appcompat", "Aperture_androidx.camera_camera-core", @@ -257,7 +249,7 @@ android_library { java_import { name: "Aperture_androidx.lifecycle_lifecycle-common-nodeps", - jars: ["androidx/lifecycle/lifecycle-common/2.5.1/lifecycle-common-2.5.1.jar"], + jars: ["androidx/lifecycle/lifecycle-common/2.6.1/lifecycle-common-2.6.1.jar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -276,14 +268,13 @@ java_library_static { ], static_libs: [ "Aperture_androidx.lifecycle_lifecycle-common-nodeps", - "androidx.annotation_annotation", ], java_version: "1.7", } android_library_import { name: "Aperture_androidx.media3_media3-common-nodeps", - aars: ["androidx/media3/media3-common/1.0.1/media3-common-1.0.1.aar"], + aars: ["androidx/media3/media3-common/1.0.2/media3-common-1.0.2.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -293,7 +284,6 @@ android_library_import { static_libs: [ "guava", "androidx.annotation_annotation-experimental", - "androidx.annotation_annotation", ], } @@ -305,19 +295,18 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/media3/media3-common/1.0.1/AndroidManifest.xml", + manifest: "androidx/media3/media3-common/1.0.2/AndroidManifest.xml", static_libs: [ "Aperture_androidx.media3_media3-common-nodeps", "guava", "androidx.annotation_annotation-experimental", - "androidx.annotation_annotation", ], java_version: "1.7", } android_library_import { name: "Aperture_androidx.media3_media3-database-nodeps", - aars: ["androidx/media3/media3-database/1.0.1/media3-database-1.0.1.aar"], + aars: ["androidx/media3/media3-database/1.0.2/media3-database-1.0.2.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -326,7 +315,6 @@ android_library_import { ], static_libs: [ "Aperture_androidx.media3_media3-common", - "androidx.annotation_annotation", ], } @@ -338,18 +326,17 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/media3/media3-database/1.0.1/AndroidManifest.xml", + manifest: "androidx/media3/media3-database/1.0.2/AndroidManifest.xml", static_libs: [ "Aperture_androidx.media3_media3-database-nodeps", "Aperture_androidx.media3_media3-common", - "androidx.annotation_annotation", ], java_version: "1.7", } android_library_import { name: "Aperture_androidx.media3_media3-datasource-nodeps", - aars: ["androidx/media3/media3-datasource/1.0.1/media3-datasource-1.0.1.aar"], + aars: ["androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -359,7 +346,6 @@ android_library_import { static_libs: [ "Aperture_androidx.media3_media3-common", "Aperture_androidx.media3_media3-database", - "androidx.annotation_annotation", ], } @@ -371,19 +357,18 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/media3/media3-datasource/1.0.1/AndroidManifest.xml", + manifest: "androidx/media3/media3-datasource/1.0.2/AndroidManifest.xml", static_libs: [ "Aperture_androidx.media3_media3-datasource-nodeps", "Aperture_androidx.media3_media3-common", "Aperture_androidx.media3_media3-database", - "androidx.annotation_annotation", ], java_version: "1.7", } android_library_import { name: "Aperture_androidx.media3_media3-decoder-nodeps", - aars: ["androidx/media3/media3-decoder/1.0.1/media3-decoder-1.0.1.aar"], + aars: ["androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -392,7 +377,6 @@ android_library_import { ], static_libs: [ "Aperture_androidx.media3_media3-common", - "androidx.annotation_annotation", ], } @@ -404,18 +388,17 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/media3/media3-decoder/1.0.1/AndroidManifest.xml", + manifest: "androidx/media3/media3-decoder/1.0.2/AndroidManifest.xml", static_libs: [ "Aperture_androidx.media3_media3-decoder-nodeps", "Aperture_androidx.media3_media3-common", - "androidx.annotation_annotation", ], java_version: "1.7", } android_library_import { name: "Aperture_androidx.media3_media3-exoplayer-nodeps", - aars: ["androidx/media3/media3-exoplayer/1.0.1/media3-exoplayer-1.0.1.aar"], + aars: ["androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -428,7 +411,6 @@ android_library_import { "Aperture_androidx.media3_media3-decoder", "Aperture_androidx.media3_media3-extractor", "Aperture_androidx.media3_media3-database", - "androidx.annotation_annotation", "androidx.core_core", ], } @@ -441,7 +423,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/media3/media3-exoplayer/1.0.1/AndroidManifest.xml", + manifest: "androidx/media3/media3-exoplayer/1.0.2/AndroidManifest.xml", static_libs: [ "Aperture_androidx.media3_media3-exoplayer-nodeps", "Aperture_androidx.media3_media3-common", @@ -449,7 +431,6 @@ android_library { "Aperture_androidx.media3_media3-decoder", "Aperture_androidx.media3_media3-extractor", "Aperture_androidx.media3_media3-database", - "androidx.annotation_annotation", "androidx.core_core", ], java_version: "1.7", @@ -457,7 +438,7 @@ android_library { android_library_import { name: "Aperture_androidx.media3_media3-extractor-nodeps", - aars: ["androidx/media3/media3-extractor/1.0.1/media3-extractor-1.0.1.aar"], + aars: ["androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -465,7 +446,6 @@ android_library_import { "//apex_available:anyapex", ], static_libs: [ - "androidx.annotation_annotation", "Aperture_androidx.media3_media3-common", "Aperture_androidx.media3_media3-decoder", ], @@ -479,10 +459,9 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/media3/media3-extractor/1.0.1/AndroidManifest.xml", + manifest: "androidx/media3/media3-extractor/1.0.2/AndroidManifest.xml", static_libs: [ "Aperture_androidx.media3_media3-extractor-nodeps", - "androidx.annotation_annotation", "Aperture_androidx.media3_media3-common", "Aperture_androidx.media3_media3-decoder", ], @@ -491,7 +470,7 @@ android_library { android_library_import { name: "Aperture_androidx.media3_media3-ui-nodeps", - aars: ["androidx/media3/media3-ui/1.0.1/media3-ui-1.0.1.aar"], + aars: ["androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -501,7 +480,6 @@ android_library_import { static_libs: [ "Aperture_androidx.media3_media3-common", "androidx.media_media", - "androidx.annotation_annotation", "androidx.recyclerview_recyclerview", ], } @@ -514,12 +492,11 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/media3/media3-ui/1.0.1/AndroidManifest.xml", + manifest: "androidx/media3/media3-ui/1.0.2/AndroidManifest.xml", static_libs: [ "Aperture_androidx.media3_media3-ui-nodeps", "Aperture_androidx.media3_media3-common", "androidx.media_media", - "androidx.annotation_annotation", "androidx.recyclerview_recyclerview", ], java_version: "1.7", @@ -527,7 +504,7 @@ android_library { android_library_import { name: "Aperture_com.google.android.material_material-nodeps", - aars: ["com/google/android/material/material/1.9.0-alpha02/material-1.9.0-alpha02.aar"], + aars: ["com/google/android/material/material/1.10.0-alpha03/material-1.10.0-alpha03.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -535,7 +512,6 @@ android_library_import { "//apex_available:anyapex", ], static_libs: [ - "androidx.annotation_annotation", "androidx.appcompat_appcompat", "androidx.cardview_cardview", "androidx.coordinatorlayout_coordinatorlayout", @@ -562,10 +538,9 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "com/google/android/material/material/1.9.0-alpha02/AndroidManifest.xml", + manifest: "com/google/android/material/material/1.10.0-alpha03/AndroidManifest.xml", static_libs: [ "Aperture_com.google.android.material_material-nodeps", - "androidx.annotation_annotation", "androidx.appcompat_appcompat", "androidx.cardview_cardview", "androidx.coordinatorlayout_coordinatorlayout", @@ -702,7 +677,6 @@ android_library_import { "kotlinx-coroutines-android", "kotlin-stdlib-jdk8", "Aperture_com.squareup.okhttp3_okhttp", - "androidx.annotation_annotation", "androidx.appcompat_appcompat-resources", "androidx.collection_collection", "androidx.core_core-ktx", @@ -725,7 +699,6 @@ android_library { "kotlinx-coroutines-android", "kotlin-stdlib-jdk8", "Aperture_com.squareup.okhttp3_okhttp", - "androidx.annotation_annotation", "androidx.appcompat_appcompat-resources", "androidx.collection_collection", "androidx.core_core-ktx", diff --git a/app/libs/androidx/lifecycle/lifecycle-common/2.5.1/lifecycle-common-2.5.1.jar b/app/libs/androidx/lifecycle/lifecycle-common/2.5.1/lifecycle-common-2.5.1.jar Binary files differdeleted file mode 100644 index da323a9..0000000 --- a/app/libs/androidx/lifecycle/lifecycle-common/2.5.1/lifecycle-common-2.5.1.jar +++ /dev/null diff --git a/app/libs/androidx/lifecycle/lifecycle-common/2.6.1/lifecycle-common-2.6.1.jar b/app/libs/androidx/lifecycle/lifecycle-common/2.6.1/lifecycle-common-2.6.1.jar Binary files differnew file mode 100644 index 0000000..fd6b42c --- /dev/null +++ b/app/libs/androidx/lifecycle/lifecycle-common/2.6.1/lifecycle-common-2.6.1.jar diff --git a/app/libs/androidx/media3/media3-common/1.0.1/media3-common-1.0.1.aar b/app/libs/androidx/media3/media3-common/1.0.1/media3-common-1.0.1.aar Binary files differdeleted file mode 100644 index 9a286fd..0000000 --- a/app/libs/androidx/media3/media3-common/1.0.1/media3-common-1.0.1.aar +++ /dev/null diff --git a/app/libs/androidx/media3/media3-common/1.0.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-common/1.0.2/AndroidManifest.xml index 2431e06..2431e06 100644 --- a/app/libs/androidx/media3/media3-common/1.0.1/AndroidManifest.xml +++ b/app/libs/androidx/media3/media3-common/1.0.2/AndroidManifest.xml diff --git a/app/libs/androidx/media3/media3-common/1.0.2/media3-common-1.0.2.aar b/app/libs/androidx/media3/media3-common/1.0.2/media3-common-1.0.2.aar Binary files differnew file mode 100644 index 0000000..0e402be --- /dev/null +++ b/app/libs/androidx/media3/media3-common/1.0.2/media3-common-1.0.2.aar diff --git a/app/libs/androidx/media3/media3-database/1.0.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-database/1.0.2/AndroidManifest.xml index 173cd75..173cd75 100644 --- a/app/libs/androidx/media3/media3-database/1.0.1/AndroidManifest.xml +++ b/app/libs/androidx/media3/media3-database/1.0.2/AndroidManifest.xml diff --git a/app/libs/androidx/media3/media3-database/1.0.1/media3-database-1.0.1.aar b/app/libs/androidx/media3/media3-database/1.0.2/media3-database-1.0.2.aar Binary files differindex 0e2171f..c4c9c37 100644 --- a/app/libs/androidx/media3/media3-database/1.0.1/media3-database-1.0.1.aar +++ b/app/libs/androidx/media3/media3-database/1.0.2/media3-database-1.0.2.aar diff --git a/app/libs/androidx/media3/media3-datasource/1.0.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-datasource/1.0.2/AndroidManifest.xml index 50987ba..50987ba 100644 --- a/app/libs/androidx/media3/media3-datasource/1.0.1/AndroidManifest.xml +++ b/app/libs/androidx/media3/media3-datasource/1.0.2/AndroidManifest.xml diff --git a/app/libs/androidx/media3/media3-datasource/1.0.1/media3-datasource-1.0.1.aar b/app/libs/androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.aar Binary files differindex 95c06e6..7a24948 100644 --- a/app/libs/androidx/media3/media3-datasource/1.0.1/media3-datasource-1.0.1.aar +++ b/app/libs/androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.aar diff --git a/app/libs/androidx/media3/media3-decoder/1.0.1/media3-decoder-1.0.1.aar b/app/libs/androidx/media3/media3-decoder/1.0.1/media3-decoder-1.0.1.aar Binary files differdeleted file mode 100644 index ba89efc..0000000 --- a/app/libs/androidx/media3/media3-decoder/1.0.1/media3-decoder-1.0.1.aar +++ /dev/null diff --git a/app/libs/androidx/media3/media3-decoder/1.0.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-decoder/1.0.2/AndroidManifest.xml index fbc2b51..fbc2b51 100644 --- a/app/libs/androidx/media3/media3-decoder/1.0.1/AndroidManifest.xml +++ b/app/libs/androidx/media3/media3-decoder/1.0.2/AndroidManifest.xml diff --git a/app/libs/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.aar b/app/libs/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.aar Binary files differnew file mode 100644 index 0000000..fec3862 --- /dev/null +++ b/app/libs/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.aar diff --git a/app/libs/androidx/media3/media3-exoplayer/1.0.1/media3-exoplayer-1.0.1.aar b/app/libs/androidx/media3/media3-exoplayer/1.0.1/media3-exoplayer-1.0.1.aar Binary files differdeleted file mode 100644 index e0c469a..0000000 --- a/app/libs/androidx/media3/media3-exoplayer/1.0.1/media3-exoplayer-1.0.1.aar +++ /dev/null diff --git a/app/libs/androidx/media3/media3-exoplayer/1.0.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-exoplayer/1.0.2/AndroidManifest.xml index 386d6d0..386d6d0 100644 --- a/app/libs/androidx/media3/media3-exoplayer/1.0.1/AndroidManifest.xml +++ b/app/libs/androidx/media3/media3-exoplayer/1.0.2/AndroidManifest.xml diff --git a/app/libs/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.aar b/app/libs/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.aar Binary files differnew file mode 100644 index 0000000..a9a98db --- /dev/null +++ b/app/libs/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.aar diff --git a/app/libs/androidx/media3/media3-extractor/1.0.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-extractor/1.0.2/AndroidManifest.xml index 89b5eb7..89b5eb7 100644 --- a/app/libs/androidx/media3/media3-extractor/1.0.1/AndroidManifest.xml +++ b/app/libs/androidx/media3/media3-extractor/1.0.2/AndroidManifest.xml diff --git a/app/libs/androidx/media3/media3-extractor/1.0.1/media3-extractor-1.0.1.aar b/app/libs/androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.aar Binary files differindex 1995c51..a81c11b 100644 --- a/app/libs/androidx/media3/media3-extractor/1.0.1/media3-extractor-1.0.1.aar +++ b/app/libs/androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.aar diff --git a/app/libs/androidx/media3/media3-ui/1.0.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-ui/1.0.2/AndroidManifest.xml index 3c9d28a..3c9d28a 100644 --- a/app/libs/androidx/media3/media3-ui/1.0.1/AndroidManifest.xml +++ b/app/libs/androidx/media3/media3-ui/1.0.2/AndroidManifest.xml diff --git a/app/libs/androidx/media3/media3-ui/1.0.1/media3-ui-1.0.1.aar b/app/libs/androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2.aar Binary files differindex e8f8cca..ca30387 100644 --- a/app/libs/androidx/media3/media3-ui/1.0.1/media3-ui-1.0.1.aar +++ b/app/libs/androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2.aar diff --git a/app/libs/com/google/android/material/material/1.9.0-alpha02/AndroidManifest.xml b/app/libs/com/google/android/material/material/1.10.0-alpha03/AndroidManifest.xml index bff0c00..8152959 100644 --- a/app/libs/com/google/android/material/material/1.9.0-alpha02/AndroidManifest.xml +++ b/app/libs/com/google/android/material/material/1.10.0-alpha03/AndroidManifest.xml @@ -17,9 +17,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.google.android.material" > - <uses-sdk - android:minSdkVersion="14" - android:targetSdkVersion="33" /> + <uses-sdk android:minSdkVersion="14" /> <application /> diff --git a/app/libs/com/google/android/material/material/1.10.0-alpha03/material-1.10.0-alpha03.aar b/app/libs/com/google/android/material/material/1.10.0-alpha03/material-1.10.0-alpha03.aar Binary files differnew file mode 100644 index 0000000..1610017 --- /dev/null +++ b/app/libs/com/google/android/material/material/1.10.0-alpha03/material-1.10.0-alpha03.aar diff --git a/app/libs/com/google/android/material/material/1.9.0-alpha02/material-1.9.0-alpha02.aar b/app/libs/com/google/android/material/material/1.9.0-alpha02/material-1.9.0-alpha02.aar Binary files differdeleted file mode 100644 index 3952329..0000000 --- a/app/libs/com/google/android/material/material/1.9.0-alpha02/material-1.9.0-alpha02.aar +++ /dev/null |