From a971cf6e8e796c92b2eb9af3a6b945b3862317ad Mon Sep 17 00:00:00 2001
From: Sina <65910646+SinaSeylani@users.noreply.github.com>
Date: Tue, 29 Oct 2024 17:53:20 -0600
Subject: [PATCH 1/2] workflow updated

---
 .github/workflows/publish-flex.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish-flex.yml b/.github/workflows/publish-flex.yml
index 7230b63..e335641 100644
--- a/.github/workflows/publish-flex.yml
+++ b/.github/workflows/publish-flex.yml
@@ -31,7 +31,10 @@ jobs:
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_TOKEN_ID }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-        run: ./gradlew :passageflex:publish
+        run: |
+          echo "ossrhUsername=${{ env.OSSRH_USERNAME }}" >> gradle.properties
+          echo "ossrhPassword=${{ env.OSSRH_PASSWORD }}" >> gradle.properties  
+          ./gradlew :passageflex:publish
 
       - name: Wait for Staging Repository to be Created
         run: sleep 60

From 4f6a91d0c2535d0d920fdbcc727999b504bb4bd3 Mon Sep 17 00:00:00 2001
From: Sina <65910646+SinaSeylani@users.noreply.github.com>
Date: Tue, 29 Oct 2024 18:00:58 -0600
Subject: [PATCH 2/2] workflow updated

---
 .github/workflows/publish-flex.yml | 5 +----
 passageflex/build.gradle           | 5 ++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/publish-flex.yml b/.github/workflows/publish-flex.yml
index e335641..3feed97 100644
--- a/.github/workflows/publish-flex.yml
+++ b/.github/workflows/publish-flex.yml
@@ -31,10 +31,7 @@ jobs:
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_TOKEN_ID }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-        run: |
-          echo "ossrhUsername=${{ env.OSSRH_USERNAME }}" >> gradle.properties
-          echo "ossrhPassword=${{ env.OSSRH_PASSWORD }}" >> gradle.properties  
-          ./gradlew :passageflex:publish
+        run:  ./gradlew :passageflex:publish
 
       - name: Wait for Staging Repository to be Created
         run: sleep 60
diff --git a/passageflex/build.gradle b/passageflex/build.gradle
index dd85783..7c60704 100644
--- a/passageflex/build.gradle
+++ b/passageflex/build.gradle
@@ -167,11 +167,10 @@ publishing {
             name = "OSSRH"
             url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
             credentials {
-                username localProperties.getProperty('ossrhUsername')
-                password localProperties.getProperty('ossrhPassword')
+                username = project.findProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME")
+                password = project.findProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD")
             }
         }
-        mavenLocal()
     }
 }