Skip to content

fix: Relax secrets.properties enforcement for CI and Release builds #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkhawk merged 2 commits into from
Jan 27, 2026
Merged

fix: Relax secrets.properties enforcement for CI and Release builds #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa4a234
fix: Relax secrets.properties enforcement for CI and Release builds
dkhawk Jan 27, 2026
76b12e4
Merge branch 'main' into fix/secrets-gradle-enforcement
dkhawk Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions Maps3DSamples/ApiDemos/java-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import java.io.File

// Check for secrets.properties file before proceeding with build tasks.
val secretsFile = rootProject.file("secrets.properties")
if (!secretsFile.exists() && System.getenv("CI") != "true") {
val isCI = System.getenv("CI")?.toBoolean() ?: false

if (!secretsFile.exists() && !isCI) {
val requestedTasks = gradle.startParameter.taskNames
if (requestedTasks.isEmpty()) {
// It's likely an IDE sync if no tasks are specified, so just issue a warning.
Expand All @@ -39,7 +41,11 @@ if (!secretsFile.exists() && System.getenv("CI") != "true") {
}
}

if (isBuildTask && !isTestTask) {
val isDebugTask = requestedTasks.any { task ->
task.contains("Debug", ignoreCase = true)
}

if (isBuildTask && !isTestTask && isDebugTask) {
val defaultsFile = rootProject.file("local.defaults.properties")
val requiredKeysMessage = if (defaultsFile.exists()) {
defaultsFile.readText()
Expand Down Expand Up @@ -108,17 +114,19 @@ dependencies {
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)
implementation(libs.play.services.base)
implementation(project(":common"))

testImplementation(libs.junit)

androidTestImplementation(libs.androidx.junit)
androidTestImplementation(project(":common"))
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.ui.test.junit4)
androidTestImplementation(libs.truth)
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)

implementation(libs.play.services.base)
implementation(project(":common"))
}

secrets {
Expand Down
20 changes: 12 additions & 8 deletions Maps3DSamples/ApiDemos/kotlin-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import java.io.File

// Check for secrets.properties file before proceeding with build tasks.
val secretsFile = rootProject.file("secrets.properties")
if (!secretsFile.exists() && System.getenv("CI") != "true") {
val isCI = System.getenv("CI")?.toBoolean() ?: false

if (!secretsFile.exists() && !isCI) {
val requestedTasks = gradle.startParameter.taskNames
if (requestedTasks.isEmpty()) {
// It's likely an IDE sync if no tasks are specified, so just issue a warning.
Expand All @@ -39,7 +41,11 @@ if (!secretsFile.exists() && System.getenv("CI") != "true") {
}
}

if (isBuildTask && !isTestTask) {
val isDebugTask = requestedTasks.any { task ->
task.contains("Debug", ignoreCase = true)
}

if (isBuildTask && !isTestTask && isDebugTask) {
val defaultsFile = rootProject.file("local.defaults.properties")
val requiredKeysMessage = if (defaultsFile.exists()) {
defaultsFile.readText()
Expand Down Expand Up @@ -140,11 +146,9 @@ secrets {
defaultPropertiesFileName = "local.defaults.properties"
}

tasks.register<Exec>("launchDebug") {
tasks.register<Exec>("installAndLaunch") {
description = "Installs and launches the demo app."
group = "install"
dependsOn("installDebug")
commandLine("adb", "shell", "am", "start", "-n", "com.example.maps3dkotlin/.MainActivity")
doLast {
println("Launched com.example.maps3dkotlin/.MainActivity")
}
commandLine("adb", "shell", "am", "start", "-n", "com.example.maps3dkotlin/.mainactivity.MainActivity")
}

10 changes: 8 additions & 2 deletions Maps3DSamples/advanced/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import java.io.File

// Check for secrets.properties file before proceeding with build tasks.
val secretsFile = rootProject.file("secrets.properties")
if (!secretsFile.exists()) {
val isCI = System.getenv("CI")?.toBoolean() ?: false

if (!secretsFile.exists() && !isCI) {
val requestedTasks = gradle.startParameter.taskNames
if (requestedTasks.isEmpty()) {
// It's likely an IDE sync if no tasks are specified, so just issue a warning.
Expand All @@ -39,7 +41,11 @@ if (!secretsFile.exists()) {
}
}

if (isBuildTask && !isTestTask) {
val isDebugTask = requestedTasks.any { task ->
task.contains("Debug", ignoreCase = true)
}

if (isBuildTask && !isTestTask && isDebugTask) {
val defaultsFile = rootProject.file("local.defaults.properties")
val requiredKeysMessage = if (defaultsFile.exists()) {
defaultsFile.readText()
Expand Down
Loading