diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1bf303eb3f..a62c1a7920 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -177,7 +177,7 @@ dependencies { debugImplementation("com.github.ChuckerTeam.Chucker:library:$chuckerVersion") releaseImplementation("com.github.ChuckerTeam.Chucker:library-no-op:$chuckerVersion") - implementation(kotlin("reflect", version = Versions.kotlin)) + implementation(kotlin("reflect", version = AndroidVersions.kotlin)) // JSON val kotlinSerialization = "1.3.2" @@ -213,8 +213,9 @@ dependencies { implementation("com.github.inorichi.storio:storio-sqlite:8be19de@aar") // Model View Presenter - implementation("info.android15.nucleus:nucleus:${Versions.NUCLEUS}") - implementation("info.android15.nucleus:nucleus-support-v7:${Versions.NUCLEUS}") + val nucleusVersion = "3.0.0" + implementation("info.android15.nucleus:nucleus:$nucleusVersion") + implementation("info.android15.nucleus:nucleus-support-v7:$nucleusVersion") // Dependency injection implementation("com.github.inorichi.injekt:injekt-core:65b0440") @@ -271,7 +272,7 @@ dependencies { // Text distance implementation("info.debatty:java-string-similarity:2.0.0") - implementation("com.google.android.gms:play-services-oss-licenses:${Versions.OSS_LICENSE}") + implementation("com.google.android.gms:play-services-oss-licenses:17.0.0") // TLS 1.3 support for Android < 10 implementation("org.conscrypt:conscrypt-android:2.5.2") diff --git a/build.gradle.kts b/build.gradle.kts index 2fef3f0635..1e12b870c4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id(Plugins.kotlinter.name) version Plugins.kotlinter.version id(Plugins.gradleVersions.name) version Plugins.gradleVersions.version - id(Plugins.jetbrainsKotlin) version Versions.kotlin apply false + id(Plugins.jetbrainsKotlin) version AndroidVersions.kotlin apply false } allprojects { repositories { @@ -26,10 +26,10 @@ subprojects { buildscript { dependencies { classpath("com.android.tools.build:gradle:7.1.3") - classpath(LegacyPluginClassPath.googleServices) - classpath(LegacyPluginClassPath.kotlinPlugin) + classpath("com.google.gms:google-services:4.3.10") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${AndroidVersions.kotlin}") classpath("com.google.android.gms:oss-licenses-plugin:0.10.5") - classpath(LegacyPluginClassPath.kotlinSerializations) + classpath("org.jetbrains.kotlin:kotlin-serialization:${AndroidVersions.kotlin}") } repositories { gradlePluginPortal() diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 15e4b9c123..bf7e7dea32 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,17 +1,3 @@ -object Versions { - const val NUCLEUS = "3.0.0" - const val OSS_LICENSE = "17.0.0" - const val ROBO_ELECTRIC = "3.1.4" - const val RX_BINDING = "1.0.1" - const val kotlin = "1.6.20" -} - -object LegacyPluginClassPath { - const val googleServices = "com.google.gms:google-services:4.3.10" - const val kotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" - const val kotlinSerializations = "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}" -} - object AndroidVersions { const val compileSdk = 31 const val minSdk = 23 @@ -19,6 +5,7 @@ object AndroidVersions { const val versionCode = 88 const val versionName = "1.5.0" const val ndk = "23.1.7779620" + const val kotlin = "1.6.20" } object Plugins { @@ -33,7 +20,9 @@ object Plugins { val kotlinter = PluginClass("org.jmailen.kotlinter", "3.10.0") } -data class PluginClass(val name: String, val version: String) +data class PluginClass(val name: String, val version: String) { + override fun toString() = "$name:$version" +} fun isNonStable(version: String): Boolean { val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }