Skip to content

Commit 7fc6f96

Browse files
riggarooriggaroo
committed
Upload new keystore with secret password, default to user.home debug.keystore
1 parent b31aaff commit 7fc6f96

17 files changed

+70
-37
lines changed

‎.github/workflows/build-sample.yml

+4
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ jobs:
5757
- name: Build release
5858
working-directory: ${{ inputs.path }}
5959
run: ./gradlew assembleRelease --stacktrace
60+
env:
61+
compose_store_password: ${{secrets.compose_store_password}}
62+
compose_key_alias: $${{secrets.compose_key_alias}}
63+
compose_key_password: $${{secrets.compose_key_password}}
6064

6165
- name: Run local tests
6266
working-directory: ${{ inputs.path }}

‎Crane/app/build.gradle.kts

+7-5
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ android {
4545
}
4646

4747
signingConfigs {
48-
// We use a bundled debug keystore, to allow debug builds from CI to be upgradable
48+
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
49+
val localKeystore = rootProject.file("debug_2.keystore")
50+
val hasKeyInfo = userKeystore.exists()
4951
named("debug") {
50-
storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
51-
storePassword = "android"
52-
keyAlias = "androiddebugkey"
53-
keyPassword = "android"
52+
storeFile = if (hasKeyInfo) userKeystore else localKeystore
53+
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
54+
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
55+
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
5456
}
5557
}
5658

‎Crane/debug_2.keystore

2.46 KB
Binary file not shown.

‎JetLagged/app/build.gradle.kts

+7-4
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,14 @@ android {
3535

3636
signingConfigs {
3737
// Important: change the keystore for a production deployment
38+
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
39+
val localKeystore = rootProject.file("debug_2.keystore")
40+
val hasKeyInfo = userKeystore.exists()
3841
named("debug") {
39-
storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
40-
storePassword = "android"
41-
keyAlias = "androiddebugkey"
42-
keyPassword = "android"
42+
storeFile = if (hasKeyInfo) userKeystore else localKeystore
43+
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
44+
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
45+
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
4346
}
4447
}
4548

‎JetLagged/debug_2.keystore

2.46 KB
Binary file not shown.

‎JetNews/app/build.gradle.kts

+7-4
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,14 @@ android {
3535

3636
signingConfigs {
3737
// Important: change the keystore for a production deployment
38+
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
39+
val localKeystore = rootProject.file("debug_2.keystore")
40+
val hasKeyInfo = userKeystore.exists()
3841
named("debug") {
39-
storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
40-
storePassword = "android"
41-
keyAlias = "androiddebugkey"
42-
keyPassword = "android"
42+
storeFile = if (hasKeyInfo) userKeystore else localKeystore
43+
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
44+
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
45+
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
4346
}
4447
}
4548

‎JetNews/debug_2.keystore

2.46 KB
Binary file not shown.

‎Jetcaster/app/build.gradle.kts

+14-7
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ plugins {
2121
alias(libs.plugins.hilt)
2222
}
2323

24+
2425
android {
2526
compileSdk = libs.versions.compileSdk.get().toInt()
2627
namespace = "com.example.jetcaster"
@@ -36,24 +37,30 @@ android {
3637

3738
signingConfigs {
3839
// Important: change the keystore for a production deployment
40+
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
41+
val localKeystore = rootProject.file("debug_2.keystore")
42+
val hasKeyInfo = userKeystore.exists()
3943
named("debug") {
40-
storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
41-
storePassword = "android"
42-
keyAlias = "androiddebugkey"
43-
keyPassword = "android"
44+
// get from env variables
45+
storeFile = if (hasKeyInfo) userKeystore else localKeystore
46+
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
47+
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
48+
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
4449
}
4550
}
4651

4752
buildTypes {
4853
getByName("debug") {
49-
signingConfig = signingConfigs.getByName("debug")
54+
5055
}
5156

5257
getByName("release") {
5358
isMinifyEnabled = true
5459
signingConfig = signingConfigs.getByName("debug")
55-
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
56-
"proguard-rules.pro")
60+
proguardFiles(
61+
getDefaultProguardFile("proguard-android-optimize.txt"),
62+
"proguard-rules.pro"
63+
)
5764
}
5865
}
5966

‎Jetcaster/debug_2.keystore

2.46 KB
Binary file not shown.

‎Jetchat/app/build.gradle.kts

+7-4
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,14 @@ android {
3636

3737
signingConfigs {
3838
// Important: change the keystore for a production deployment
39+
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
40+
val localKeystore = rootProject.file("debug_2.keystore")
41+
val hasKeyInfo = userKeystore.exists()
3942
named("debug") {
40-
storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
41-
storePassword = "android"
42-
keyAlias = "androiddebugkey"
43-
keyPassword = "android"
43+
storeFile = if (hasKeyInfo) userKeystore else localKeystore
44+
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
45+
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
46+
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
4447
}
4548
}
4649

‎Jetchat/debug_2.keystore

2.46 KB
Binary file not shown.

‎Jetsnack/app/build.gradle.kts

+9-5
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,20 @@ android {
3535

3636
signingConfigs {
3737
// Important: change the keystore for a production deployment
38+
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
39+
val localKeystore = rootProject.file("debug_2.keystore")
40+
val hasKeyInfo = userKeystore.exists()
3841
named("debug") {
39-
storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
40-
storePassword = "android"
41-
keyAlias = "androiddebugkey"
42-
keyPassword = "android"
42+
storeFile = if (hasKeyInfo) userKeystore else localKeystore
43+
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
44+
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
45+
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
4346
}
4447
}
4548

4649
buildTypes {
4750
getByName("debug") {
51+
signingConfig = null
4852
signingConfig = signingConfigs.getByName("debug")
4953
}
5054

@@ -57,7 +61,7 @@ android {
5761

5862
create("benchmark") {
5963
initWith(getByName("release"))
60-
signingConfig = signingConfigs.getByName("debug")
64+
// signingConfig = signingConfigs.getByName("debug")
6165
matchingFallbacks.add("release")
6266
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
6367
"proguard-benchmark-rules.pro")

‎Jetsnack/debug_2.keystore

2.46 KB
Binary file not shown.

‎Owl/app/build.gradle.kts

+7-4
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,14 @@ android {
3535

3636
signingConfigs {
3737
// Important: change the keystore for a production deployment
38+
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
39+
val localKeystore = rootProject.file("debug_2.keystore")
40+
val hasKeyInfo = userKeystore.exists()
3841
named("debug") {
39-
storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
40-
storePassword = "android"
41-
keyAlias = "androiddebugkey"
42-
keyPassword = "android"
42+
storeFile = if (hasKeyInfo) userKeystore else localKeystore
43+
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
44+
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
45+
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
4346
}
4447
}
4548

‎Owl/debug_2.keystore

2.46 KB
Binary file not shown.

‎Reply/app/build.gradle.kts

+8-4
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,15 @@ android {
3535

3636
signingConfigs {
3737
// Important: change the keystore for a production deployment
38+
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
39+
val localKeystore = rootProject.file("debug_2.keystore")
40+
val hasKeyInfo = userKeystore.exists()
3841
named("debug") {
39-
storeFile = File(System.getProperty("user.home"), ".android/debug.keystore")
40-
storePassword = "android"
41-
keyAlias = "androiddebugkey"
42-
keyPassword = "android"
42+
// get from env variables
43+
storeFile = if (hasKeyInfo) userKeystore else localKeystore
44+
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
45+
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
46+
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
4347
}
4448
}
4549

‎Reply/debug_2.keystore

2.46 KB
Binary file not shown.

0 commit comments

Comments
 (0)