diff --git a/app/Android.bp b/app/Android.bp index 1aa28fba..b38e191a 100644 --- a/app/Android.bp +++ b/app/Android.bp @@ -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", @@ -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", ], diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3b97b966..5f26b414 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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 { @@ -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) diff --git a/app/libs/com/github/bogerchan/Nier-Visualizer/v0.1.3/AndroidManifest.xml.license b/app/libs/com/github/bogerchan/Nier-Visualizer/v0.1.3/AndroidManifest.xml.license index ce7d22b0..4a67a320 100644 --- a/app/libs/com/github/bogerchan/Nier-Visualizer/v0.1.3/AndroidManifest.xml.license +++ b/app/libs/com/github/bogerchan/Nier-Visualizer/v0.1.3/AndroidManifest.xml.license @@ -1,2 +1,3 @@ SPDX-FileCopyrightText: 2017-2024 Boger Chan +SPDX-License-Identifier: Apache-2.0 diff --git a/app/libs/com/github/bogerchan/Nier-Visualizer/v0.1.3/Nier-Visualizer-v0.1.3.aar.license b/app/libs/com/github/bogerchan/Nier-Visualizer/v0.1.3/Nier-Visualizer-v0.1.3.aar.license index ce7d22b0..4a67a320 100644 --- a/app/libs/com/github/bogerchan/Nier-Visualizer/v0.1.3/Nier-Visualizer-v0.1.3.aar.license +++ b/app/libs/com/github/bogerchan/Nier-Visualizer/v0.1.3/Nier-Visualizer-v0.1.3.aar.license @@ -1,2 +1,3 @@ SPDX-FileCopyrightText: 2017-2024 Boger Chan +SPDX-License-Identifier: Apache-2.0 diff --git a/app/libs/org/checkerframework/checker-qual/3.41.0/checker-qual-3.41.0.jar.license b/app/libs/org/checkerframework/checker-qual/3.41.0/checker-qual-3.41.0.jar.license index 4b47d336..2747b5e3 100644 --- a/app/libs/org/checkerframework/checker-qual/3.41.0/checker-qual-3.41.0.jar.license +++ b/app/libs/org/checkerframework/checker-qual/3.41.0/checker-qual-3.41.0.jar.license @@ -1,3 +1,4 @@ SPDX-FileCopyrightText: 2024 Michael Ernst SPDX-FileCopyrightText: 2024 Suzanne Millstein +SPDX-License-Identifier: MIT diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fcb14612..2ba6b392 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" }