Merge remote-tracking branch 'lineage/lineage-22.0' into staging/stag…

…ing/android15_merge-lineage-22.0

# By Luca Stefani (5) and others
# Via LuK1337
* lineage/lineage-22.0:
  Aperture: Update CameraX to 1.5.0-alpha03
  Aperture: Use AOSP material & lifecycle-common
  Aperture: Update to SDK 35
  Aperture: Update AGP to 8.7.2
  Automatic translation import
  Aperture: Don't use resource from other package
  Aperture: Optimize and shrink resources
  Automatic translation import
  Aperture: Replace deprecated .reuse/dep5 with REUSE.toml
  Automatic translation import
  Aperture: Update CameraX to 1.5.0-alpha02

Change-Id: I7e423a3129fc088703cb59ac9db07356549f0ea8

REUSE.toml

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2023-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+
+version = 1
+SPDX-PackageName = "Aperture"
+SPDX-PackageSupplier = "The LineageOS Project"
+SPDX-PackageDownloadLocation = "https://github.com/LineageOS/android_packages_apps_Aperture"
+
+[[annotations]]
+path = [".github/workflows/**", ".gitignore", "app/.gitignore", "lens_launcher/.gitignore"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2023 The LineageOS Project"
+SPDX-License-Identifier = "Apache-2.0"
+
+[[annotations]]
+path = "gradle/wrapper/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2007-2023 Gradle, Inc."
+SPDX-License-Identifier = "Apache-2.0"

app/Android.bp

@@ -16,7 +16,7 @@ android_app {
     resource_dirs: ["src/main/res"],
     manifest: "src/main/AndroidManifest.xml",
 
-    sdk_version: "34",
+    sdk_version: "35",
     product_specific: true,
 
     use_embedded_native_libs: true,
@@ -42,7 +42,7 @@ android_app {
         "androidx.exifinterface_exifinterface",
         "androidx.lifecycle_lifecycle-viewmodel-ktx",
         "androidx.preference_preference",
-        "Aperture_com.google.android.material_material",
+        "com.google.android.material_material",
         "Aperture_androidx.camera_camera-core",
         "Aperture_androidx.camera_camera-camera2",
         "Aperture_androidx.camera_camera-lifecycle",
@@ -63,7 +63,9 @@ android_app {
     ],
 
     optimize: {
+        optimize: true,
         proguard_flags_files: ["proguard-rules.pro"],
+        shrink_resources: true,
     },
 }
 

app/build.gradle.kts

@@ -27,13 +27,13 @@ buildscript {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "org.lineageos.aperture"
 
     defaultConfig {
         applicationId = "com.android.camera2"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }
@@ -88,7 +88,7 @@ dependencies {
     implementation("com.google.android.material:material:1.9.0")
 
     // CameraX core library using the camera2 implementation
-    val cameraxVersion = "1.5.0-alpha01"
+    val cameraxVersion = "1.5.0-alpha03"
     // 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}")
@@ -99,7 +99,7 @@ dependencies {
     // If you want to additionally use the CameraX View class
     implementation("androidx.camera:camera-view:${cameraxVersion}")
     // If you want to additionally use the CameraX Viewfinder class
-    implementation("androidx.camera.viewfinder:viewfinder-core:1.4.0-alpha08")
+    implementation("androidx.camera.viewfinder:viewfinder-core:1.4.0-alpha09")
     // If you want to additionally use the CameraX Extensions library
     implementation("androidx.camera:camera-extensions:${cameraxVersion}")
 
@@ -124,13 +124,13 @@ configure<GenerateBpPluginExtension> {
     availableInAOSP.set { module: Module ->
         when {
             module.group.startsWith("androidx") -> {
-                // We provide our own androidx.{camera,media3} & lifecycle-common
+                // We provide our own androidx.{camera,media3}
                 !module.group.startsWith("androidx.camera") &&
-                        !module.group.startsWith("androidx.media3") &&
-                        module.name != "lifecycle-common"
+                        !module.group.startsWith("androidx.media3")
             }
 
             module.group.startsWith("org.jetbrains") -> true
+            module.group == "com.google.android.material" -> true
             module.group == "com.google.auto.value" -> true
             module.group == "com.google.errorprone" -> true
             module.group == "com.google.guava" -> true