diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bb48844bc7..da4641bd97 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,3 +1,5 @@ +import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsPlugin +import com.google.gms.googleservices.GoogleServicesPlugin import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.io.ByteArrayOutputStream import java.time.LocalDateTime @@ -9,15 +11,15 @@ plugins { alias(kotlinx.plugins.android) alias(kotlinx.plugins.compose.compiler) alias(kotlinx.plugins.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.parcelize) + alias(libs.plugins.google.oss) + alias(libs.plugins.firebase.crashlytics) apply false + alias(libs.plugins.google.services) apply false } if (gradle.startParameter.taskRequests.toString().contains("Standard")) { - apply(mapOf("plugin" to "com.google.gms.google-services")) - apply(mapOf("plugin" to "com.google.firebase.crashlytics")) + apply() + apply() } fun runCommand(command: String): String { diff --git a/build.gradle.kts b/build.gradle.kts index e1daaf5627..cc41a104c3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,26 +8,18 @@ import java.util.* plugins { alias(libs.plugins.kotlinter) alias(libs.plugins.gradle.versions) + alias(androidx.plugins.application) apply false + alias(androidx.plugins.library) apply false alias(kotlinx.plugins.android) apply false alias(kotlinx.plugins.compose.compiler) apply false -} - -buildscript { - dependencies { - classpath(libs.gradle) - classpath(libs.google.services) - classpath(kotlinx.gradle) - classpath(libs.oss.licenses.plugin) - classpath(kotlinx.serialization.gradle) - classpath(libs.firebase.crashlytics.gradle) - classpath(libs.sqldelight.gradle) - classpath(libs.moko.generator) - } - repositories { - gradlePluginPortal() - google() - mavenCentral() - } + alias(kotlinx.plugins.multiplatform) apply false + alias(kotlinx.plugins.parcelize) apply false + alias(kotlinx.plugins.serialization) apply false + alias(libs.plugins.firebase.crashlytics) apply false + alias(libs.plugins.google.oss) apply false + alias(libs.plugins.google.services) apply false + alias(libs.plugins.moko) apply false + alias(libs.plugins.sqldelight) apply false } subprojects { diff --git a/gradle/kotlinx.versions.toml b/gradle/kotlinx.versions.toml index 5588a6091b..908ccda1e3 100644 --- a/gradle/kotlinx.versions.toml +++ b/gradle/kotlinx.versions.toml @@ -4,13 +4,10 @@ serialization = "1.6.3" xml_serialization = "0.86.3" [libraries] -compose-compiler-gradle = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" } coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version = "1.8.1" } coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android" } coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core" } coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test" } -gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -serialization-gradle = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" } serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } serialization-json-okio = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-okio", version.ref = "serialization" } serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serialization" } @@ -20,8 +17,7 @@ immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", ve [bundles] serialization = [ - "serialization-gradle", "serialization-json", "serialization-json-okio", "serialization-protobuf", - "serialization-xml", "serialization-xml-core" + "serialization-json", "serialization-json-okio", "serialization-protobuf", "serialization-xml", "serialization-xml-core" ] coroutines = [ "coroutines-android", "coroutines-core" ] @@ -30,3 +26,4 @@ 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" } serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f77f29d5c7..ce76a13a75 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,12 +32,9 @@ fastadapter = { module = "com.mikepenz:fastadapter", version.ref = "fast_adapter firebase = { module = "com.google.firebase:firebase-bom", version = "33.1.0" } firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" } firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" } -firebase-crashlytics-gradle = { module = "com.google.firebase:firebase-crashlytics-gradle", version = "3.0.1" } flexbox = { module = "com.google.android.flexbox:flexbox", version = "3.0.0" } flexible-adapter-ui = { module = "com.github.arkon.FlexibleAdapter:flexible-adapter-ui", version.ref = "flexible-adapter" } flexible-adapter = { module = "com.github.arkon.FlexibleAdapter:flexible-adapter", version.ref = "flexible-adapter" } -google-services = { module = "com.google.gms:google-services", version = "4.4.2" } -gradle = { module = "com.android.tools.build:gradle", version = "8.2.0" } guava = { module = "com.google.guava:guava", version = "31.1-android" } image-decoder = { module = "com.github.tachiyomiorg:image-decoder", version = "e08e9be535" } injekt-core = { module = "com.github.inorichi.injekt:injekt-core", version = "65b0440" } @@ -63,7 +60,6 @@ mockk = { module = "io.mockk:mockk", version = "1.13.11" } moko-resources = { module = "dev.icerock.moko:resources", version.ref = "moko" } moko-resources-compose = { module = "dev.icerock.moko:resources-compose", version.ref = "moko" } -moko-generator = { module = "dev.icerock.moko:resources-generator", version.ref = "moko" } okio = { module = "com.squareup.okio:okio", version = "3.9.0" } okhttp-brotli = { module = "com.squareup.okhttp3:okhttp-brotli", version.ref = "okhttp" } @@ -87,20 +83,21 @@ sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions", sqldelight-android-driver = { module = "app.cash.sqldelight:android-driver", 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-gradle = { module = "app.cash.sqldelight:gradle-plugin", version.ref = "sqldelight" } subsamplingscaleimageview = { module = "com.github.null2264:subsampling-scale-image-view", version = "338caedb5f" } shizuku-api = { module = "dev.rikka.shizuku:api", version.ref = "shizuku" } shizuku-provider = { module = "dev.rikka.shizuku:provider", version.ref = "shizuku" } taptargetview = { module = "com.getkeepsafe.taptargetview:taptargetview", version = "1.13.3" } -oss-licenses-plugin = { module = "com.google.android.gms:oss-licenses-plugin", version = "0.10.6" } unifile = { module = "com.github.tachiyomiorg:unifile", version = "a9de196cc7" } viewstatepageradapter = { module = "com.nightlynexus.viewstatepageradapter:viewstatepageradapter", version = "1.1.0" } viewtooltip = { module = "com.github.florent37:viewtooltip", version = "1.2.2" } [plugins] -kotlinter = { id = "org.jmailen.kotlinter", version = "4.1.1" } +firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics", version = "3.0.2" } +google-oss = { module = "com.google.android.gms:oss-licenses-plugin", version = "0.10.6" } +google-services = { id = "com.google.gms:google-services", version = "4.4.2" } gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" } +kotlinter = { id = "org.jmailen.kotlinter", version = "4.1.1" } moko = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko" } sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }