diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2394d0f3..b59c5bc2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -91,7 +91,7 @@ dependencies { implementation("com.google.android.material:material:1.9.0") // CameraX core library using the camera2 implementation - val cameraxVersion = "1.3.0-rc01" + val cameraxVersion = "1.4.0-alpha01" // The following line is optional, as the core library is included indirectly by camera-camera2 implementation("androidx.camera:camera-core:${cameraxVersion}") implementation("androidx.camera:camera-camera2:${cameraxVersion}") diff --git a/app/libs/Android.bp b/app/libs/Android.bp index 2aa24109..6ba28524 100644 --- a/app/libs/Android.bp +++ b/app/libs/Android.bp @@ -7,7 +7,7 @@ android_library_import { name: "Flash_androidx.camera_camera-camera2-nodeps", - aars: ["androidx/camera/camera-camera2/1.3.0-rc01/camera-camera2-1.3.0-rc01.aar"], + aars: ["androidx/camera/camera-camera2/1.4.0-alpha01/camera-camera2-1.4.0-alpha01.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -31,7 +31,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-camera2/1.3.0-rc01/AndroidManifest.xml", + manifest: "androidx/camera/camera-camera2/1.4.0-alpha01/AndroidManifest.xml", static_libs: [ "Flash_androidx.camera_camera-camera2-nodeps", "Flash_androidx.camera_camera-core", @@ -45,7 +45,7 @@ android_library { android_library_import { name: "Flash_androidx.camera_camera-core-nodeps", - aars: ["androidx/camera/camera-core/1.3.0-rc01/camera-core-1.3.0-rc01.aar"], + aars: ["androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -73,7 +73,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-core/1.3.0-rc01/AndroidManifest.xml", + manifest: "androidx/camera/camera-core/1.4.0-alpha01/AndroidManifest.xml", static_libs: [ "Flash_androidx.camera_camera-core-nodeps", "androidx.annotation_annotation-experimental", @@ -91,7 +91,7 @@ android_library { android_library_import { name: "Flash_androidx.camera_camera-extensions-nodeps", - aars: ["androidx/camera/camera-extensions/1.3.0-rc01/camera-extensions-1.3.0-rc01.aar"], + aars: ["androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -116,7 +116,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-extensions/1.3.0-rc01/AndroidManifest.xml", + manifest: "androidx/camera/camera-extensions/1.4.0-alpha01/AndroidManifest.xml", static_libs: [ "Flash_androidx.camera_camera-extensions-nodeps", "Flash_androidx.camera_camera-camera2", @@ -131,7 +131,7 @@ android_library { android_library_import { name: "Flash_androidx.camera_camera-lifecycle-nodeps", - aars: ["androidx/camera/camera-lifecycle/1.3.0-rc01/camera-lifecycle-1.3.0-rc01.aar"], + aars: ["androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -156,7 +156,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-lifecycle/1.3.0-rc01/AndroidManifest.xml", + manifest: "androidx/camera/camera-lifecycle/1.4.0-alpha01/AndroidManifest.xml", static_libs: [ "Flash_androidx.camera_camera-lifecycle-nodeps", "Flash_androidx.camera_camera-core", @@ -171,7 +171,7 @@ android_library { android_library_import { name: "Flash_androidx.camera_camera-video-nodeps", - aars: ["androidx/camera/camera-video/1.3.0-rc01/camera-video-1.3.0-rc01.aar"], + aars: ["androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -194,7 +194,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-video/1.3.0-rc01/AndroidManifest.xml", + manifest: "androidx/camera/camera-video/1.4.0-alpha01/AndroidManifest.xml", static_libs: [ "Flash_androidx.camera_camera-video-nodeps", "Flash_androidx.camera_camera-core", @@ -207,7 +207,7 @@ android_library { android_library_import { name: "Flash_androidx.camera_camera-view-nodeps", - aars: ["androidx/camera/camera-view/1.3.0-rc01/camera-view-1.3.0-rc01.aar"], + aars: ["androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -236,7 +236,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-view/1.3.0-rc01/AndroidManifest.xml", + manifest: "androidx/camera/camera-view/1.4.0-alpha01/AndroidManifest.xml", static_libs: [ "Flash_androidx.camera_camera-view-nodeps", "androidx.annotation_annotation-experimental", diff --git a/app/libs/androidx/camera/camera-camera2/1.3.0-rc01/camera-camera2-1.3.0-rc01.aar b/app/libs/androidx/camera/camera-camera2/1.3.0-rc01/camera-camera2-1.3.0-rc01.aar deleted file mode 100644 index 1c8f66a3..00000000 Binary files a/app/libs/androidx/camera/camera-camera2/1.3.0-rc01/camera-camera2-1.3.0-rc01.aar and /dev/null differ diff --git a/app/libs/androidx/camera/camera-camera2/1.3.0-rc01/AndroidManifest.xml b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/AndroidManifest.xml similarity index 100% rename from app/libs/androidx/camera/camera-camera2/1.3.0-rc01/AndroidManifest.xml rename to app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-camera2/1.3.0-rc01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/AndroidManifest.xml.license similarity index 100% rename from app/libs/androidx/camera/camera-camera2/1.3.0-rc01/AndroidManifest.xml.license rename to app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/AndroidManifest.xml.license diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/camera-camera2-1.4.0-alpha01.aar b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/camera-camera2-1.4.0-alpha01.aar new file mode 100644 index 00000000..c1b26c79 Binary files /dev/null and b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/camera-camera2-1.4.0-alpha01.aar differ diff --git a/app/libs/androidx/camera/camera-camera2/1.3.0-rc01/camera-camera2-1.3.0-rc01.aar.license b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/camera-camera2-1.4.0-alpha01.aar.license similarity index 100% rename from app/libs/androidx/camera/camera-camera2/1.3.0-rc01/camera-camera2-1.3.0-rc01.aar.license rename to app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/camera-camera2-1.4.0-alpha01.aar.license diff --git a/app/libs/androidx/camera/camera-core/1.3.0-rc01/camera-core-1.3.0-rc01.aar b/app/libs/androidx/camera/camera-core/1.3.0-rc01/camera-core-1.3.0-rc01.aar deleted file mode 100644 index dd3c9452..00000000 Binary files a/app/libs/androidx/camera/camera-core/1.3.0-rc01/camera-core-1.3.0-rc01.aar and /dev/null differ diff --git a/app/libs/androidx/camera/camera-core/1.3.0-rc01/AndroidManifest.xml b/app/libs/androidx/camera/camera-core/1.4.0-alpha01/AndroidManifest.xml similarity index 100% rename from app/libs/androidx/camera/camera-core/1.3.0-rc01/AndroidManifest.xml rename to app/libs/androidx/camera/camera-core/1.4.0-alpha01/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-core/1.3.0-rc01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-core/1.4.0-alpha01/AndroidManifest.xml.license similarity index 100% rename from app/libs/androidx/camera/camera-core/1.3.0-rc01/AndroidManifest.xml.license rename to app/libs/androidx/camera/camera-core/1.4.0-alpha01/AndroidManifest.xml.license diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar b/app/libs/androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar new file mode 100644 index 00000000..6f6c3166 Binary files /dev/null and b/app/libs/androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar differ diff --git a/app/libs/androidx/camera/camera-core/1.3.0-rc01/camera-core-1.3.0-rc01.aar.license b/app/libs/androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar.license similarity index 100% rename from app/libs/androidx/camera/camera-core/1.3.0-rc01/camera-core-1.3.0-rc01.aar.license rename to app/libs/androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar.license diff --git a/app/libs/androidx/camera/camera-extensions/1.3.0-rc01/camera-extensions-1.3.0-rc01.aar b/app/libs/androidx/camera/camera-extensions/1.3.0-rc01/camera-extensions-1.3.0-rc01.aar deleted file mode 100644 index 3b0e9c93..00000000 Binary files a/app/libs/androidx/camera/camera-extensions/1.3.0-rc01/camera-extensions-1.3.0-rc01.aar and /dev/null differ diff --git a/app/libs/androidx/camera/camera-extensions/1.3.0-rc01/AndroidManifest.xml b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/AndroidManifest.xml similarity index 100% rename from app/libs/androidx/camera/camera-extensions/1.3.0-rc01/AndroidManifest.xml rename to app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-extensions/1.3.0-rc01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/AndroidManifest.xml.license similarity index 100% rename from app/libs/androidx/camera/camera-extensions/1.3.0-rc01/AndroidManifest.xml.license rename to app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/AndroidManifest.xml.license diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar new file mode 100644 index 00000000..2ca12d1c Binary files /dev/null and b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar differ diff --git a/app/libs/androidx/camera/camera-extensions/1.3.0-rc01/camera-extensions-1.3.0-rc01.aar.license b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar.license similarity index 100% rename from app/libs/androidx/camera/camera-extensions/1.3.0-rc01/camera-extensions-1.3.0-rc01.aar.license rename to app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar.license diff --git a/app/libs/androidx/camera/camera-lifecycle/1.3.0-rc01/camera-lifecycle-1.3.0-rc01.aar b/app/libs/androidx/camera/camera-lifecycle/1.3.0-rc01/camera-lifecycle-1.3.0-rc01.aar deleted file mode 100644 index bc56900e..00000000 Binary files a/app/libs/androidx/camera/camera-lifecycle/1.3.0-rc01/camera-lifecycle-1.3.0-rc01.aar and /dev/null differ diff --git a/app/libs/androidx/camera/camera-lifecycle/1.3.0-rc01/AndroidManifest.xml b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/AndroidManifest.xml similarity index 100% rename from app/libs/androidx/camera/camera-lifecycle/1.3.0-rc01/AndroidManifest.xml rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-lifecycle/1.3.0-rc01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/AndroidManifest.xml.license similarity index 100% rename from app/libs/androidx/camera/camera-lifecycle/1.3.0-rc01/AndroidManifest.xml.license rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/AndroidManifest.xml.license diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar new file mode 100644 index 00000000..59833bb7 Binary files /dev/null and b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar differ diff --git a/app/libs/androidx/camera/camera-lifecycle/1.3.0-rc01/camera-lifecycle-1.3.0-rc01.aar.license b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar.license similarity index 100% rename from app/libs/androidx/camera/camera-lifecycle/1.3.0-rc01/camera-lifecycle-1.3.0-rc01.aar.license rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar.license diff --git a/app/libs/androidx/camera/camera-video/1.3.0-rc01/camera-video-1.3.0-rc01.aar b/app/libs/androidx/camera/camera-video/1.3.0-rc01/camera-video-1.3.0-rc01.aar deleted file mode 100644 index f37f4dbe..00000000 Binary files a/app/libs/androidx/camera/camera-video/1.3.0-rc01/camera-video-1.3.0-rc01.aar and /dev/null differ diff --git a/app/libs/androidx/camera/camera-video/1.3.0-rc01/AndroidManifest.xml b/app/libs/androidx/camera/camera-video/1.4.0-alpha01/AndroidManifest.xml similarity index 100% rename from app/libs/androidx/camera/camera-video/1.3.0-rc01/AndroidManifest.xml rename to app/libs/androidx/camera/camera-video/1.4.0-alpha01/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-video/1.3.0-rc01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-video/1.4.0-alpha01/AndroidManifest.xml.license similarity index 100% rename from app/libs/androidx/camera/camera-video/1.3.0-rc01/AndroidManifest.xml.license rename to app/libs/androidx/camera/camera-video/1.4.0-alpha01/AndroidManifest.xml.license diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar b/app/libs/androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar new file mode 100644 index 00000000..fa2db859 Binary files /dev/null and b/app/libs/androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar differ diff --git a/app/libs/androidx/camera/camera-video/1.3.0-rc01/camera-video-1.3.0-rc01.aar.license b/app/libs/androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar.license similarity index 100% rename from app/libs/androidx/camera/camera-video/1.3.0-rc01/camera-video-1.3.0-rc01.aar.license rename to app/libs/androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar.license diff --git a/app/libs/androidx/camera/camera-view/1.3.0-rc01/camera-view-1.3.0-rc01.aar b/app/libs/androidx/camera/camera-view/1.3.0-rc01/camera-view-1.3.0-rc01.aar deleted file mode 100644 index 7af9067f..00000000 Binary files a/app/libs/androidx/camera/camera-view/1.3.0-rc01/camera-view-1.3.0-rc01.aar and /dev/null differ diff --git a/app/libs/androidx/camera/camera-view/1.3.0-rc01/AndroidManifest.xml b/app/libs/androidx/camera/camera-view/1.4.0-alpha01/AndroidManifest.xml similarity index 100% rename from app/libs/androidx/camera/camera-view/1.3.0-rc01/AndroidManifest.xml rename to app/libs/androidx/camera/camera-view/1.4.0-alpha01/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-view/1.3.0-rc01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-view/1.4.0-alpha01/AndroidManifest.xml.license similarity index 100% rename from app/libs/androidx/camera/camera-view/1.3.0-rc01/AndroidManifest.xml.license rename to app/libs/androidx/camera/camera-view/1.4.0-alpha01/AndroidManifest.xml.license diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar b/app/libs/androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar new file mode 100644 index 00000000..ee275893 Binary files /dev/null and b/app/libs/androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar differ diff --git a/app/libs/androidx/camera/camera-view/1.3.0-rc01/camera-view-1.3.0-rc01.aar.license b/app/libs/androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar.license similarity index 100% rename from app/libs/androidx/camera/camera-view/1.3.0-rc01/camera-view-1.3.0-rc01.aar.license rename to app/libs/androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar.license diff --git a/settings.gradle.kts b/settings.gradle.kts index 2dee39a3..cf74455a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -13,7 +13,7 @@ pluginManagement { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - maven("https://raw.githubusercontent.com/lineage-next/camerax-aperture/fb5d75481f9639eeeab1a4f7b26d23533b9be04e/.m2") + maven("https://raw.githubusercontent.com/lineage-next/camerax-aperture/54901603849cb157716f4ff65bb85ab0538c30e7/.m2") google() mavenCentral() }