Migrate some classpaths to gradle plugins

(cherry picked from commit fc1c804bfda1d76c0399bbb6214e75b3def951cc)

# Conflicts:
#	app/build.gradle.kts
#	build.gradle.kts
#	i18n/build.gradle.kts
This commit is contained in:
AntsyLich 2024-09-03 14:09:12 +06:00 committed by Cuong-Tran
parent 11c2ae70dd
commit 6b14769331
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
7 changed files with 17 additions and 15 deletions

View file

@ -8,15 +8,15 @@ import java.util.Properties
plugins { plugins {
id("mihon.android.application") id("mihon.android.application")
id("mihon.android.application.compose") id("mihon.android.application.compose")
id("com.mikepenz.aboutlibraries.plugin") // id("com.github.zellius.shortcut-helper")
kotlin("plugin.parcelize") kotlin("plugin.parcelize")
kotlin("plugin.serialization") kotlin("plugin.serialization")
// id("com.github.zellius.shortcut-helper")
id("com.github.ben-manes.versions") id("com.github.ben-manes.versions")
alias(libs.plugins.aboutLibraries)
} }
if (gradle.startParameter.taskRequests.toString().contains("Standard")) { if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
apply<com.google.gms.googleservices.GoogleServicesPlugin>() pluginManager.apply(libs.plugins.google.services.get().pluginId)
// Firebase Crashlytics // Firebase Crashlytics
apply(plugin = "com.google.firebase.crashlytics") apply(plugin = "com.google.firebase.crashlytics")
} }

View file

@ -1,10 +1,6 @@
buildscript { buildscript {
dependencies { dependencies {
// classpath(libs.android.shortcut.gradle) // classpath(libs.android.shortcut.gradle)
classpath(libs.google.services.gradle)
classpath(libs.aboutLibraries.gradle)
classpath(libs.sqldelight.gradle)
classpath(libs.moko.gradle)
classpath(sylibs.firebase.crashlytics.gradle) classpath(sylibs.firebase.crashlytics.gradle)
classpath(sylibs.versionsx) classpath(sylibs.versionsx)
} }
@ -12,6 +8,10 @@ buildscript {
plugins { plugins {
alias(kotlinx.plugins.serialization) apply false alias(kotlinx.plugins.serialization) apply false
alias(libs.plugins.aboutLibraries) apply false
alias(libs.plugins.google.services) apply false
alias(libs.plugins.moko) apply false
alias(libs.plugins.sqldelight) apply false
} }
tasks.register<Delete>("clean") { tasks.register<Delete>("clean") {

View file

@ -1,8 +1,8 @@
plugins { plugins {
id("mihon.library") id("mihon.library")
id("app.cash.sqldelight")
kotlin("android") kotlin("android")
kotlin("plugin.serialization") kotlin("plugin.serialization")
alias(libs.plugins.sqldelight)
} }
android { android {

View file

@ -14,7 +14,6 @@ ktlint-core = "1.3.1"
[libraries] [libraries]
desugar = "com.android.tools:desugar_jdk_libs:2.1.1" desugar = "com.android.tools:desugar_jdk_libs:2.1.1"
android-shortcut-gradle = "com.github.zellius:android-shortcut-gradle-plugin:0.1.2" android-shortcut-gradle = "com.github.zellius:android-shortcut-gradle-plugin:0.1.2"
google-services-gradle = "com.google.gms:google-services:4.4.2"
rxjava = "io.reactivex:rxjava:1.3.8" rxjava = "io.reactivex:rxjava:1.3.8"
@ -72,14 +71,12 @@ haze = "dev.chrisbanes.haze:haze:0.7.3"
swipe = "me.saket.swipe:swipe:1.3.0" swipe = "me.saket.swipe:swipe:1.3.0"
moko-core = { module = "dev.icerock.moko:resources", version.ref = "moko" } moko-core = { module = "dev.icerock.moko:resources", version.ref = "moko" }
moko-gradle = { module = "dev.icerock.moko:resources-generator", version.ref = "moko" }
timber = "com.jakewharton.timber:timber:5.0.1" timber = "com.jakewharton.timber:timber:5.0.1"
logcat = "com.squareup.logcat:logcat:0.1" logcat = "com.squareup.logcat:logcat:0.1"
firebase-analytics = "com.google.firebase:firebase-analytics:22.1.0" firebase-analytics = "com.google.firebase:firebase-analytics:22.1.0"
aboutLibraries-gradle = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlib_version" }
aboutLibraries-compose = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutlib_version" } aboutLibraries-compose = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutlib_version" }
shizuku-api = { module = "dev.rikka.shizuku:api", version.ref = "shizuku_version" } shizuku-api = { module = "dev.rikka.shizuku:api", version.ref = "shizuku_version" }
@ -92,7 +89,6 @@ sqldelight-android-driver = { module = "app.cash.sqldelight:android-driver", ver
sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions-jvm", version.ref = "sqldelight" } sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions-jvm", version.ref = "sqldelight" }
sqldelight-android-paging = { module = "app.cash.sqldelight:androidx-paging3-extensions", version.ref = "sqldelight" } sqldelight-android-paging = { module = "app.cash.sqldelight:androidx-paging3-extensions", version.ref = "sqldelight" }
sqldelight-dialects-sql = { module = "app.cash.sqldelight:sqlite-3-38-dialect", version.ref = "sqldelight" } sqldelight-dialects-sql = { module = "app.cash.sqldelight:sqlite-3-38-dialect", version.ref = "sqldelight" }
sqldelight-gradle = { module = "app.cash.sqldelight:gradle-plugin", version.ref = "sqldelight" }
junit = "org.junit.jupiter:junit-jupiter:5.11.0" junit = "org.junit.jupiter:junit-jupiter:5.11.0"
kotest-assertions = "io.kotest:kotest-assertions-core:5.9.1" kotest-assertions = "io.kotest:kotest-assertions-core:5.9.1"
@ -106,6 +102,12 @@ voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", vers
spotless-gradle = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version.ref = "spotless" } spotless-gradle = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version.ref = "spotless" }
ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" } ktlint-core = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint-core" }
[plugins]
google-services = { id = "com.google.gms.google-services", version = "4.4.2" }
aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlib_version" }
sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
moko = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko" }
[bundles] [bundles]
okhttp = ["okhttp-core", "okhttp-logging", "okhttp-brotli", "okhttp-dnsoverhttps"] okhttp = ["okhttp-core", "okhttp-logging", "okhttp-brotli", "okhttp-dnsoverhttps"]
js-engine = ["quickjs-android"] js-engine = ["quickjs-android"]

View file

@ -1,7 +1,7 @@
plugins { plugins {
id("mihon.library") id("mihon.library")
id("dev.icerock.mobile.multiplatform-resources")
kotlin("multiplatform") kotlin("multiplatform")
alias(libs.plugins.moko)
id("com.github.ben-manes.versions") id("com.github.ben-manes.versions")
} }

View file

@ -1,7 +1,7 @@
plugins { plugins {
id("mihon.library") id("mihon.library")
id("dev.icerock.mobile.multiplatform-resources")
kotlin("multiplatform") kotlin("multiplatform")
alias(libs.plugins.moko)
id("com.github.ben-manes.versions") id("com.github.ben-manes.versions")
} }

View file

@ -4,8 +4,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
id("mihon.library") id("mihon.library")
id("dev.icerock.mobile.multiplatform-resources")
kotlin("multiplatform") kotlin("multiplatform")
alias(libs.plugins.moko)
id("com.github.ben-manes.versions") id("com.github.ben-manes.versions")
} }