Permalink
Browse files

Merged changes from master into Gradle upgrade. Fixed local publish b…

…roken by upgrade.
  • Loading branch information...
2 parents 41b67dd + 294821a commit 83763f73a82a4cceb2adfe5cb60f91ed27b5c712 @tomakehurst committed Oct 3, 2016
Showing with 10 additions and 6 deletions.
  1. +8 −5 build.gradle
  2. +2 −1 gradle/wrapper/gradle-wrapper.properties
View
@@ -245,9 +245,12 @@ publishing {
URL repoUrl = shouldPublishLocally ? localRepo : URI.create('https://oss.sonatype.org/service/local/staging/deploy/maven2').toURL()
url repoUrl
- credentials {
- username repoUser
- password repoPassword
+
+ if (!shouldPublishLocally) {
+ credentials {
+ username repoUser
+ password repoPassword
+ }
}
}
}
@@ -305,7 +308,7 @@ publishing {
}
task checkReleasePreconditions << {
- def REQUIRED_GIT_BRANCH = 'new-admin-apis'
+ def REQUIRED_GIT_BRANCH = 'master'
println "Using Java version: ${System.getProperty('java.runtime.version')}"
assert System.getProperty('java.runtime.version').startsWith('1.7'), "Must release with Java 7 to avoid collection bug"
@@ -410,7 +413,7 @@ task 'bump-version-down' << {
}
task wrapper(type: Wrapper) {
- gradleVersion = '2.5'
+ gradleVersion = '3.1'
}
task 'add-copyright-headers' << {
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
+

0 comments on commit 83763f7

Please sign in to comment.