From 16dd40d4896547f3904a4c438bb92f25b82dc57e Mon Sep 17 00:00:00 2001 From: Jarne Demeulemeester Date: Sun, 15 Oct 2023 15:43:55 +0200 Subject: [PATCH] build: move app and ktlint version to buildSrc `Versions` --- app/phone/build.gradle.kts | 9 +++------ build.gradle.kts | 3 --- buildSrc/build.gradle.kts | 7 +++++++ buildSrc/src/main/kotlin/Versions.kt | 6 ++++++ core/build.gradle.kts | 2 +- data/build.gradle.kts | 8 +++----- player/core/build.gradle.kts | 2 +- player/video/build.gradle.kts | 2 +- preferences/build.gradle.kts | 2 +- 9 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/src/main/kotlin/Versions.kt diff --git a/app/phone/build.gradle.kts b/app/phone/build.gradle.kts index 5154696f..7ebbaca6 100644 --- a/app/phone/build.gradle.kts +++ b/app/phone/build.gradle.kts @@ -19,11 +19,8 @@ android { minSdk = 28 targetSdk = 34 - val appVersionCode: Int by rootProject.extra - val appVersionName: String by rootProject.extra - - versionCode = appVersionCode - versionName = appVersionName + versionCode = Versions.appCode + versionName = Versions.appName } buildTypes { @@ -75,7 +72,7 @@ android { } ktlint { - version.set("0.50.0") + version.set(Versions.ktlint) android.set(true) ignoreFailures.set(false) } diff --git a/build.gradle.kts b/build.gradle.kts index 6d3f1e13..585206fc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,6 +35,3 @@ allprojects { tasks.create("clean") { delete(rootProject.layout.buildDirectory) } - -val appVersionCode by extra { 22 } -val appVersionName by extra { "0.13.1" } \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 00000000..b6413e30 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + `kotlin-dsl` +} + +repositories { + mavenCentral() +} diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt new file mode 100644 index 00000000..139de1be --- /dev/null +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -0,0 +1,6 @@ +object Versions { + const val appCode = 22 + const val appName = "0.13.1" + + const val ktlint = "0.50.0" +} \ No newline at end of file diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 14cfe565..976656df 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -39,7 +39,7 @@ android { } ktlint { - version.set("0.50.0") + version.set(Versions.ktlint) android.set(true) ignoreFailures.set(false) } diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 1ede29d7..970e3eb5 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -14,10 +14,8 @@ android { defaultConfig { minSdk = 28 - val appVersionCode: Int by rootProject.extra - val appVersionName: String by rootProject.extra - buildConfigField("int", "VERSION_CODE", appVersionCode.toString()) - buildConfigField("String", "VERSION_NAME", "\"$appVersionName\"") + buildConfigField("int", "VERSION_CODE", Versions.appCode.toString()) + buildConfigField("String", "VERSION_NAME", "\"${Versions.appName}\"") consumerProguardFile("proguard-rules.pro") @@ -42,7 +40,7 @@ android { } ktlint { - version.set("0.50.0") + version.set(Versions.ktlint) android.set(true) ignoreFailures.set(false) } diff --git a/player/core/build.gradle.kts b/player/core/build.gradle.kts index 712df484..addffb7a 100644 --- a/player/core/build.gradle.kts +++ b/player/core/build.gradle.kts @@ -30,7 +30,7 @@ android { } ktlint { - version.set("0.50.0") + version.set(Versions.ktlint) android.set(true) ignoreFailures.set(false) } diff --git a/player/video/build.gradle.kts b/player/video/build.gradle.kts index 37860044..7420a54a 100644 --- a/player/video/build.gradle.kts +++ b/player/video/build.gradle.kts @@ -32,7 +32,7 @@ android { } ktlint { - version.set("0.50.0") + version.set(Versions.ktlint) android.set(true) ignoreFailures.set(false) } diff --git a/preferences/build.gradle.kts b/preferences/build.gradle.kts index a2d46875..508fddb6 100644 --- a/preferences/build.gradle.kts +++ b/preferences/build.gradle.kts @@ -29,7 +29,7 @@ android { } ktlint { - version.set("0.50.0") + version.set(Versions.ktlint) android.set(true) ignoreFailures.set(false) }