commit ca5d161a4281e6ed17381bcbf737a2811d6d210e
author Sebastiano Barezzi <seba@sebaubuntu.dev> Fri Oct 11 20:24:06 2024 +0200
committer Luca Stefani <luca.stefani.ge1@gmail.com> Fri Oct 18 20:56:15 2024 +0200
tree 41c80bf99920b0c53dd8ed1b4ee6a7d04caa70ca
parent 47af484d1404d62804347b9a42d9537f8246b24c

Twelve: Add okhttp and Kotlin serialization

Change-Id: Ib72b8dd04de43b2f2f7e6ab796dfe766b7e3ec15

app/Android.bp

diff --git a/app/Android.bp b/app/Android.bp
index d0cb2b9..bfbcf90 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -59,7 +59,9 @@
         "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",
+        "kotlinx_serialization_json",
         "androidx.lifecycle_lifecycle-service",
         "kotlinx_coroutines_guava",
     ],

app/build.gradle.kts

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ad89b6c..3b6ae21 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,6 +11,7 @@
     alias(libs.plugins.android.application)
     alias(libs.plugins.kapt)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 apply {
@@ -93,10 +94,12 @@
     implementation(libs.coil)
     implementation(libs.coil.network.okhttp)
     implementation(libs.kotlinx.coroutines.guava)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.material)
     implementation(libs.nier.visualizer) {
         exclude(group = "com.android.support")
     }
+    implementation(libs.okhttp)
 }
 
 configure<GenerateBpPluginExtension> {

app/libs/Android.bp

diff --git a/app/libs/Android.bp b/app/libs/Android.bp
index 5fa139d..56bf000 100644
--- a/app/libs/Android.bp
+++ b/app/libs/Android.bp
@@ -52,7 +52,6 @@
         "Twelve_androidx.media3_media3-common",
         "Twelve_androidx.media3_media3-exoplayer",
         "androidx.core_core",
-        "kotlin-stdlib-jdk8",
         "kotlinx-coroutines-android",
         "kotlinx-coroutines-core",
     ],
@@ -72,7 +71,6 @@
         "Twelve_androidx.media3_media3-common",
         "Twelve_androidx.media3_media3-exoplayer",
         "androidx.core_core",
-        "kotlin-stdlib-jdk8",
         "kotlinx-coroutines-android",
         "kotlinx-coroutines-core",
     ],

gradle/libs.versions.toml

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1914a77..4267cdd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,11 +13,13 @@
 core = "1.13.1"
 fragment = "1.8.3"
 kotlinx-coroutines = "1.8.1"
+kotlinx-serialization = "1.6.1"
 lifecycle = "2.8.5"
 material = "1.12.0"
 media3 = "1.5.0-alpha01"
 navigation = "2.8.0"
 nier-visualizer = "v0.1.3"
+okhttp = "4.12.0"
 recyclerview = "1.3.2"
 room = "2.6.1"
 viewpager2 = "1.1.0"
@@ -44,10 +46,13 @@
 coil = { group = "io.coil-kt.coil3", name = "coil", 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" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 nier-visualizer = { group = "com.github.bogerchan", name = "Nier-Visualizer", version.ref = "nier-visualizer" }
+okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kapt = { id = "org.jetbrains.kotlin.kapt" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }