Aperture: Update CameraX to 1.4.0-alpha04
Change-Id: Id5402061108fdeaa9e26951e6f86b6b7cb5f1568
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 806ba94..be8b68c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -84,7 +84,7 @@
implementation("com.google.android.material:material:1.9.0")
// CameraX core library using the camera2 implementation
- val cameraxVersion = "1.4.0-alpha03"
+ val cameraxVersion = "1.4.0-alpha04"
// 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 5cab459..d907a9a 100644
--- a/app/libs/Android.bp
+++ b/app/libs/Android.bp
@@ -7,7 +7,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-camera2-nodeps",
- aars: ["androidx/camera/camera-camera2/1.4.0-alpha03/camera-camera2-1.4.0-alpha03.aar"],
+ aars: ["androidx/camera/camera-camera2/1.4.0-alpha04/camera-camera2-1.4.0-alpha04.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -31,7 +31,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-camera2/1.4.0-alpha03/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-camera2/1.4.0-alpha04/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-camera2-nodeps",
"Aperture_androidx.camera_camera-core",
@@ -45,7 +45,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-core-nodeps",
- aars: ["androidx/camera/camera-core/1.4.0-alpha03/camera-core-1.4.0-alpha03.aar"],
+ aars: ["androidx/camera/camera-core/1.4.0-alpha04/camera-core-1.4.0-alpha04.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -73,7 +73,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-core/1.4.0-alpha03/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-core/1.4.0-alpha04/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-core-nodeps",
"androidx.annotation_annotation-experimental",
@@ -91,7 +91,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-extensions-nodeps",
- aars: ["androidx/camera/camera-extensions/1.4.0-alpha03/camera-extensions-1.4.0-alpha03.aar"],
+ aars: ["androidx/camera/camera-extensions/1.4.0-alpha04/camera-extensions-1.4.0-alpha04.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -99,7 +99,6 @@
"//apex_available:anyapex",
],
static_libs: [
- "Aperture_androidx.camera_camera-camera2",
"Aperture_androidx.camera_camera-core",
"androidx.concurrent_concurrent-futures",
"androidx.core_core",
@@ -116,10 +115,9 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-extensions/1.4.0-alpha03/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-extensions/1.4.0-alpha04/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-extensions-nodeps",
- "Aperture_androidx.camera_camera-camera2",
"Aperture_androidx.camera_camera-core",
"androidx.concurrent_concurrent-futures",
"androidx.core_core",
@@ -131,7 +129,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-lifecycle-nodeps",
- aars: ["androidx/camera/camera-lifecycle/1.4.0-alpha03/camera-lifecycle-1.4.0-alpha03.aar"],
+ aars: ["androidx/camera/camera-lifecycle/1.4.0-alpha04/camera-lifecycle-1.4.0-alpha04.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -156,7 +154,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-lifecycle/1.4.0-alpha03/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-lifecycle/1.4.0-alpha04/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-lifecycle-nodeps",
"Aperture_androidx.camera_camera-core",
@@ -171,7 +169,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-video-nodeps",
- aars: ["androidx/camera/camera-video/1.4.0-alpha03/camera-video-1.4.0-alpha03.aar"],
+ aars: ["androidx/camera/camera-video/1.4.0-alpha04/camera-video-1.4.0-alpha04.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -194,7 +192,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-video/1.4.0-alpha03/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-video/1.4.0-alpha04/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-video-nodeps",
"Aperture_androidx.camera_camera-core",
@@ -207,7 +205,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-view-nodeps",
- aars: ["androidx/camera/camera-view/1.4.0-alpha03/camera-view-1.4.0-alpha03.aar"],
+ aars: ["androidx/camera/camera-view/1.4.0-alpha04/camera-view-1.4.0-alpha04.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -236,7 +234,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-view/1.4.0-alpha03/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-view/1.4.0-alpha04/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-view-nodeps",
"androidx.annotation_annotation-experimental",
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha03/camera-camera2-1.4.0-alpha03.aar b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha03/camera-camera2-1.4.0-alpha03.aar
deleted file mode 100644
index 8181157..0000000
--- a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha03/camera-camera2-1.4.0-alpha03.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha03/AndroidManifest.xml b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-camera2/1.4.0-alpha03/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha03/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-camera2/1.4.0-alpha03/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/camera-camera2-1.4.0-alpha04.aar b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/camera-camera2-1.4.0-alpha04.aar
new file mode 100644
index 0000000..012924a
--- /dev/null
+++ b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/camera-camera2-1.4.0-alpha04.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha03/camera-camera2-1.4.0-alpha03.aar.license b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/camera-camera2-1.4.0-alpha04.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-camera2/1.4.0-alpha03/camera-camera2-1.4.0-alpha03.aar.license
rename to app/libs/androidx/camera/camera-camera2/1.4.0-alpha04/camera-camera2-1.4.0-alpha04.aar.license
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha03/camera-core-1.4.0-alpha03.aar b/app/libs/androidx/camera/camera-core/1.4.0-alpha03/camera-core-1.4.0-alpha03.aar
deleted file mode 100644
index 926beec..0000000
--- a/app/libs/androidx/camera/camera-core/1.4.0-alpha03/camera-core-1.4.0-alpha03.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha03/AndroidManifest.xml b/app/libs/androidx/camera/camera-core/1.4.0-alpha04/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-core/1.4.0-alpha03/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-core/1.4.0-alpha04/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha03/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-core/1.4.0-alpha04/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-core/1.4.0-alpha03/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-core/1.4.0-alpha04/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha04/camera-core-1.4.0-alpha04.aar b/app/libs/androidx/camera/camera-core/1.4.0-alpha04/camera-core-1.4.0-alpha04.aar
new file mode 100644
index 0000000..eecf60b
--- /dev/null
+++ b/app/libs/androidx/camera/camera-core/1.4.0-alpha04/camera-core-1.4.0-alpha04.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha03/camera-core-1.4.0-alpha03.aar.license b/app/libs/androidx/camera/camera-core/1.4.0-alpha04/camera-core-1.4.0-alpha04.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-core/1.4.0-alpha03/camera-core-1.4.0-alpha03.aar.license
rename to app/libs/androidx/camera/camera-core/1.4.0-alpha04/camera-core-1.4.0-alpha04.aar.license
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha03/camera-extensions-1.4.0-alpha03.aar b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha03/camera-extensions-1.4.0-alpha03.aar
deleted file mode 100644
index f19a8c7..0000000
--- a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha03/camera-extensions-1.4.0-alpha03.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha03/AndroidManifest.xml b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-extensions/1.4.0-alpha03/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha03/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-extensions/1.4.0-alpha03/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/camera-extensions-1.4.0-alpha04.aar b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/camera-extensions-1.4.0-alpha04.aar
new file mode 100644
index 0000000..c560935
--- /dev/null
+++ b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/camera-extensions-1.4.0-alpha04.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha03/camera-extensions-1.4.0-alpha03.aar.license b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/camera-extensions-1.4.0-alpha04.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-extensions/1.4.0-alpha03/camera-extensions-1.4.0-alpha03.aar.license
rename to app/libs/androidx/camera/camera-extensions/1.4.0-alpha04/camera-extensions-1.4.0-alpha04.aar.license
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha03/camera-lifecycle-1.4.0-alpha03.aar b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha03/camera-lifecycle-1.4.0-alpha03.aar
deleted file mode 100644
index d815607..0000000
--- a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha03/camera-lifecycle-1.4.0-alpha03.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha03/AndroidManifest.xml b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha03/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha03/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha03/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/camera-lifecycle-1.4.0-alpha04.aar b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/camera-lifecycle-1.4.0-alpha04.aar
new file mode 100644
index 0000000..633851e
--- /dev/null
+++ b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/camera-lifecycle-1.4.0-alpha04.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha03/camera-lifecycle-1.4.0-alpha03.aar.license b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/camera-lifecycle-1.4.0-alpha04.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha03/camera-lifecycle-1.4.0-alpha03.aar.license
rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha04/camera-lifecycle-1.4.0-alpha04.aar.license
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha03/camera-video-1.4.0-alpha03.aar b/app/libs/androidx/camera/camera-video/1.4.0-alpha03/camera-video-1.4.0-alpha03.aar
deleted file mode 100644
index b61a946..0000000
--- a/app/libs/androidx/camera/camera-video/1.4.0-alpha03/camera-video-1.4.0-alpha03.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha03/AndroidManifest.xml b/app/libs/androidx/camera/camera-video/1.4.0-alpha04/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-video/1.4.0-alpha03/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-video/1.4.0-alpha04/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha03/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-video/1.4.0-alpha04/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-video/1.4.0-alpha03/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-video/1.4.0-alpha04/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha04/camera-video-1.4.0-alpha04.aar b/app/libs/androidx/camera/camera-video/1.4.0-alpha04/camera-video-1.4.0-alpha04.aar
new file mode 100644
index 0000000..2c6d190
--- /dev/null
+++ b/app/libs/androidx/camera/camera-video/1.4.0-alpha04/camera-video-1.4.0-alpha04.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha03/camera-video-1.4.0-alpha03.aar.license b/app/libs/androidx/camera/camera-video/1.4.0-alpha04/camera-video-1.4.0-alpha04.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-video/1.4.0-alpha03/camera-video-1.4.0-alpha03.aar.license
rename to app/libs/androidx/camera/camera-video/1.4.0-alpha04/camera-video-1.4.0-alpha04.aar.license
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha03/camera-view-1.4.0-alpha03.aar b/app/libs/androidx/camera/camera-view/1.4.0-alpha03/camera-view-1.4.0-alpha03.aar
deleted file mode 100644
index 85276da..0000000
--- a/app/libs/androidx/camera/camera-view/1.4.0-alpha03/camera-view-1.4.0-alpha03.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha03/AndroidManifest.xml b/app/libs/androidx/camera/camera-view/1.4.0-alpha04/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-view/1.4.0-alpha03/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-view/1.4.0-alpha04/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha03/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-view/1.4.0-alpha04/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-view/1.4.0-alpha03/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-view/1.4.0-alpha04/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha04/camera-view-1.4.0-alpha04.aar b/app/libs/androidx/camera/camera-view/1.4.0-alpha04/camera-view-1.4.0-alpha04.aar
new file mode 100644
index 0000000..f03cfe9
--- /dev/null
+++ b/app/libs/androidx/camera/camera-view/1.4.0-alpha04/camera-view-1.4.0-alpha04.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha03/camera-view-1.4.0-alpha03.aar.license b/app/libs/androidx/camera/camera-view/1.4.0-alpha04/camera-view-1.4.0-alpha04.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-view/1.4.0-alpha03/camera-view-1.4.0-alpha03.aar.license
rename to app/libs/androidx/camera/camera-view/1.4.0-alpha04/camera-view-1.4.0-alpha04.aar.license
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b03aecc..b23a790 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,7 +13,7 @@
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
- maven("https://raw.githubusercontent.com/lineage-next/camerax-aperture/6fa24f0179120c78210458762cd212fc79944e95/.m2")
+ maven("https://raw.githubusercontent.com/lineage-next/camerax-aperture/c8fdd97d7a0a080cb520acd7855717b9f60cec1f/.m2")
google()
mavenCentral()
}