diff options
author | LuK1337 <priv.luk@gmail.com> | 2023-05-24 20:25:10 +0200 |
---|---|---|
committer | LuK1337 <priv.luk@gmail.com> | 2023-05-24 20:26:18 +0200 |
commit | b2d505b38dbec6e82cfa83c3239d62baf1c79664 (patch) | |
tree | ec4a839b435d49c20fef591c1250bf4d681afa76 | |
parent | 78e3fca6682e3ea7c6a096fc72e60817183a723b (diff) |
Aperture: Update CameraX to 1.3.0-alpha07
Change-Id: Icc2582e79728097ebe73b501d7836011b333782b
24 files changed, 35 insertions, 80 deletions
diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1094dc7..25fdfc0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -60,7 +60,7 @@ dependencies { implementation("com.google.android.material:material:1.9.0-alpha02") // CameraX core library using the camera2 implementation - val cameraxVersion = "1.3.0-alpha06" + val cameraxVersion = "1.3.0-alpha07" // 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 e797ee7..bd7ea0b 100644 --- a/app/libs/Android.bp +++ b/app/libs/Android.bp @@ -1,7 +1,7 @@ // DO NOT EDIT THIS FILE MANUALLY android_library_import { name: "Aperture_androidx.camera_camera-camera2-nodeps", - aars: ["androidx/camera/camera-camera2/1.3.0-alpha06/camera-camera2-1.3.0-alpha06.aar"], + aars: ["androidx/camera/camera-camera2/1.3.0-alpha07/camera-camera2-1.3.0-alpha07.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -26,7 +26,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-camera2/1.3.0-alpha06/AndroidManifest.xml", + manifest: "androidx/camera/camera-camera2/1.3.0-alpha07/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-camera2-nodeps", "androidx.annotation_annotation", @@ -41,7 +41,7 @@ android_library { android_library_import { name: "Aperture_androidx.camera_camera-core-nodeps", - aars: ["androidx/camera/camera-core/1.3.0-alpha06/camera-core-1.3.0-alpha06.aar"], + aars: ["androidx/camera/camera-core/1.3.0-alpha07/camera-core-1.3.0-alpha07.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -70,7 +70,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-core/1.3.0-alpha06/AndroidManifest.xml", + manifest: "androidx/camera/camera-core/1.3.0-alpha07/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-core-nodeps", "androidx.annotation_annotation", @@ -89,7 +89,7 @@ android_library { android_library_import { name: "Aperture_androidx.camera_camera-extensions-nodeps", - aars: ["androidx/camera/camera-extensions/1.3.0-alpha06/camera-extensions-1.3.0-alpha06.aar"], + aars: ["androidx/camera/camera-extensions/1.3.0-alpha07/camera-extensions-1.3.0-alpha07.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -114,7 +114,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-extensions/1.3.0-alpha06/AndroidManifest.xml", + manifest: "androidx/camera/camera-extensions/1.3.0-alpha07/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-extensions-nodeps", "Aperture_androidx.camera_camera-camera2", @@ -129,7 +129,7 @@ android_library { android_library_import { name: "Aperture_androidx.camera_camera-lifecycle-nodeps", - aars: ["androidx/camera/camera-lifecycle/1.3.0-alpha06/camera-lifecycle-1.3.0-alpha06.aar"], + aars: ["androidx/camera/camera-lifecycle/1.3.0-alpha07/camera-lifecycle-1.3.0-alpha07.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -154,7 +154,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-lifecycle/1.3.0-alpha06/AndroidManifest.xml", + manifest: "androidx/camera/camera-lifecycle/1.3.0-alpha07/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-lifecycle-nodeps", "Aperture_androidx.camera_camera-core", @@ -169,7 +169,7 @@ android_library { android_library_import { name: "Aperture_androidx.camera_camera-video-nodeps", - aars: ["androidx/camera/camera-video/1.3.0-alpha06/camera-video-1.3.0-alpha06.aar"], + aars: ["androidx/camera/camera-video/1.3.0-alpha07/camera-video-1.3.0-alpha07.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -193,7 +193,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-video/1.3.0-alpha06/AndroidManifest.xml", + manifest: "androidx/camera/camera-video/1.3.0-alpha07/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-video-nodeps", "androidx.annotation_annotation", @@ -207,7 +207,7 @@ android_library { android_library_import { name: "Aperture_androidx.camera_camera-view-nodeps", - aars: ["androidx/camera/camera-view/1.3.0-alpha06/camera-view-1.3.0-alpha06.aar"], + aars: ["androidx/camera/camera-view/1.3.0-alpha07/camera-view-1.3.0-alpha07.aar"], sdk_version: "33", min_sdk_version: "14", apex_available: [ @@ -237,7 +237,7 @@ android_library { "//apex_available:platform", "//apex_available:anyapex", ], - manifest: "androidx/camera/camera-view/1.3.0-alpha06/AndroidManifest.xml", + manifest: "androidx/camera/camera-view/1.3.0-alpha07/AndroidManifest.xml", static_libs: [ "Aperture_androidx.camera_camera-view-nodeps", "androidx.annotation_annotation", diff --git a/app/libs/androidx/camera/camera-camera2/1.3.0-alpha06/camera-camera2-1.3.0-alpha06.aar b/app/libs/androidx/camera/camera-camera2/1.3.0-alpha06/camera-camera2-1.3.0-alpha06.aar Binary files differdeleted file mode 100644 index b75efd6..0000000 --- a/app/libs/androidx/camera/camera-camera2/1.3.0-alpha06/camera-camera2-1.3.0-alpha06.aar +++ /dev/null diff --git a/app/libs/androidx/camera/camera-camera2/1.3.0-alpha06/AndroidManifest.xml b/app/libs/androidx/camera/camera-camera2/1.3.0-alpha07/AndroidManifest.xml index 6a2f9b2..6a2f9b2 100644 --- a/app/libs/androidx/camera/camera-camera2/1.3.0-alpha06/AndroidManifest.xml +++ b/app/libs/androidx/camera/camera-camera2/1.3.0-alpha07/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-camera2/1.3.0-alpha07/camera-camera2-1.3.0-alpha07.aar b/app/libs/androidx/camera/camera-camera2/1.3.0-alpha07/camera-camera2-1.3.0-alpha07.aar Binary files differnew file mode 100644 index 0000000..348d6fb --- /dev/null +++ b/app/libs/androidx/camera/camera-camera2/1.3.0-alpha07/camera-camera2-1.3.0-alpha07.aar diff --git a/app/libs/androidx/camera/camera-core/1.3.0-alpha06/camera-core-1.3.0-alpha06.aar b/app/libs/androidx/camera/camera-core/1.3.0-alpha06/camera-core-1.3.0-alpha06.aar Binary files differdeleted file mode 100644 index 1e08022..0000000 --- a/app/libs/androidx/camera/camera-core/1.3.0-alpha06/camera-core-1.3.0-alpha06.aar +++ /dev/null diff --git a/app/libs/androidx/camera/camera-core/1.3.0-alpha06/AndroidManifest.xml b/app/libs/androidx/camera/camera-core/1.3.0-alpha07/AndroidManifest.xml index 3e1d872..3e1d872 100644 --- a/app/libs/androidx/camera/camera-core/1.3.0-alpha06/AndroidManifest.xml +++ b/app/libs/androidx/camera/camera-core/1.3.0-alpha07/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-core/1.3.0-alpha07/camera-core-1.3.0-alpha07.aar b/app/libs/androidx/camera/camera-core/1.3.0-alpha07/camera-core-1.3.0-alpha07.aar Binary files differnew file mode 100644 index 0000000..60bb9c0 --- /dev/null +++ b/app/libs/androidx/camera/camera-core/1.3.0-alpha07/camera-core-1.3.0-alpha07.aar diff --git a/app/libs/androidx/camera/camera-extensions/1.3.0-alpha06/camera-extensions-1.3.0-alpha06.aar b/app/libs/androidx/camera/camera-extensions/1.3.0-alpha06/camera-extensions-1.3.0-alpha06.aar Binary files differdeleted file mode 100644 index 39708e4..0000000 --- a/app/libs/androidx/camera/camera-extensions/1.3.0-alpha06/camera-extensions-1.3.0-alpha06.aar +++ /dev/null diff --git a/app/libs/androidx/camera/camera-extensions/1.3.0-alpha06/AndroidManifest.xml b/app/libs/androidx/camera/camera-extensions/1.3.0-alpha07/AndroidManifest.xml index d2937af..d2937af 100644 --- a/app/libs/androidx/camera/camera-extensions/1.3.0-alpha06/AndroidManifest.xml +++ b/app/libs/androidx/camera/camera-extensions/1.3.0-alpha07/AndroidManifest.xml diff --git a/app/libs/androidx/camera/camera-extensions/1.3.0-alpha07/camera-extensions-1.3.0-alpha07.aar b/app/libs/androidx/camera/camera-extensions/1.3.0-alpha07/camera-extensions-1.3.0-alpha07.aar Binary files differnew file mode 100644 index 0000000..5f6f960 --- /dev/null +++ b/app/libs/androidx/camera/camera-extensions/1.3.0-alpha07/camera-extensions-1.3.0-alpha07.aar diff --git a/app/libs/androidx/camera/camera-lifecycle/1.3.0-alpha06/AndroidManifest.xml b/app/libs/androidx/camera/camera-lifecycle/1.3.0-alpha06/AndroidManifest.xml deleted file mode 100644 index e9e1251..0000000 --- a/app/libs/androidx/camera/camera-lifecycle/1.3.0-alpha06/AndroidManifest.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2019 The Android Open Source Project - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. ---> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="androidx.camera.lifecycle" > - - <uses-sdk android:minSdkVersion="14" /> - -</manifest>
\ No newline at end of file diff --git a/app/libs/androidx/camera/camera-lifecycle/1.3.0-alpha06/camera-lifecycle-1.3.0-alpha06.aar b/app/libs/androidx/camera/camera-lifecycle/1.3.0-alpha06/camera-lifecycle-1.3.0-alpha06.aar Binary files differdeleted file mode 100644 index 5edf69f..0000000 --- a/app/libs/androidx/camera/camera-lifecycle/1.3.0-alpha06/camera-lifecycle-1.3.0-alpha06.aar +++ /dev/null diff --git a/app/libs/androidx/camera/camera-lifecycle/1.3.0-alpha07/AndroidManifest.xml b/app/libs/androidx/camera/camera-lifecycle/1.3.0-alpha07/AndroidManifest.xml new file mode 100644 index 0000000..4ac7e8e --- /dev/null +++ b/app/libs/androidx/camera/camera-lifecycle/1.3.0-alpha07/AndroidManifest.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="androidx.camera.lifecycle" > + + <uses-sdk android:minSdkVersion="14" /> + +</manifest>
\ No newline at end of file diff --git a/app/libs/androidx/camera/camera-lifecycle/1.3.0-alpha07/camera-lifecycle-1.3.0-alpha07.aar b/app/libs/androidx/camera/camera-lifecycle/1.3.0-alpha07/camera-lifecycle-1.3.0-alpha07.aar Binary files differnew file mode 100644 index 0000000..35b9396 --- /dev/null +++ b/app/libs/androidx/camera/camera-lifecycle/1.3.0-alpha07/camera-lifecycle-1.3.0-alpha07.aar diff --git a/app/libs/androidx/camera/camera-video/1.3.0-alpha06/AndroidManifest.xml b/app/libs/androidx/camera/camera-video/1.3.0-alpha06/AndroidManifest.xml deleted file mode 100644 index dd1c82c..0000000 --- a/app/libs/androidx/camera/camera-video/1.3.0-alpha06/AndroidManifest.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright 2020 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="androidx.camera.video" > - - <uses-sdk android:minSdkVersion="14" /> - -</manifest>
\ No newline at end of file diff --git a/app/libs/androidx/camera/camera-video/1.3.0-alpha06/camera-video-1.3.0-alpha06.aar b/app/libs/androidx/camera/camera-video/1.3.0-alpha06/camera-video-1.3.0-alpha06.aar Binary files differdeleted file mode 100644 index 711e2ad..0000000 --- a/app/libs/androidx/camera/camera-video/1.3.0-alpha06/camera-video-1.3.0-alpha06.aar +++ /dev/null diff --git a/app/libs/androidx/camera/camera-video/1.3.0-alpha07/AndroidManifest.xml b/app/libs/androidx/camera/camera-video/1.3.0-alpha07/AndroidManifest.xml new file mode 100644 index 0000000..f7d428d --- /dev/null +++ b/app/libs/androidx/camera/camera-video/1.3.0-alpha07/AndroidManifest.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="androidx.camera.video" > + + <uses-sdk android:minSdkVersion="14" /> + +</manifest>
\ No newline at end of file diff --git a/app/libs/androidx/camera/camera-video/1.3.0-alpha07/camera-video-1.3.0-alpha07.aar b/app/libs/androidx/camera/camera-video/1.3.0-alpha07/camera-video-1.3.0-alpha07.aar Binary files differnew file mode 100644 index 0000000..6feb30b --- /dev/null +++ b/app/libs/androidx/camera/camera-video/1.3.0-alpha07/camera-video-1.3.0-alpha07.aar diff --git a/app/libs/androidx/camera/camera-view/1.3.0-alpha06/AndroidManifest.xml b/app/libs/androidx/camera/camera-view/1.3.0-alpha06/AndroidManifest.xml deleted file mode 100644 index 8829c53..0000000 --- a/app/libs/androidx/camera/camera-view/1.3.0-alpha06/AndroidManifest.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2019 The Android Open Source Project - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. ---> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="androidx.camera.view" > - - <uses-sdk android:minSdkVersion="14" /> - -</manifest>
\ No newline at end of file diff --git a/app/libs/androidx/camera/camera-view/1.3.0-alpha06/camera-view-1.3.0-alpha06.aar b/app/libs/androidx/camera/camera-view/1.3.0-alpha06/camera-view-1.3.0-alpha06.aar Binary files differdeleted file mode 100644 index 6842588..0000000 --- a/app/libs/androidx/camera/camera-view/1.3.0-alpha06/camera-view-1.3.0-alpha06.aar +++ /dev/null diff --git a/app/libs/androidx/camera/camera-view/1.3.0-alpha07/AndroidManifest.xml b/app/libs/androidx/camera/camera-view/1.3.0-alpha07/AndroidManifest.xml new file mode 100644 index 0000000..4946173 --- /dev/null +++ b/app/libs/androidx/camera/camera-view/1.3.0-alpha07/AndroidManifest.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="androidx.camera.view" > + + <uses-sdk android:minSdkVersion="14" /> + +</manifest>
\ No newline at end of file diff --git a/app/libs/androidx/camera/camera-view/1.3.0-alpha07/camera-view-1.3.0-alpha07.aar b/app/libs/androidx/camera/camera-view/1.3.0-alpha07/camera-view-1.3.0-alpha07.aar Binary files differnew file mode 100644 index 0000000..9d41550 --- /dev/null +++ b/app/libs/androidx/camera/camera-view/1.3.0-alpha07/camera-view-1.3.0-alpha07.aar diff --git a/settings.gradle.kts b/settings.gradle.kts index 144365f..4162b7e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,7 +8,7 @@ pluginManagement { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - maven("https://raw.githubusercontent.com/luk1337/camerax_selfie/8fce720404a9b396a6f38a0be598a3e63002b2f2/.m2") + maven("https://raw.githubusercontent.com/luk1337/camerax_selfie/1306d8431684a0225f41986501833772f3c28ba4/.m2") google() mavenCentral() } |