Merge pull request #51 from stslex/ci/refactor

CI refactor
stslex · Sep 17, 2023 · 5752235 · 5752235
2 parents 60a9a26 + 80b3b7d
commit 5752235
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 72 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,5 @@
 .externalNativeBuild
 .cxx
 local.properties
-play_config.json
-keystore.jks
-keystore.properties
+play_config.*
+keystore.*
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,45 +1,8 @@
-import java.io.FileInputStream
-import java.io.InputStreamReader
-import java.util.Properties
-
 plugins {
     id("csplashscreen.android.application")
     id("csplashscreen.android.application.compose")
 }
 
-android {
-    signingConfigs {
-        val keystoreProperties = gradleKeystoreProperties(project.rootProject.projectDir)
-        create("release") {
-            keyAlias = keystoreProperties.getProperty("keyAlias")
-            keyPassword = keystoreProperties.getProperty("keyPassword")
-            storeFile = getFile(keystoreProperties.getProperty("storeFile"))
-            storePassword = keystoreProperties.getProperty("storePassword")
-        }
-        with(get("debug")) {
-            keyAlias = keystoreProperties.getProperty("keyAlias")
-            keyPassword = keystoreProperties.getProperty("keyPassword")
-            storeFile = getFile(keystoreProperties.getProperty("storeFile"))
-            storePassword = keystoreProperties.getProperty("storePassword")
-        }
-    }
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-            signingConfig = signingConfigs.getByName("release")
-            isDebuggable = false
-        }
-        getByName("debug") {
-            signingConfig = signingConfigs.getByName("debug")
-            isDebuggable = true
-        }
-    }
-}
-
 dependencies {
     implementation(project(":core:core"))
     implementation(project(":core:ui"))
@@ -55,25 +18,4 @@ dependencies {
     implementation(project(":feature:photo-detail"))
     implementation(project(":feature:search"))
     implementation(project(":feature:favourite"))
-}
-
-fun getFile(path: String): File {
-    val file = File(project.rootProject.projectDir, path)
-    if (file.isFile) {
-        return file
-    } else {
-        throw IllegalStateException("${file.name} is inValid")
-    }
-}
-
-fun gradleKeystoreProperties(projectRootDir: File): Properties {
-    val properties = Properties()
-    val localProperties = File(projectRootDir, "keystore.properties")
-
-    if (localProperties.isFile) {
-        InputStreamReader(FileInputStream(localProperties), Charsets.UTF_8).use { reader ->
-            properties.load(reader)
-        }
-    }
-    return properties
 }
diff --git a/build-logic/dependencies/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/dependencies/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -3,6 +3,10 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import st.slex.csplashscreen.configureKotlinAndroid
+import java.io.File
+import java.io.FileInputStream
+import java.io.InputStreamReader
+import java.util.Properties
 
 class AndroidApplicationConventionPlugin : Plugin<Project> {
 
@@ -21,19 +25,69 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                 defaultConfig.apply {
                     applicationId = "st.slex.csplashscreen"
                     targetSdk = 34
-                    versionName = "1.6"
-                    versionCode = 6
-                    buildTypes {
-                        release {
-                            isMinifyEnabled = false
-                            proguardFiles(
-                                getDefaultProguardFile("proguard-android-optimize.txt"),
-                                "proguard-rules.pro"
-                            )
-                        }
-                    }
+                    versionName = AppVersions.versionName
+                    versionCode = AppVersions.versionCode
+
+                    configureSigning(target)
                 }
             }
         }
     }
 }
+
+fun ApplicationExtension.configureSigning(
+    project: Project
+) {
+    signingConfigs {
+        val keystoreProperties = gradleKeystoreProperties(project.rootProject.projectDir)
+        create("release") {
+            keyAlias = keystoreProperties.getProperty("keyAlias")
+            keyPassword = keystoreProperties.getProperty("keyPassword")
+            storeFile = project.getFile(keystoreProperties.getProperty("storeFile"))
+            storePassword = keystoreProperties.getProperty("storePassword")
+        }
+        with(getByName("debug")) {
+            keyAlias = keystoreProperties.getProperty("keyAlias")
+            keyPassword = keystoreProperties.getProperty("keyPassword")
+            storeFile = project.getFile(keystoreProperties.getProperty("storeFile"))
+            storePassword = keystoreProperties.getProperty("storePassword")
+        }
+    }
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+            signingConfig = signingConfigs.getByName("release")
+            isDebuggable = false
+        }
+        getByName("debug") {
+            signingConfig = signingConfigs.getByName("debug")
+            isDebuggable = true
+        }
+    }
+}
+
+
+fun Project.getFile(path: String): File {
+    val file = File(project.rootProject.projectDir, path)
+    if (file.isFile) {
+        return file
+    } else {
+        throw IllegalStateException("${file.name} is inValid")
+    }
+}
+
+fun gradleKeystoreProperties(projectRootDir: File): Properties {
+    val properties = Properties()
+    val localProperties = File(projectRootDir, "keystore.properties")
+
+    if (localProperties.isFile) {
+        InputStreamReader(FileInputStream(localProperties), Charsets.UTF_8).use { reader ->
+            properties.load(reader)
+        }
+    }
+    return properties
+}
diff --git a/build-logic/dependencies/src/main/kotlin/AppVersions.kt b/build-logic/dependencies/src/main/kotlin/AppVersions.kt
@@ -0,0 +1,4 @@
+object AppVersions {
+    const val versionName = "1.61"
+    const val versionCode = 7
+}