Skip to content

Commit 3a74fc2

Browse files
committed
Twelve: Update gradle-generatebp to v1.14
Fixes Nier license and ensures AAR deps of JARs are added to the main module Change-Id: Iba9a6cd6c1195233a72cfe07db8791cffc560d49
1 parent 1712b70 commit 3a74fc2

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

app/Android.bp

+9-5
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ android_app {
4848
"androidx-constraintlayout_constraintlayout",
4949
"androidx.core_core-ktx",
5050
"androidx.fragment_fragment-ktx",
51+
"androidx.lifecycle_lifecycle-runtime",
52+
"androidx.lifecycle_lifecycle-runtime-ktx",
53+
"androidx.lifecycle_lifecycle-service",
5154
"Twelve_androidx.media3_media3-common-ktx",
5255
"Twelve_androidx.media3_media3-exoplayer",
5356
"Twelve_androidx.media3_media3-exoplayer-midi",
@@ -56,17 +59,18 @@ android_app {
5659
"androidx.navigation_navigation-fragment-ktx",
5760
"androidx.navigation_navigation-ui-ktx",
5861
"androidx.recyclerview_recyclerview",
59-
"androidx.room_room-runtime",
6062
"androidx.room_room-ktx",
63+
"androidx.room_room-runtime",
6164
"androidx.viewpager2_viewpager2",
65+
"Twelve_com.github.bogerchan_Nier-Visualizer",
66+
"Twelve_com.google.android.material_material",
67+
"Twelve_com.squareup.okhttp3_okhttp",
6268
"Twelve_io.coil-kt.coil3_coil",
69+
"Twelve_io.coil-kt.coil3_coil-android",
6370
"Twelve_io.coil-kt.coil3_coil-core-android",
71+
"Twelve_io.coil-kt.coil3_coil-network-core-android",
6472
"Twelve_io.coil-kt.coil3_coil-network-okhttp",
65-
"Twelve_com.google.android.material_material",
66-
"Twelve_com.github.bogerchan_Nier-Visualizer",
67-
"Twelve_com.squareup.okhttp3_okhttp",
6873
"kotlin-stdlib",
69-
"androidx.lifecycle_lifecycle-service",
7074
"kotlinx_coroutines_guava",
7175
"kotlinx_serialization_json",
7276
],

app/build.gradle.kts

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ apply {
2020

2121
buildscript {
2222
repositories {
23-
maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.13/.m2")
23+
maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.14/.m2")
2424
}
2525

2626
dependencies {
@@ -92,7 +92,6 @@ dependencies {
9292
implementation(libs.androidx.room.ktx)
9393
implementation(libs.androidx.viewpager2)
9494
implementation(libs.coil)
95-
implementation(libs.coil.core.android)
9695
implementation(libs.coil.network.okhttp)
9796
implementation(libs.kotlinx.coroutines.guava)
9897
implementation(libs.kotlinx.serialization.json)
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
SPDX-FileCopyrightText: 2017-2024 Boger Chan
22

3+
SPDX-License-Identifier: Apache-2.0
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
SPDX-FileCopyrightText: 2017-2024 Boger Chan
22

3+
SPDX-License-Identifier: Apache-2.0
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
SPDX-FileCopyrightText: 2024 Michael Ernst
22
SPDX-FileCopyrightText: 2024 Suzanne Millstein
33

4+
SPDX-License-Identifier: MIT

gradle/libs.versions.toml

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ androidx-room-compiler = { group = "androidx.room", name = "room-compiler", vers
4444
androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
4545
androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref = "viewpager2" }
4646
coil = { group = "io.coil-kt.coil3", name = "coil", version.ref = "coil" }
47-
coil-core-android = { group = "io.coil-kt.coil3", name = "coil-core-android", version.ref = "coil" }
4847
coil-network-okhttp = { group = "io.coil-kt.coil3", name = "coil-network-okhttp", version.ref = "coil" }
4948
kotlinx-coroutines-guava = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-guava", version.ref = "kotlinx-coroutines" }
5049
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" }

0 commit comments

Comments
 (0)