Skip to content

Commit d521be7

Browse files
committed
fix: Use env vars or empty string
1 parent 78742bf commit d521be7

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

app/build.gradle.kts

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,18 @@ plugins {
1616
// https://developer.android.com/studio/publish/app-signing#secure-key
1717
// Init keystoreProperties variable from keystore.properties file
1818
val keystoreProperties by lazy {
19-
val keystoreFile = rootProject.file("keystore.properties")
19+
val keystorePropertiesFile = rootProject.file("keystore.properties")
2020
val keystoreProperties = Properties()
21-
if (keystoreFile.exists()) {
22-
keystoreProperties.load(FileInputStream(keystoreFile))
21+
22+
if (keystorePropertiesFile.exists()) {
23+
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
24+
} else {
25+
keystoreProperties["storeFile"] = System.getenv("KEYSTORE_FILE") ?: ""
26+
keystoreProperties["storePassword"] = System.getenv("KEYSTORE_PASSWORD") ?: ""
27+
keystoreProperties["keyAlias"] = System.getenv("KEY_ALIAS") ?: ""
28+
keystoreProperties["keyPassword"] = System.getenv("KEY_PASSWORD") ?: ""
2329
}
30+
2431
keystoreProperties
2532
}
2633

@@ -64,10 +71,13 @@ android {
6471
keyPassword = "android"
6572
}
6673
create("release") {
67-
storeFile = rootProject.file(keystoreProperties.getProperty("storeFile") as String)
68-
storePassword = keystoreProperties.getProperty("storePassword") as String
69-
keyAlias = keystoreProperties.getProperty("keyAlias") as String
70-
keyPassword = keystoreProperties.getProperty("keyPassword") as String
74+
val keystoreFile = keystoreProperties.getProperty("storeFile").takeIf { it.isNotBlank() }
75+
?.let { rootProject.file(it) }
76+
storeFile = if (keystoreFile?.exists() == true) keystoreFile else null
77+
// storeFile = rootProject.file(keystoreProperties.getProperty("storeFile"))
78+
storePassword = keystoreProperties.getProperty("storePassword")
79+
keyAlias = keystoreProperties.getProperty("keyAlias")
80+
keyPassword = keystoreProperties.getProperty("keyPassword")
7181
}
7282
}
7383
buildTypes {

0 commit comments

Comments
 (0)