Merge branch 'develop' into main

mikepenz · Oct 4, 2020 · 016b1ea · 016b1ea
2 parents 0f9429f + 66d48cb
commit 016b1ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -72,12 +72,6 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         run: ./gradlew app:assembleRelease app:bundleRelease
 
-      - name: Prepare Gradle Publish properties
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          echo "NEXUS_USERNAME=${{ secrets.NEXUS_USERNAME }}" >> ~/.gradle/gradle.properties
-          echo "NEXUS_PASSWORD=${{ secrets.NEXUS_PASSWORD }}" >> ~/.gradle/gradle.properties
-
       - name: Relase bintray
         if: startsWith(github.ref, 'refs/tags/')
         run: |
@@ -89,6 +83,8 @@ jobs:
           BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
           BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }}
           BINTRAY_GPG_PASS: ${{ secrets.BINTRAY_GPG_PASS }}
+          NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
+          NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
 
       - name: Collect artifacts
         run: |

diff --git a/gradle-release.gradle b/gradle-release.gradle
@@ -5,12 +5,12 @@ def isReleaseBuild() {
 
 @SuppressWarnings("GroovyUnusedDeclaration")
 def getRepositoryUsername() {
-    return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : System.getenv('NEXUS_USERNAME')
+    return project.hasProperty('NEXUS_USERNAME') ? project.property('NEXUS_USERNAME') : System.getenv('NEXUS_USERNAME')
 }
 
 @SuppressWarnings("GroovyUnusedDeclaration")
 def getRepositoryPassword() {
-    return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : System.getenv('NEXUS_PASSWORD')
+    return project.hasProperty('NEXUS_PASSWORD') ? project.property('NEXUS_PASSWORD') : System.getenv('NEXUS_PASSWORD')
 }
 
 apply plugin: "com.jfrog.bintray"