From cbdd16f6d4d4e2a91c81b1e8aeeea7fba12d039a Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Thu, 27 Jun 2024 19:07:38 +0700
Subject: [PATCH] chore(deps): Update agp to v8.5.0

Also convert some plugins to use version catalog
---
 app/build.gradle.kts                 | 6 +++---
 core/build.gradle.kts                | 4 ++--
 data/build.gradle.kts                | 6 +++---
 domain/build.gradle.kts              | 4 ++--
 gradle/androidx.versions.toml        | 5 +++++
 gradle/kotlinx.versions.toml         | 1 +
 gradle/libs.versions.toml            | 2 ++
 i18n/build.gradle.kts                | 6 +++---
 presentation/core/build.gradle.kts   | 4 ++--
 presentation/widget/build.gradle.kts | 4 ++--
 source-api/build.gradle.kts          | 2 +-
 11 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b020974f8c..1c8d5575d2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,14 +5,14 @@ import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 
 plugins {
-    id("com.android.application")
-    kotlin("android")
+    alias(androidx.plugins.application)
+    alias(kotlinx.plugins.android)
+    alias(kotlinx.plugins.compose.compiler)
     kotlin("plugin.serialization")
     id("kotlin-parcelize")
     id("com.google.android.gms.oss-licenses-plugin")
     id("com.google.gms.google-services") apply false
     id("com.google.firebase.crashlytics") apply false
-    alias(kotlinx.plugins.compose.compiler)
 }
 
 if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index ae501bbafd..f7de2e03ed 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("multiplatform")
+    alias(kotlinx.plugins.multiplatform)
+    alias(androidx.plugins.library)
     kotlin("plugin.serialization")
-    id("com.android.library")
 }
 
 kotlin {
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index eec8932e7b..503f7e73d1 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-    kotlin("multiplatform")
+    alias(kotlinx.plugins.multiplatform)
+    alias(androidx.plugins.library)
+    alias(libs.plugins.sqldelight)
     kotlin("plugin.serialization")
-    id("app.cash.sqldelight")
-    id("com.android.library")
 }
 
 kotlin {
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
index f3db3837f1..27be71bf0f 100644
--- a/domain/build.gradle.kts
+++ b/domain/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-    kotlin("multiplatform")
+    alias(kotlinx.plugins.multiplatform)
+    alias(androidx.plugins.library)
     kotlin("plugin.serialization")
-    id("com.android.library")
 }
 
 kotlin {
diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml
index e3949b9dcc..1438523191 100644
--- a/gradle/androidx.versions.toml
+++ b/gradle/androidx.versions.toml
@@ -1,5 +1,6 @@
 [versions]
 activity = "1.9.0"
+agp = "8.5.0"
 lifecycle = "2.8.1"
 
 [libraries]
@@ -37,3 +38,7 @@ androidx = [
     "lifecycle-process", "lifecycle-runtime", "lifecycle-viewmodel", "lifecycle-viewmodel-compose", "multidex",
     "palette", "preference", "recyclerview", "sqlite", "layout-swiperefresh", "webkit", "work", "window"
 ]
+
+[plugins]
+application = { id = "com.android.application", version.ref = "agp" }
+library = { id = "com.android.library", version.ref = "agp" }
diff --git a/gradle/kotlinx.versions.toml b/gradle/kotlinx.versions.toml
index 96fc85256c..44134e461d 100644
--- a/gradle/kotlinx.versions.toml
+++ b/gradle/kotlinx.versions.toml
@@ -28,3 +28,4 @@ coroutines = [ "coroutines-android", "coroutines-core" ]
 [plugins]
 android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b6ae6db4e6..f77f29d5c7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -101,6 +101,8 @@ viewtooltip = { module = "com.github.florent37:viewtooltip", version = "1.2.2" }
 [plugins]
 kotlinter = { id = "org.jmailen.kotlinter", version = "4.1.1" }
 gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" }
+moko = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko" }
+sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 
 [bundles]
 db = [ "sqldelight-coroutines" ]
diff --git a/i18n/build.gradle.kts b/i18n/build.gradle.kts
index ef5251e777..9b6a43a75f 100644
--- a/i18n/build.gradle.kts
+++ b/i18n/build.gradle.kts
@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("multiplatform")
-    id("com.android.library")
-    id("dev.icerock.mobile.multiplatform-resources")
+    alias(kotlinx.plugins.multiplatform)
+    alias(androidx.plugins.library)
+    alias(libs.plugins.moko)
 }
 
 kotlin {
diff --git a/presentation/core/build.gradle.kts b/presentation/core/build.gradle.kts
index 6d8f613396..2dd788bcb9 100644
--- a/presentation/core/build.gradle.kts
+++ b/presentation/core/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    alias(androidx.plugins.library)
+    alias(kotlinx.plugins.android)
 }
 
 android {
diff --git a/presentation/widget/build.gradle.kts b/presentation/widget/build.gradle.kts
index 150ce636a5..7caf72e91b 100644
--- a/presentation/widget/build.gradle.kts
+++ b/presentation/widget/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    alias(androidx.plugins.library)
+    alias(kotlinx.plugins.android)
     alias(kotlinx.plugins.compose.compiler)
 }
 
diff --git a/source-api/build.gradle.kts b/source-api/build.gradle.kts
index f0c17718e1..0c7ea319c4 100644
--- a/source-api/build.gradle.kts
+++ b/source-api/build.gradle.kts
@@ -1,9 +1,9 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
+    alias(androidx.plugins.library)
     kotlin("multiplatform")
     kotlin("plugin.serialization")
-    id("com.android.library")
 }
 
 kotlin {