diff options
| author | Christian Williams <christianw@google.com> | 2017-11-01 09:57:06 -0700 |
|---|---|---|
| committer | Christian Williams <christianw@google.com> | 2017-11-01 09:59:07 -0700 |
| commit | 2a275f01f0bebde74d588961165fb1d65e01420e (patch) | |
| tree | f8ed20ebacd675af353af55b732174d0a2fc3ab5 | |
| parent | 5c7084009abd44b13cc7ba3d99d9bf8e7702bb20 (diff) | |
| download | robolectric-shadows-2a275f01f0bebde74d588961165fb1d65e01420e.tar.gz | |
Fix upload creds.
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle index bf62e16fe..ffef6d4fd 100644 --- a/build.gradle +++ b/build.gradle @@ -44,6 +44,7 @@ task prefetchSdks() { AndroidSdk.ALL_SDKS.each { androidSdk -> def config = configurations.create("sdk${androidSdk.apiLevel}") dependencies.add("sdk${androidSdk.apiLevel}", androidSdk.coordinates) + // causes dependencies to be resolved: config.files } } @@ -55,6 +56,7 @@ task prefetchDependencies() { allprojects.each { p -> ['compile', 'runtime', 'testCompile', 'testRuntime'].each { configName -> if (p.configurations.findByName(configName)) { + // causes dependencies to be resolved: p.configurations[configName].files } } diff --git a/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy b/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy index e69979c19..09e3c9fd1 100644 --- a/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy +++ b/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy @@ -162,8 +162,8 @@ class RoboJavaModulePlugin implements Plugin<Project> { "https://oss.sonatype.org/service/local/staging/deploy/maven2/" repository(url: url) { authentication( - userName: System.properties["sonatype-login"] || System.env['sonatypeLogin'], - password: System.properties["sonatype-password"] || System.env['sonatypePassword'] + userName: System.properties["sonatype-login"] ?: System.env['sonatypeLogin'], + password: System.properties["sonatype-password"] ?: System.env['sonatypePassword'] ) } |