Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_p…

…ackages_apps_Aperture into android-14.0

Change-Id: Icef32bfaeadd633c746b5a1b40b9b083ee1c6559

.github/workflows/build/action.yml

@@ -9,6 +9,7 @@ runs:
       with:
         distribution: 'zulu'
         java-version: 17
+        cache: 'gradle'
 
     - name: Build with Gradle
       shell: bash

.github/workflows/gerrit.yml

@@ -21,3 +21,10 @@ jobs:
 
     - name: Build
       uses: ./.github/workflows/build
+
+    - uses: lineageos-infra/gerrit-vote@main
+      if: always()
+      with:
+        auth: ${{ secrets.GERRIT_VOTE_CREDS }}
+        change: ${{ inputs.change }}
+        ref: ${{ inputs.ref }}

LICENSES/CC-PDDC.txt

@@ -0,0 +1,8 @@
+
+The person or persons who have associated work with this document (the "Dedicator" or "Certifier") hereby either (a) certifies that, to the best of his knowledge, the work of authorship identified is in the public domain of the country from which the work is published, or (b) hereby dedicates whatever copyright the dedicators holds in the work of authorship identified below (the "Work") to the public domain. A certifier, moreover, dedicates any copyright interest he may have in the associated work, and for these purposes, is described as a "dedicator" below.
+
+A certifier has taken reasonable steps to verify the copyright status of this work. Certifier recognizes that his good faith efforts may not shield him from liability if in fact the work certified is not in the public domain.
+
+Dedicator makes this dedication for the benefit of the public at large and to the detriment of the Dedicator's heirs and successors. Dedicator intends this dedication to be an overt act of relinquishment in perpetuity of all present and future rights under copyright law, whether vested or contingent, in the Work. Dedicator understands that such relinquishment of all rights includes the relinquishment of all rights to enforce (by lawsuit or otherwise) those copyrights in the Work.
+
+Dedicator recognizes that, once placed in the public domain, the Work may be freely reproduced, distributed, transmitted, used, modified, built upon, or otherwise exploited by anyone for any purpose, commercial or non-commercial, and in any way, including by methods that have not yet been invented or conceived.

app/Android.bp

@@ -16,7 +16,7 @@ android_app {
     resource_dirs: ["src/main/res"],
     manifest: "src/main/AndroidManifest.xml",
 
-    sdk_version: "current",
+    sdk_version: "33",
     product_specific: true,
     overrides: ["Camera2"],
 

app/build.gradle.kts

@@ -18,7 +18,7 @@ apply {
 
 buildscript {
     repositories {
-        maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.1/.m2")
+        maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.4/.m2")
     }
 
     dependencies {
@@ -28,6 +28,7 @@ buildscript {
 
 android {
     compileSdk = 33
+    namespace = "org.lineageos.aperture"
 
     defaultConfig {
         applicationId = "org.lineageos.aperture"
@@ -83,7 +84,7 @@ dependencies {
     implementation("com.google.android.material:material:1.9.0")
 
     // CameraX core library using the camera2 implementation
-    val cameraxVersion = "1.4.0-alpha01"
+    val cameraxVersion = "1.4.0-alpha02"
     // 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}")
@@ -123,6 +124,7 @@ configure<GenerateBpPluginExtension> {
             }
             module.group.startsWith("org.jetbrains") -> true
             module.group == "com.google.auto.value" -> true
+            module.group == "com.google.errorprone" -> true
             module.group == "com.google.guava" -> true
             module.group == "junit" -> true
             else -> false

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-alpha01/camera-camera2-1.4.0-alpha01.aar"],
+    aars: ["androidx/camera/camera-camera2/1.4.0-alpha02/camera-camera2-1.4.0-alpha02.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.4.0-alpha01/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-camera2/1.4.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-camera2-nodeps",
         "Aperture_androidx.camera_camera-core",
@@ -45,7 +45,7 @@ android_library {
 
 android_library_import {
     name: "Aperture_androidx.camera_camera-core-nodeps",
-    aars: ["androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar"],
+    aars: ["androidx/camera/camera-core/1.4.0-alpha02/camera-core-1.4.0-alpha02.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.4.0-alpha01/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-core/1.4.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-core-nodeps",
         "androidx.annotation_annotation-experimental",
@@ -91,7 +91,7 @@ android_library {
 
 android_library_import {
     name: "Aperture_androidx.camera_camera-extensions-nodeps",
-    aars: ["androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar"],
+    aars: ["androidx/camera/camera-extensions/1.4.0-alpha02/camera-extensions-1.4.0-alpha02.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.4.0-alpha01/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-extensions/1.4.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-extensions-nodeps",
         "Aperture_androidx.camera_camera-camera2",
@@ -131,7 +131,7 @@ android_library {
 
 android_library_import {
     name: "Aperture_androidx.camera_camera-lifecycle-nodeps",
-    aars: ["androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar"],
+    aars: ["androidx/camera/camera-lifecycle/1.4.0-alpha02/camera-lifecycle-1.4.0-alpha02.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.4.0-alpha01/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-lifecycle/1.4.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-lifecycle-nodeps",
         "Aperture_androidx.camera_camera-core",
@@ -171,7 +171,7 @@ android_library {
 
 android_library_import {
     name: "Aperture_androidx.camera_camera-video-nodeps",
-    aars: ["androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar"],
+    aars: ["androidx/camera/camera-video/1.4.0-alpha02/camera-video-1.4.0-alpha02.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.4.0-alpha01/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-video/1.4.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-video-nodeps",
         "Aperture_androidx.camera_camera-core",
@@ -207,7 +207,7 @@ android_library {
 
 android_library_import {
     name: "Aperture_androidx.camera_camera-view-nodeps",
-    aars: ["androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar"],
+    aars: ["androidx/camera/camera-view/1.4.0-alpha02/camera-view-1.4.0-alpha02.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.4.0-alpha01/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-view/1.4.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-view-nodeps",
         "androidx.annotation_annotation-experimental",
@@ -568,7 +568,7 @@ android_library_import {
         "androidx.transition_transition",
         "androidx.vectordrawable_vectordrawable",
         "androidx.viewpager2_viewpager2",
-        "Aperture_com.google.errorprone_error_prone_annotations",
+        "error_prone_annotations",
     ],
 }
 
@@ -597,32 +597,7 @@ android_library {
         "androidx.transition_transition",
         "androidx.vectordrawable_vectordrawable",
         "androidx.viewpager2_viewpager2",
-        "Aperture_com.google.errorprone_error_prone_annotations",
-    ],
-    java_version: "1.7",
-}
-
-java_import {
-    name: "Aperture_com.google.errorprone_error_prone_annotations-nodeps",
-    jars: ["com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar"],
-    sdk_version: "33",
-    min_sdk_version: "14",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-}
-
-java_library_static {
-    name: "Aperture_com.google.errorprone_error_prone_annotations",
-    sdk_version: "33",
-    min_sdk_version: "14",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    static_libs: [
-        "Aperture_com.google.errorprone_error_prone_annotations-nodeps",
+        "error_prone_annotations",
     ],
     java_version: "1.7",
 }