Upload new keystore with secret password, default to user.home debug.…

…keystore
android · Apr 26, 2024 · 7fc6f96 · 7fc6f96
1 parent b31aaff
commit 7fc6f96
Show file tree

Hide file tree

Showing 17 changed files with 70 additions and 37 deletions.
diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml
@@ -57,6 +57,10 @@ jobs:
       - name: Build release
         working-directory: ${{ inputs.path }}
         run: ./gradlew assembleRelease --stacktrace
+        env:
+          compose_store_password: ${{secrets.compose_store_password}}
+          compose_key_alias: $${{secrets.compose_key_alias}}
+          compose_key_password: $${{secrets.compose_key_password}}
 
       - name: Run local tests
         working-directory: ${{ inputs.path }}

diff --git a/Crane/app/build.gradle.kts b/Crane/app/build.gradle.kts
@@ -45,12 +45,14 @@ android {
     }
 
     signingConfigs {
-        // We use a bundled debug keystore, to allow debug builds from CI to be upgradable
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
         named("debug") {
-            storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
+            storeFile = if (hasKeyInfo) userKeystore else localKeystore
+            storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
+            keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
+            keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
         }
     }
 

diff --git a/Crane/debug_2.keystore b/Crane/debug_2.keystore
diff --git a/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts
@@ -35,11 +35,14 @@ android {
 
     signingConfigs {
         // Important: change the keystore for a production deployment
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
         named("debug") {
-            storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
+            storeFile = if (hasKeyInfo) userKeystore else localKeystore
+            storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
+            keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
+            keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
         }
     }
 

diff --git a/JetLagged/debug_2.keystore b/JetLagged/debug_2.keystore
diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts
@@ -35,11 +35,14 @@ android {
 
     signingConfigs {
         // Important: change the keystore for a production deployment
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
         named("debug") {
-            storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
+            storeFile = if (hasKeyInfo) userKeystore else localKeystore
+            storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
+            keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
+            keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
         }
     }
 

diff --git a/JetNews/debug_2.keystore b/JetNews/debug_2.keystore
diff --git a/Jetcaster/app/build.gradle.kts b/Jetcaster/app/build.gradle.kts
@@ -21,6 +21,7 @@ plugins {
     alias(libs.plugins.hilt)
 }
 
+
 android {
     compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "com.example.jetcaster"
@@ -36,24 +37,30 @@ android {
 
     signingConfigs {
         // Important: change the keystore for a production deployment
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
         named("debug") {
-            storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
+            // get from env variables
+            storeFile = if (hasKeyInfo) userKeystore else localKeystore
+            storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
+            keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
+            keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
         }
     }
 
     buildTypes {
         getByName("debug") {
-            signingConfig = signingConfigs.getByName("debug")
+
         }
 
         getByName("release") {
             isMinifyEnabled = true
             signingConfig = signingConfigs.getByName("debug")
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 

diff --git a/Jetcaster/debug_2.keystore b/Jetcaster/debug_2.keystore
diff --git a/Jetchat/app/build.gradle.kts b/Jetchat/app/build.gradle.kts
@@ -36,11 +36,14 @@ android {
 
     signingConfigs {
         // Important: change the keystore for a production deployment
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
         named("debug") {
-            storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
+            storeFile = if (hasKeyInfo) userKeystore else localKeystore
+            storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
+            keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
+            keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
         }
     }
 

diff --git a/Jetchat/debug_2.keystore b/Jetchat/debug_2.keystore
diff --git a/Jetsnack/app/build.gradle.kts b/Jetsnack/app/build.gradle.kts
@@ -35,16 +35,20 @@ android {
 
     signingConfigs {
         // Important: change the keystore for a production deployment
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
         named("debug") {
-            storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
+            storeFile = if (hasKeyInfo) userKeystore else localKeystore
+            storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
+            keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
+            keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
         }
     }
 
     buildTypes {
         getByName("debug") {
+            signingConfig = null
             signingConfig = signingConfigs.getByName("debug")
         }
 
@@ -57,7 +61,7 @@ android {
 
         create("benchmark") {
             initWith(getByName("release"))
-            signingConfig = signingConfigs.getByName("debug")
+           // signingConfig = signingConfigs.getByName("debug")
             matchingFallbacks.add("release")
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
                     "proguard-benchmark-rules.pro")

diff --git a/Jetsnack/debug_2.keystore b/Jetsnack/debug_2.keystore
diff --git a/Owl/app/build.gradle.kts b/Owl/app/build.gradle.kts
@@ -35,11 +35,14 @@ android {
 
     signingConfigs {
         // Important: change the keystore for a production deployment
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
         named("debug") {
-            storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
+            storeFile = if (hasKeyInfo) userKeystore else localKeystore
+            storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
+            keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
+            keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
         }
     }
 

diff --git a/Owl/debug_2.keystore b/Owl/debug_2.keystore
diff --git a/Reply/app/build.gradle.kts b/Reply/app/build.gradle.kts
@@ -35,11 +35,15 @@ android {
 
     signingConfigs {
         // Important: change the keystore for a production deployment
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
         named("debug") {
-            storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
+            // get from env variables
+            storeFile = if (hasKeyInfo) userKeystore else localKeystore
+            storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
+            keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
+            keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
         }
     }
 

diff --git a/Reply/debug_2.keystore b/Reply/debug_2.keystore