Chore: Improve preview logic

Signed-off-by: imknown <imknown@qq.com>

Author: imknown

app/build.gradle.kts

@@ -14,44 +14,44 @@ plugins {
     alias(libsGoogle.plugins.firebase.crashlytics)
 }
 
+private val buildVersion = libsBuild.versions
+
 android {
     namespace = "net.imknown.android.forefrontinfo"
 
+    val isPreview = buildVersion.isPreview.get().toBoolean()
     compileSdk {
-        version = release(libsBuild.versions.compileSdk.get().toInt()) {
-            minorApiLevel = libsBuild.versions.compileSdkMinor.get().toInt()
-            // sdkExtension = libsBuild.versions.compileSdkExtension.get().toInt()
-        }
-    }
-    buildToolsVersion = libsBuild.versions.buildTools.get()
-    val isPreview = libsBuild.versions.isPreview.get().toBoolean()
-    if (isPreview) {
-        compileSdk {
-            version = preview(libsBuild.versions.compileSdkPreview.get())
+        version = if (isPreview) {
+            preview(buildVersion.compileSdkPreview.get())
+        } else {
+            release(buildVersion.compileSdk.get().toInt()) {
+                minorApiLevel = buildVersion.compileSdkMinor.get().toInt()
+                // sdkExtension = buildVersion.compileSdkExtension.get().toInt()
+            }
         }
-        buildToolsVersion = libsBuild.versions.buildToolsPreview.get()
     }
+    buildToolsVersion = (if (isPreview) buildVersion.buildToolsPreview else buildVersion.buildTools).get()
 
     defaultConfig {
-        versionCode = libsBuild.versions.versionCode.get().toInt()
-        versionName = libsBuild.versions.versionName.get()
+        versionCode = buildVersion.versionCode.get().toInt()
+        versionName = buildVersion.versionName.get()
 
         val currentDatetime = getCurrentDatetime()
         val currentGitBranchName = providers.execute("git", "rev-parse", "--abbrev-ref", "HEAD")
         base.archivesName.set("lld-$versionName-$versionCode-$currentDatetime-$currentGitBranchName")
 
-        minSdk = libsBuild.versions.minSdk.get().toInt()
-        targetSdk = libsBuild.versions.targetSdk.get().toInt()
+        minSdk = buildVersion.minSdk.get().toInt()
+        targetSdk = buildVersion.targetSdk.get().toInt()
         if (isPreview) {
-            targetSdkPreview = libsBuild.versions.targetSdkPreview.get()
+            targetSdkPreview = buildVersion.targetSdkPreview.get()
         }
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField("String", "GIT_BRANCH", "\"$currentGitBranchName\"")
     }
 
-    ndkVersion = libsBuild.versions.ndk.get()
+    ndkVersion = buildVersion.ndk.get()
 
     sourceSets {
         named("main") {
@@ -123,7 +123,7 @@ android {
             versionNameSuffix = "-$name"
         }
         register(IssueTracker.Firebase.name) {
-            minSdk = libsBuild.versions.minSdkFirebase.get().toInt()
+            minSdk = buildVersion.minSdkFirebase.get().toInt()
         }
     }
 
@@ -173,9 +173,8 @@ android {
 // https://developer.android.com/build/jdks
 // https://kotlinlang.org/docs/gradle-configure-project.html
 // https://docs.gradle.org/current/userguide/toolchains.html
-private val javaToolchain = libsBuild.versions.javaToolchain.get().toInt()
 kotlin {
-    jvmToolchain(javaToolchain)
+    jvmToolchain(buildVersion.javaToolchain.get().toInt())
 }
 // endregion [Toolchain]
 

base/build.gradle.kts

@@ -4,26 +4,26 @@ plugins {
     alias(libsKotlin.plugins.kotlin.android)
 }
 
+private val buildVersion = libsBuild.versions
+
 android {
     namespace = "net.imknown.android.forefrontinfo.base"
 
+    val isPreview = buildVersion.isPreview.get().toBoolean()
     compileSdk {
-        version = release(libsBuild.versions.compileSdk.get().toInt()) {
-            minorApiLevel = libsBuild.versions.compileSdkMinor.get().toInt()
-            // sdkExtension = libsBuild.versions.compileSdkExtension.get().toInt()
-        }
-    }
-    buildToolsVersion = libsBuild.versions.buildTools.get()
-    val isPreview = libsBuild.versions.isPreview.get().toBoolean()
-    if (isPreview) {
-        compileSdk {
-            version = preview(libsBuild.versions.compileSdkPreview.get())
+        version = if (isPreview) {
+            preview(buildVersion.compileSdkPreview.get())
+        } else {
+            release(buildVersion.compileSdk.get().toInt()) {
+                minorApiLevel = buildVersion.compileSdkMinor.get().toInt()
+                // sdkExtension = buildVersion.compileSdkExtension.get().toInt()
+            }
         }
-        buildToolsVersion = libsBuild.versions.buildToolsPreview.get()
     }
+    buildToolsVersion = (if (isPreview) buildVersion.buildToolsPreview else buildVersion.buildTools).get()
 
     defaultConfig {
-        minSdk = libsBuild.versions.minSdk.get().toInt()
+        minSdk = buildVersion.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -39,9 +39,8 @@ android {
 // https://developer.android.com/build/jdks
 // https://kotlinlang.org/docs/gradle-configure-project.html
 // https://docs.gradle.org/current/userguide/toolchains.html
-private val javaToolchain = libsBuild.versions.javaToolchain.get().toInt()
 kotlin {
-    jvmToolchain(javaToolchain)
+    jvmToolchain(buildVersion.javaToolchain.get().toInt())
 }
 // endregion [Toolchain]
 

binderDetector/build.gradle.kts

@@ -4,26 +4,26 @@ plugins {
     alias(libsKotlin.plugins.kotlin.android)
 }
 
+private val buildVersion = libsBuild.versions
+
 android {
     namespace = "net.imknown.android.forefrontinfo.binderDetector"
 
+    val isPreview = buildVersion.isPreview.get().toBoolean()
     compileSdk {
-        version = release(libsBuild.versions.compileSdk.get().toInt()) {
-            minorApiLevel = libsBuild.versions.compileSdkMinor.get().toInt()
-            // sdkExtension = libsBuild.versions.compileSdkExtension.get().toInt()
-        }
-    }
-    buildToolsVersion = libsBuild.versions.buildTools.get()
-    val isPreview = libsBuild.versions.isPreview.get().toBoolean()
-    if (isPreview) {
-        compileSdk {
-            version = preview(libsBuild.versions.compileSdkPreview.get())
+        version = if (isPreview) {
+            preview(buildVersion.compileSdkPreview.get())
+        } else {
+            release(buildVersion.compileSdk.get().toInt()) {
+                minorApiLevel = buildVersion.compileSdkMinor.get().toInt()
+                // sdkExtension = buildVersion.compileSdkExtension.get().toInt()
+            }
         }
-        buildToolsVersion = libsBuild.versions.buildToolsPreview.get()
     }
+    buildToolsVersion = (if (isPreview) buildVersion.buildToolsPreview else buildVersion.buildTools).get()
 
     defaultConfig {
-        minSdk = libsBuild.versions.minSdk.get().toInt()
+        minSdk = buildVersion.minSdk.get().toInt()
 
         externalNativeBuild {
             cmake {
@@ -36,12 +36,12 @@ android {
         }
     }
 
-    ndkVersion = libsBuild.versions.ndk.get()
+    ndkVersion = buildVersion.ndk.get()
 
     externalNativeBuild {
         cmake {
             path("src/main/cpp/CMakeLists.txt")
-            version = libsBuild.versions.cmake.get()
+            version = buildVersion.cmake.get()
         }
     }
 }
@@ -50,8 +50,7 @@ android {
 // https://developer.android.com/build/jdks
 // https://kotlinlang.org/docs/gradle-configure-project.html
 // https://docs.gradle.org/current/userguide/toolchains.html
-private val javaToolchain = libsBuild.versions.javaToolchain.get().toInt()
 kotlin {
-    jvmToolchain(javaToolchain)
+    jvmToolchain(buildVersion.javaToolchain.get().toInt())
 }
 // endregion [Toolchain]