From c9b919879ad6cb9f71dfa289a15298b7e7da5bf7 Mon Sep 17 00:00:00 2001
From: akastijn <akastijn@alttd.com>
Date: Sat, 28 Jun 2025 23:03:33 +0200
Subject: [PATCH] Update credentials handling in Gradle and Jenkinsfile for
 improved security

---
 Jenkinsfile         | 9 +++++++--
 settings.gradle.kts | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 54966ac..6a55785 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,12 @@ pipeline {
     stages {
         stage('Gradle') {
             steps {
-                sh './gradlew build'
+                withCredentials([usernamePassword(credentialsId: 'destro-repo-user', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+                    sh '''
+                        chmod +x gradlew
+                        ./gradlew build -PalttdDevPublishUser=$USERNAME -PalttdDevPublishPass=$PASSWORD
+                    '''
+                }
             }
         }
         stage('Archive') {
@@ -17,4 +22,4 @@ pipeline {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c10d7d9..f77e3b3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,10 @@ dependencyResolutionManagement {
         maven { // mypet
             name = "GitHubPackages"
             url = uri("https://maven.pkg.github.com/MyPetORG/MyPet")
-            credentials(PasswordCredentials::class)
+            credentials {
+                username = providers.gradleProperty("GitHubPackagesUsername").orNull
+                password = providers.gradleProperty("GitHubPackagesPassword").orNull
+            }
         }
 
     }