fix release build

MobileAct · Aug 13, 2019 · da5b91a · da5b91a
1 parent 58f6a19
commit da5b91a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
@@ -7,7 +7,7 @@ pool:
   vmImage: 'ubuntu-latest'
 
 steps:
-  - script: echo -e 'versionTag=$(Build.SourceBranchName)' >> gradle.properties
+  - script: echo -e 'versionTag=$(Build.SourceBranchName)\nBINTRAY_USER=$(BINTRAY_USER)\nBINTRAY_KEY=$(BINTRAY_KEY)' >> gradle.properties
   - task: Gradle@2
     inputs:
       workingDirectory: ''

diff --git a/lib/build.gradle b/lib/build.gradle
@@ -33,9 +33,8 @@ test { useJUnitPlatform() }
 String versionTag = project.hasProperty("versionTag") ? project.property("versionTag") : ""
 
 bintray {
-    user = System.getenv("BINTRAY_USER")
-    println(user)
-    key = System.getenv("BINTRAY_KEY")
+    user = project.hasProperty("BINTRAY_USER") ? project.property("BINTRAY_USER") : ""
+    key = project.hasProperty("BINTRAY_KEY") ? project.property("BINTRAY_KEY") : ""
     publications = ["bintray"]
     pkg {
         repo = "Mindy"
@@ -44,7 +43,7 @@ bintray {
         licenses = ["MIT"]
         githubRepo = "MobileAct/Mindy"
         version {
-            name = versionTag.replaceAll("v-","")
+            name = versionTag.replaceAll("v-", "")
             desc = "Minimum DI"
             vcsTag = versionTag
 
@@ -58,7 +57,7 @@ publishing {
             from components.java
             groupId "mobile-act"
             artifactId "mindy"
-            version versionTag.replaceAll("v-","")
+            version versionTag.replaceAll("v-", "")
         }
     }
 }