Skip to content

Commit 8b64d1e

Browse files
authored
fix: Relax secrets.properties enforcement for CI and Release builds (#24)
1 parent 7c466f6 commit 8b64d1e

3 files changed

Lines changed: 33 additions & 15 deletions

File tree

Maps3DSamples/ApiDemos/java-app/build.gradle.kts

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ import java.io.File
1919

2020
// Check for secrets.properties file before proceeding with build tasks.
2121
val secretsFile = rootProject.file("secrets.properties")
22-
if (!secretsFile.exists() && System.getenv("CI") != "true") {
22+
val isCI = System.getenv("CI")?.toBoolean() ?: false
23+
24+
if (!secretsFile.exists() && !isCI) {
2325
val requestedTasks = gradle.startParameter.taskNames
2426
if (requestedTasks.isEmpty()) {
2527
// It's likely an IDE sync if no tasks are specified, so just issue a warning.
@@ -39,7 +41,11 @@ if (!secretsFile.exists() && System.getenv("CI") != "true") {
3941
}
4042
}
4143

42-
if (isBuildTask && !isTestTask) {
44+
val isDebugTask = requestedTasks.any { task ->
45+
task.contains("Debug", ignoreCase = true)
46+
}
47+
48+
if (isBuildTask && !isTestTask && isDebugTask) {
4349
val defaultsFile = rootProject.file("local.defaults.properties")
4450
val requiredKeysMessage = if (defaultsFile.exists()) {
4551
defaultsFile.readText()
@@ -108,17 +114,19 @@ dependencies {
108114
implementation(libs.androidx.ui.graphics)
109115
implementation(libs.androidx.ui.tooling.preview)
110116
implementation(libs.androidx.material3)
117+
implementation(libs.play.services.base)
118+
implementation(project(":common"))
119+
111120
testImplementation(libs.junit)
121+
112122
androidTestImplementation(libs.androidx.junit)
113123
androidTestImplementation(project(":common"))
114124
androidTestImplementation(libs.androidx.espresso.core)
115125
androidTestImplementation(platform(libs.androidx.compose.bom))
116126
androidTestImplementation(libs.androidx.ui.test.junit4)
127+
androidTestImplementation(libs.truth)
117128
debugImplementation(libs.androidx.ui.tooling)
118129
debugImplementation(libs.androidx.ui.test.manifest)
119-
120-
implementation(libs.play.services.base)
121-
implementation(project(":common"))
122130
}
123131

124132
secrets {

Maps3DSamples/ApiDemos/kotlin-app/build.gradle.kts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ import java.io.File
1919

2020
// Check for secrets.properties file before proceeding with build tasks.
2121
val secretsFile = rootProject.file("secrets.properties")
22-
if (!secretsFile.exists() && System.getenv("CI") != "true") {
22+
val isCI = System.getenv("CI")?.toBoolean() ?: false
23+
24+
if (!secretsFile.exists() && !isCI) {
2325
val requestedTasks = gradle.startParameter.taskNames
2426
if (requestedTasks.isEmpty()) {
2527
// It's likely an IDE sync if no tasks are specified, so just issue a warning.
@@ -39,7 +41,11 @@ if (!secretsFile.exists() && System.getenv("CI") != "true") {
3941
}
4042
}
4143

42-
if (isBuildTask && !isTestTask) {
44+
val isDebugTask = requestedTasks.any { task ->
45+
task.contains("Debug", ignoreCase = true)
46+
}
47+
48+
if (isBuildTask && !isTestTask && isDebugTask) {
4349
val defaultsFile = rootProject.file("local.defaults.properties")
4450
val requiredKeysMessage = if (defaultsFile.exists()) {
4551
defaultsFile.readText()
@@ -140,11 +146,9 @@ secrets {
140146
defaultPropertiesFileName = "local.defaults.properties"
141147
}
142148

143-
tasks.register<Exec>("launchDebug") {
149+
tasks.register<Exec>("installAndLaunch") {
150+
description = "Installs and launches the demo app."
151+
group = "install"
144152
dependsOn("installDebug")
145-
commandLine("adb", "shell", "am", "start", "-n", "com.example.maps3dkotlin/.MainActivity")
146-
doLast {
147-
println("Launched com.example.maps3dkotlin/.MainActivity")
148-
}
153+
commandLine("adb", "shell", "am", "start", "-n", "com.example.maps3dkotlin/.mainactivity.MainActivity")
149154
}
150-

Maps3DSamples/advanced/app/build.gradle.kts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ import java.io.File
1919

2020
// Check for secrets.properties file before proceeding with build tasks.
2121
val secretsFile = rootProject.file("secrets.properties")
22-
if (!secretsFile.exists()) {
22+
val isCI = System.getenv("CI")?.toBoolean() ?: false
23+
24+
if (!secretsFile.exists() && !isCI) {
2325
val requestedTasks = gradle.startParameter.taskNames
2426
if (requestedTasks.isEmpty()) {
2527
// It's likely an IDE sync if no tasks are specified, so just issue a warning.
@@ -39,7 +41,11 @@ if (!secretsFile.exists()) {
3941
}
4042
}
4143

42-
if (isBuildTask && !isTestTask) {
44+
val isDebugTask = requestedTasks.any { task ->
45+
task.contains("Debug", ignoreCase = true)
46+
}
47+
48+
if (isBuildTask && !isTestTask && isDebugTask) {
4349
val defaultsFile = rootProject.file("local.defaults.properties")
4450
val requiredKeysMessage = if (defaultsFile.exists()) {
4551
defaultsFile.readText()

0 commit comments

Comments
 (0)