Use the Provider API to load GitHub Packages credentials

SRGSSR · Mar 15, 2024 · 3493c24 · 3493c24
1 parent 03aeb0f
commit 3493c24
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/...ugins/src/main/java/ch/srgssr/pillarbox/gradle/PillarboxAndroidLibraryPublishingPlugin.kt b/...ugins/src/main/java/ch/srgssr/pillarbox/gradle/PillarboxAndroidLibraryPublishingPlugin.kt
@@ -49,9 +49,14 @@ class PillarboxAndroidLibraryPublishingPlugin : Plugin<Project> {
                 maven {
                     name = "GitHubPackages"
                     url = uri("https://maven.pkg.github.com/SRGSSR/pillarbox-android")
+
                     credentials {
-                        username = findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
-                        password = findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
+                        username = providers.gradleProperty("gpr.user")
+                            .orElse(providers.environmentVariable("USERNAME"))
+                            .get()
+                        password = providers.gradleProperty("gpr.key")
+                            .orElse(providers.environmentVariable("GITHUB_TOKEN"))
+                            .get()
                     }
                 }
             }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,8 +16,12 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
     repositories {
-        val gitHubUsername = providers.gradleProperty("gpr.user").getOrElse(System.getenv("USERNAME"))
-        val gitHubKey = providers.gradleProperty("gpr.key").getOrElse(System.getenv("GITHUB_TOKEN"))
+        val gitHubUsername = providers.gradleProperty("gpr.user")
+            .orElse(providers.environmentVariable("USERNAME"))
+            .get()
+        val gitHubKey = providers.gradleProperty("gpr.key")
+            .orElse(providers.environmentVariable("GITHUB_TOKEN"))
+            .get()
 
         google()
         mavenCentral()