Skip to content

Commit f2def7f

Browse files
luca020400luk1337
authored andcommitted
Eleven: Bump gradle-generatebp to 1.17
Change-Id: I7c4d6f63e98db55779ed4d01906aae7ae40a1bd8
1 parent 8afa319 commit f2def7f

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

Android.bp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ android_app {
2929
// DO NOT EDIT THIS SECTION MANUALLY
3030
"androidx.appcompat_appcompat",
3131
"androidx.cardview_cardview",
32+
"androidx-constraintlayout_constraintlayout",
3233
"androidx.legacy_legacy-support-v4",
3334
"androidx.palette_palette",
3435
"androidx.preference_preference",
3536
"androidx.recyclerview_recyclerview",
36-
"androidx-constraintlayout_constraintlayout",
3737
"Eleven_com.google.android.material_material",
38+
"kotlin-stdlib-jdk8",
3839
],
3940

4041
overrides: ["Music"],

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ apply {
1818

1919
buildscript {
2020
repositories {
21-
maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.4/.m2")
21+
maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.17/.m2")
2222
}
2323

2424
dependencies {
@@ -103,6 +103,7 @@ dependencies {
103103

104104
configure<GenerateBpPluginExtension> {
105105
targetSdk.set(android.defaultConfig.targetSdk!!)
106+
minSdk.set(android.defaultConfig.minSdk!!)
106107
availableInAOSP.set { module: Module ->
107108
when {
108109
module.group.startsWith("androidx") -> true

libs/Android.bp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// SPDX-FileCopyrightText: 2024 The LineageOS Project
2+
// SPDX-FileCopyrightText: The LineageOS Project
33
// SPDX-License-Identifier: Apache-2.0
44
//
55

@@ -9,21 +9,21 @@ android_library_import {
99
name: "Eleven_com.google.android.material_material-nodeps",
1010
aars: ["com/google/android/material/material/1.9.0/material-1.9.0.aar"],
1111
sdk_version: "34",
12-
min_sdk_version: "14",
12+
min_sdk_version: "30",
1313
apex_available: [
1414
"//apex_available:platform",
1515
"//apex_available:anyapex",
1616
],
1717
static_libs: [
18+
"androidx-constraintlayout_constraintlayout",
1819
"androidx.annotation_annotation",
20+
"androidx.annotation_annotation-experimental",
1921
"androidx.appcompat_appcompat",
2022
"androidx.cardview_cardview",
2123
"androidx.coordinatorlayout_coordinatorlayout",
22-
"androidx-constraintlayout_constraintlayout",
2324
"androidx.core_core",
2425
"androidx.drawerlayout_drawerlayout",
2526
"androidx.dynamicanimation_dynamicanimation",
26-
"androidx.annotation_annotation-experimental",
2727
"androidx.fragment_fragment",
2828
"androidx.lifecycle_lifecycle-runtime",
2929
"androidx.recyclerview_recyclerview",
@@ -37,23 +37,23 @@ android_library_import {
3737
android_library {
3838
name: "Eleven_com.google.android.material_material",
3939
sdk_version: "34",
40-
min_sdk_version: "14",
40+
min_sdk_version: "30",
4141
apex_available: [
4242
"//apex_available:platform",
4343
"//apex_available:anyapex",
4444
],
4545
manifest: "com/google/android/material/material/1.9.0/AndroidManifest.xml",
4646
static_libs: [
4747
"Eleven_com.google.android.material_material-nodeps",
48+
"androidx-constraintlayout_constraintlayout",
4849
"androidx.annotation_annotation",
50+
"androidx.annotation_annotation-experimental",
4951
"androidx.appcompat_appcompat",
5052
"androidx.cardview_cardview",
5153
"androidx.coordinatorlayout_coordinatorlayout",
52-
"androidx-constraintlayout_constraintlayout",
5354
"androidx.core_core",
5455
"androidx.drawerlayout_drawerlayout",
5556
"androidx.dynamicanimation_dynamicanimation",
56-
"androidx.annotation_annotation-experimental",
5757
"androidx.fragment_fragment",
5858
"androidx.lifecycle_lifecycle-runtime",
5959
"androidx.recyclerview_recyclerview",
@@ -62,5 +62,4 @@ android_library {
6262
"androidx.viewpager2_viewpager2",
6363
"error_prone_annotations",
6464
],
65-
java_version: "1.7",
6665
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
SPDX-FileCopyrightText: 2015-2024 The Android Open Source Project
1+
SPDX-FileCopyrightText: 2015 The Android Open Source Project
22

33
SPDX-License-Identifier: Apache-2.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
SPDX-FileCopyrightText: 2015-2024 The Android Open Source Project
1+
SPDX-FileCopyrightText: 2015 The Android Open Source Project
22

33
SPDX-License-Identifier: Apache-2.0

0 commit comments

Comments
 (0)