Skip to content

Commit

Permalink
Twelve: Update gradle-generatebp to v1.14
Browse files Browse the repository at this point in the history
Fixes Nier license and ensures AAR deps of JARs are added to the main
module

Change-Id: Iba9a6cd6c1195233a72cfe07db8791cffc560d49
  • Loading branch information
luca020400 committed Nov 3, 2024
1 parent 1712b70 commit 3a74fc2
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
14 changes: 9 additions & 5 deletions app/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ android_app {
"androidx-constraintlayout_constraintlayout",
"androidx.core_core-ktx",
"androidx.fragment_fragment-ktx",
"androidx.lifecycle_lifecycle-runtime",
"androidx.lifecycle_lifecycle-runtime-ktx",
"androidx.lifecycle_lifecycle-service",
"Twelve_androidx.media3_media3-common-ktx",
"Twelve_androidx.media3_media3-exoplayer",
"Twelve_androidx.media3_media3-exoplayer-midi",
Expand All @@ -56,17 +59,18 @@ android_app {
"androidx.navigation_navigation-fragment-ktx",
"androidx.navigation_navigation-ui-ktx",
"androidx.recyclerview_recyclerview",
"androidx.room_room-runtime",
"androidx.room_room-ktx",
"androidx.room_room-runtime",
"androidx.viewpager2_viewpager2",
"Twelve_com.github.bogerchan_Nier-Visualizer",
"Twelve_com.google.android.material_material",
"Twelve_com.squareup.okhttp3_okhttp",
"Twelve_io.coil-kt.coil3_coil",
"Twelve_io.coil-kt.coil3_coil-android",
"Twelve_io.coil-kt.coil3_coil-core-android",
"Twelve_io.coil-kt.coil3_coil-network-core-android",
"Twelve_io.coil-kt.coil3_coil-network-okhttp",
"Twelve_com.google.android.material_material",
"Twelve_com.github.bogerchan_Nier-Visualizer",
"Twelve_com.squareup.okhttp3_okhttp",
"kotlin-stdlib",
"androidx.lifecycle_lifecycle-service",
"kotlinx_coroutines_guava",
"kotlinx_serialization_json",
],
Expand Down
3 changes: 1 addition & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ apply {

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

dependencies {
Expand Down Expand Up @@ -92,7 +92,6 @@ dependencies {
implementation(libs.androidx.room.ktx)
implementation(libs.androidx.viewpager2)
implementation(libs.coil)
implementation(libs.coil.core.android)
implementation(libs.coil.network.okhttp)
implementation(libs.kotlinx.coroutines.guava)
implementation(libs.kotlinx.serialization.json)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
SPDX-FileCopyrightText: 2017-2024 Boger Chan

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

SPDX-License-Identifier: Apache-2.0
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SPDX-FileCopyrightText: 2024 Michael Ernst
SPDX-FileCopyrightText: 2024 Suzanne Millstein

SPDX-License-Identifier: MIT
1 change: 0 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ androidx-room-compiler = { group = "androidx.room", name = "room-compiler", vers
androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref = "viewpager2" }
coil = { group = "io.coil-kt.coil3", name = "coil", version.ref = "coil" }
coil-core-android = { group = "io.coil-kt.coil3", name = "coil-core-android", version.ref = "coil" }
coil-network-okhttp = { group = "io.coil-kt.coil3", name = "coil-network-okhttp", version.ref = "coil" }
kotlinx-coroutines-guava = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-guava", version.ref = "kotlinx-coroutines" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
Expand Down

0 comments on commit 3a74fc2

Please sign in to comment.