fix standalone examples tests

xvik · Dec 27, 2024 · c3cc4f4 · c3cc4f4
1 parent fd03b7a
commit c3cc4f4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/examples/standalone/android-simple/settings.gradle.kts b/examples/standalone/android-simple/settings.gradle.kts
@@ -14,8 +14,8 @@ pluginManagement {
         maven {
             url  = uri("https://maven.pkg.github.com/xvik/gradle-animalsniffer-plugin")
             credentials {
-                username = extra["gpr.user"]?.toString() ?: System.getenv("USERNAME")
-                password = extra["gpr.key"]?.toString() ?: System.getenv("TOKEN")
+                username = extra.has("gpr.user").let { if (it) extra["gpr.user"] as String else System.getenv("USERNAME")}
+                password = extra.has("gpr.key").let { if (it) extra["gpr.key"] as String else System.getenv("TOKEN")}
             }
         }
     }

diff --git a/examples/standalone/kotlin-multi-android-desktop-server/settings.gradle.kts b/examples/standalone/kotlin-multi-android-desktop-server/settings.gradle.kts
@@ -13,6 +13,14 @@ pluginManagement {
         }
         mavenCentral()
         gradlePluginPortal()
+        // for github package (used on CI)
+        maven {
+            url  = uri("https://maven.pkg.github.com/xvik/gradle-animalsniffer-plugin")
+            credentials {
+                username = extra.has("gpr.user").let { if (it) extra["gpr.user"] as String else System.getenv("USERNAME")}
+                password = extra.has("gpr.key").let { if (it) extra["gpr.key"] as String else System.getenv("TOKEN")}
+            }
+        }
     }
 }
 
@@ -27,14 +35,6 @@ dependencyResolutionManagement {
             }
         }
         mavenCentral()
-        // for github package (used on CI)
-        maven {
-            url  = uri("https://maven.pkg.github.com/xvik/gradle-animalsniffer-plugin")
-            credentials {
-                username = extra["gpr.user"]?.toString() ?: System.getenv("USERNAME")
-                password = extra["gpr.key"]?.toString() ?: System.getenv("TOKEN")
-            }
-        }
     }
 }
 

diff --git a/examples/standalone/kotlin-multi-android-only/settings.gradle.kts b/examples/standalone/kotlin-multi-android-only/settings.gradle.kts
@@ -17,8 +17,8 @@ pluginManagement {
         maven {
             url  = uri("https://maven.pkg.github.com/xvik/gradle-animalsniffer-plugin")
             credentials {
-                username = extra["gpr.user"]?.toString() ?: System.getenv("USERNAME")
-                password = extra["gpr.key"]?.toString() ?: System.getenv("TOKEN")
+                username = extra.has("gpr.user").let { if (it) extra["gpr.user"] as String else System.getenv("USERNAME")}
+                password = extra.has("gpr.key").let { if (it) extra["gpr.key"] as String else System.getenv("TOKEN")}
             }
         }
     }

diff --git a/examples/standalone/kotlin-multi-desktop-server/settings.gradle.kts b/examples/standalone/kotlin-multi-desktop-server/settings.gradle.kts
@@ -17,8 +17,8 @@ pluginManagement {
         maven {
             url  = uri("https://maven.pkg.github.com/xvik/gradle-animalsniffer-plugin")
             credentials {
-                username = extra["gpr.user"]?.toString() ?: System.getenv("USERNAME")
-                password = extra["gpr.key"]?.toString() ?: System.getenv("TOKEN")
+                username = extra.has("gpr.user").let { if (it) extra["gpr.user"] as String else System.getenv("USERNAME")}
+                password = extra.has("gpr.key").let { if (it) extra["gpr.key"] as String else System.getenv("TOKEN")}
             }
         }
     }