Migrate from Groovy to Kotlin DSL

2026-04-19 04:13:35 +00:00 · 2020-11-02 09:20:00 +01:00
parent 36ef3125a1
commit 0ae74bb766
9 changed files with 219 additions and 105 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,67 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.mikepenz.aboutlibraries.plugin'
-
-android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
-    defaultConfig {
-        applicationId "net.underdesk.circolapp"
-        minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 5
-        versionName "0.3.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    androidExtensions {
-        experimental = true
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'com.google.android.material:material:1.3.0-alpha03'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.3'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.1'
-    implementation "androidx.work:work-runtime-ktx:2.4.0"
-    implementation "androidx.room:room-runtime:2.2.5"
-    kapt "androidx.room:room-compiler:2.2.5"
-    implementation "androidx.room:room-ktx:2.2.5"
-    implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.8.1'
-    implementation 'com.squareup.moshi:moshi:1.9.3'
-    kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.9.3'
-    implementation 'org.jsoup:jsoup:1.13.1'
-    implementation 'com.github.AppIntro:AppIntro:6.0.0'
-    implementation 'com.github.tiper:MaterialSpinner:1.4.2'
-    implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
-    implementation "com.mikepenz:aboutlibraries:$about_libs_version"
-
-    implementation platform('com.google.firebase:firebase-bom:26.0.0')
-    implementation 'com.google.firebase:firebase-messaging-ktx'
-}
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -0,0 +1,91 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    id("kotlin-android-extensions")
+    id("kotlin-kapt")
+    id("com.google.gms.google-services")
+    id("com.mikepenz.aboutlibraries.plugin")
+}
+
+android {
+    compileSdkVersion(Config.Android.compileSdk)
+    buildToolsVersion = Config.Android.buildToolsVersion
+
+    defaultConfig {
+        applicationId = "net.underdesk.circolapp"
+
+        minSdkVersion(Config.Android.minSdk)
+        targetSdkVersion(Config.Android.targetSdk)
+
+        versionCode = System.getenv("VERSION_CODE")?.toIntOrNull() ?: 1
+        versionName = System.getenv("VERSION_NAME") ?: "LOCAL"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        named("release") {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    androidExtensions {
+        isExperimental = true
+    }
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+
+    // Kotlin
+    implementation(Dependencies.Kotlin.core)
+
+    // AndroidX
+    implementation(Dependencies.AndroidX.appcompat)
+    implementation(Dependencies.AndroidX.core)
+    implementation(Dependencies.AndroidX.constraintLayout)
+    implementation(Dependencies.AndroidX.swipeRefreshLayout)
+    implementation(Dependencies.AndroidX.lifecycleExtensions)
+    implementation(Dependencies.AndroidX.preference)
+    implementation(Dependencies.AndroidX.navigationFragment)
+    implementation(Dependencies.AndroidX.navigationUi)
+    implementation(Dependencies.AndroidX.workManager)
+    implementation(Dependencies.AndroidX.Room.roomRuntime)
+    implementation(Dependencies.AndroidX.Room.roomKtx)
+    kapt(Dependencies.AndroidX.Room.roomCompiler)
+
+    // Google
+    implementation(Dependencies.Google.material)
+
+    //Firebase
+    implementation(platform(Dependencies.Firebase.bom))
+    implementation(Dependencies.Firebase.messaging)
+
+    // Square
+    implementation(Dependencies.Square.okhttp)
+    implementation(Dependencies.Square.moshi)
+    kapt(Dependencies.Square.moshiCodegen)
+
+    // AboutLibraries
+    implementation(Dependencies.AboutLibraries.aboutLibrariesCore)
+    implementation(Dependencies.AboutLibraries.aboutLibraries)
+
+    // Misc
+    implementation(Dependencies.Misc.jsoup)
+    implementation(Dependencies.Misc.appIntro)
+    implementation(Dependencies.Misc.materialSpinner)
+
+    // Testing
+    testImplementation(Dependencies.Testing.junit)
+    androidTestImplementation(Dependencies.Testing.espresso)
+    androidTestImplementation(Dependencies.Testing.testRunner)
+}