Catapult: Bump gradle-generatebp to 1.17

Change-Id: Ic1fff3daea380343249aee103300b210f2c8d31d
LineageOS · Jan 1, 2025 · f5833cb · f5833cb
1 parent c7925be
commit f5833cb
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 28 deletions.
diff --git a/app/Android.bp b/app/Android.bp
@@ -7,14 +7,8 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-java_defaults {
-    name: "catapult_defaults",
-    static_libs: ["SettingsLib"],
-}
-
 android_app {
     name: "Catapult",
-    defaults: ["catapult_defaults"],
 
     srcs: ["src/main/java/**/*.kt"],
     resource_dirs: ["src/main/res"],
@@ -47,7 +41,7 @@ android_app {
         "com.google.android.material_material",
         "Catapult_io.coil-kt_coil",
         "kotlin-stdlib-jdk8",
-    ],
+    ] + ["SettingsLib"],
 }
 
 prebuilt_etc {

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,7 +18,7 @@ apply {
 
 buildscript {
     repositories {
-        maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.15/.m2")
+        maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.17/.m2")
     }
 
     dependencies {
@@ -89,6 +89,7 @@ dependencies {
 
 configure<GenerateBpPluginExtension> {
     targetSdk.set(android.defaultConfig.targetSdk!!)
+    minSdk.set(android.defaultConfig.minSdk!!)
     availableInAOSP.set { module: Module ->
         when {
             module.group.startsWith("androidx") -> true

diff --git a/app/libs/Android.bp b/app/libs/Android.bp
@@ -9,7 +9,7 @@ java_import {
     name: "Catapult_com.squareup.okhttp3_okhttp-nodeps",
     jars: ["com/squareup/okhttp3/okhttp/4.12.0/okhttp-4.12.0.jar"],
     sdk_version: "35",
-    min_sdk_version: "14",
+    min_sdk_version: "31",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
@@ -19,7 +19,7 @@ java_import {
 java_library_static {
     name: "Catapult_com.squareup.okhttp3_okhttp",
     sdk_version: "35",
-    min_sdk_version: "14",
+    min_sdk_version: "31",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
@@ -29,28 +29,26 @@ java_library_static {
         "Catapult_com.squareup.okio_okio",
         "kotlin-stdlib-jdk8",
     ],
-    java_version: "1.7",
 }
 
 java_library_static {
     name: "Catapult_com.squareup.okio_okio",
     sdk_version: "35",
-    min_sdk_version: "14",
+    min_sdk_version: "31",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
     static_libs: [
         "Catapult_com.squareup.okio_okio-jvm",
     ],
-    java_version: "1.7",
 }
 
 java_import {
     name: "Catapult_com.squareup.okio_okio-jvm-nodeps",
     jars: ["com/squareup/okio/okio-jvm/3.8.0/okio-jvm-3.8.0.jar"],
     sdk_version: "35",
-    min_sdk_version: "14",
+    min_sdk_version: "31",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
@@ -60,7 +58,7 @@ java_import {
 java_library_static {
     name: "Catapult_com.squareup.okio_okio-jvm",
     sdk_version: "35",
-    min_sdk_version: "14",
+    min_sdk_version: "31",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
@@ -69,14 +67,13 @@ java_library_static {
         "Catapult_com.squareup.okio_okio-jvm-nodeps",
         "kotlin-stdlib",
     ],
-    java_version: "1.7",
 }
 
 android_library_import {
     name: "Catapult_io.coil-kt_coil-nodeps",
     aars: ["io/coil-kt/coil/2.6.0/coil-2.6.0.aar"],
     sdk_version: "35",
-    min_sdk_version: "14",
+    min_sdk_version: "31",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
@@ -90,7 +87,7 @@ android_library_import {
 android_library {
     name: "Catapult_io.coil-kt_coil",
     sdk_version: "35",
-    min_sdk_version: "14",
+    min_sdk_version: "31",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
@@ -101,14 +98,13 @@ android_library {
         "Catapult_io.coil-kt_coil-base",
         "kotlin-stdlib",
     ],
-    java_version: "1.7",
 }
 
 android_library_import {
     name: "Catapult_io.coil-kt_coil-base-nodeps",
     aars: ["io/coil-kt/coil-base/2.6.0/coil-base-2.6.0.aar"],
     sdk_version: "35",
-    min_sdk_version: "14",
+    min_sdk_version: "31",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
@@ -131,7 +127,7 @@ android_library_import {
 android_library {
     name: "Catapult_io.coil-kt_coil-base",
     sdk_version: "35",
-    min_sdk_version: "14",
+    min_sdk_version: "31",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
@@ -151,5 +147,4 @@ android_library {
         "kotlin-stdlib",
         "kotlinx-coroutines-android",
     ],
-    java_version: "1.7",
 }
diff --git a/app/libs/com/squareup/okhttp3/okhttp/4.12.0/okhttp-4.12.0.jar.license b/app/libs/com/squareup/okhttp3/okhttp/4.12.0/okhttp-4.12.0.jar.license
@@ -1,3 +1,3 @@
-SPDX-FileCopyrightText: 2024 Square, Inc.
+SPDX-FileCopyrightText: Square, Inc.
 
 SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/com/squareup/okio/okio-jvm/3.8.0/okio-jvm-3.8.0.jar.license b/app/libs/com/squareup/okio/okio-jvm/3.8.0/okio-jvm-3.8.0.jar.license
@@ -1,3 +1,3 @@
-SPDX-FileCopyrightText: 2024 Square, Inc.
+SPDX-FileCopyrightText: Square, Inc.
 
 SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/io/coil-kt/coil-base/2.6.0/AndroidManifest.xml.license b/app/libs/io/coil-kt/coil-base/2.6.0/AndroidManifest.xml.license
@@ -1,3 +1,3 @@
-SPDX-FileCopyrightText: 2019-2024 Coil Contributors
+SPDX-FileCopyrightText: 2019 Coil Contributors
 
 SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/io/coil-kt/coil-base/2.6.0/coil-base-2.6.0.aar.license b/app/libs/io/coil-kt/coil-base/2.6.0/coil-base-2.6.0.aar.license
@@ -1,3 +1,3 @@
-SPDX-FileCopyrightText: 2019-2024 Coil Contributors
+SPDX-FileCopyrightText: 2019 Coil Contributors
 
 SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/io/coil-kt/coil/2.6.0/AndroidManifest.xml.license b/app/libs/io/coil-kt/coil/2.6.0/AndroidManifest.xml.license
@@ -1,3 +1,3 @@
-SPDX-FileCopyrightText: 2019-2024 Coil Contributors
+SPDX-FileCopyrightText: 2019 Coil Contributors
 
 SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/io/coil-kt/coil/2.6.0/coil-2.6.0.aar.license b/app/libs/io/coil-kt/coil/2.6.0/coil-2.6.0.aar.license
@@ -1,3 +1,3 @@
-SPDX-FileCopyrightText: 2019-2024 Coil Contributors
+SPDX-FileCopyrightText: 2019 Coil Contributors
 
 SPDX-License-Identifier: Apache-2.0