diff options
author | Yigit Boyar <yboyar@google.com> | 2015-10-30 11:32:06 -0700 |
---|---|---|
committer | Yigit Boyar <yboyar@google.com> | 2015-10-30 11:32:06 -0700 |
commit | 34ee2c711e4365f3a26f6aa4fb8f9ebad25963ed (patch) | |
tree | 3224b4aa4fb0de5265faee00ed941393e0923899 | |
parent | 499cacaab504a8166dfe44515e0242b9852d8673 (diff) | |
download | data-binding-34ee2c711e4365f3a26f6aa4fb8f9ebad25963ed.tar.gz |
Revert some bad changes from integration
For some reason, the tools integration CL reverted some
previous CLs in these files. Putting them back
Change-Id: Iae68077c8885ad7a5546465936a8d4ae1e702019
8 files changed, 15 insertions, 9 deletions
diff --git a/developmentPlugins/bintrayPlugin/src/main/groovy/android/databinding/UploadToBintrayTask.groovy b/developmentPlugins/bintrayPlugin/src/main/groovy/android/databinding/UploadToBintrayTask.groovy index 0f1cc9a9..0515c4e0 100644 --- a/developmentPlugins/bintrayPlugin/src/main/groovy/android/databinding/UploadToBintrayTask.groovy +++ b/developmentPlugins/bintrayPlugin/src/main/groovy/android/databinding/UploadToBintrayTask.groovy @@ -74,9 +74,9 @@ public class UploadToBintrayTask extends DefaultTask { } def responseText = execute.text def json = new JsonSlurper().parseText(responseText) - if (json.getAt("message") != "success") { + if (json.getAt("message") != "success" && json.getAt("message") != null) { throw new RuntimeException("Cannot upload artifact. Error response: " + - "${json.getAt("message")}") + "${json.getAt("message")} ${responseText}") } println("uploaded $localFile") } diff --git a/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/LocalizeDependenciesTask.groovy b/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/LocalizeDependenciesTask.groovy index ad2d5c8b..37db3068 100644 --- a/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/LocalizeDependenciesTask.groovy +++ b/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/LocalizeDependenciesTask.groovy @@ -46,6 +46,12 @@ class LocalizeDependenciesTask extends DefaultTask { private Set<String> fetchTestDependencies = new HashSet<>(); + // force download these if they are seen as a dependency + private Set<String> wildCard = new HashSet<>(); + { + wildCard.add("kotlin-gradle-plugin-core") + } + List<Artifact> artifactsToResolve = new LinkedList<>(); Set<String> resolvedArtifacts = new HashSet<>(); @@ -206,10 +212,10 @@ class LocalizeDependenciesTask extends DefaultTask { continue } if ("test".equals(dependency.scope)) { - if (fetchTestDependencies.contains(key)) { + if (wildCard.contains(dependency.artifact.getArtifactId()) || fetchTestDependencies.contains(key)) { println("${dependency} is test scope but including because $key is in direct dependencies") } else { - println("skipping $dependency because test and not first level dependency") + println("skipping $dependency because test and $key is not first level dependency. artifact id: ${dependency.artifact.getArtifactId()}") continue } } diff --git a/internal-prebuilts/com/android/databinding/bintray/1.1/bintray-1.1.jar b/internal-prebuilts/com/android/databinding/bintray/1.1/bintray-1.1.jar Binary files differindex 8c11a7e6..235c31d7 100644 --- a/internal-prebuilts/com/android/databinding/bintray/1.1/bintray-1.1.jar +++ b/internal-prebuilts/com/android/databinding/bintray/1.1/bintray-1.1.jar diff --git a/internal-prebuilts/com/android/databinding/bintray/1.1/bintray-1.1.jar.md5 b/internal-prebuilts/com/android/databinding/bintray/1.1/bintray-1.1.jar.md5 index 86eab427..0f51fecc 100644 --- a/internal-prebuilts/com/android/databinding/bintray/1.1/bintray-1.1.jar.md5 +++ b/internal-prebuilts/com/android/databinding/bintray/1.1/bintray-1.1.jar.md5 @@ -1 +1 @@ -04d43b30231daaaced168a2786f84a59
\ No newline at end of file +8fadb8333aee18c3fa913ddbb83ad497
\ No newline at end of file diff --git a/internal-prebuilts/com/android/databinding/bintray/1.1/bintray-1.1.jar.sha1 b/internal-prebuilts/com/android/databinding/bintray/1.1/bintray-1.1.jar.sha1 index af946a5f..348c62b7 100644 --- a/internal-prebuilts/com/android/databinding/bintray/1.1/bintray-1.1.jar.sha1 +++ b/internal-prebuilts/com/android/databinding/bintray/1.1/bintray-1.1.jar.sha1 @@ -1 +1 @@ -e075625d2a703f704dda6c005bd9624f09a1f72a
\ No newline at end of file +2bbb3803d96aaf68f3f966e48401342c310a9c29
\ No newline at end of file diff --git a/internal-prebuilts/com/android/databinding/bintray/maven-metadata.xml b/internal-prebuilts/com/android/databinding/bintray/maven-metadata.xml index 3ff86fa0..bc469a0f 100644 --- a/internal-prebuilts/com/android/databinding/bintray/maven-metadata.xml +++ b/internal-prebuilts/com/android/databinding/bintray/maven-metadata.xml @@ -7,6 +7,6 @@ <versions> <version>1.1</version> </versions> - <lastUpdated>20151030171539</lastUpdated> + <lastUpdated>20151030181338</lastUpdated> </versioning> </metadata> diff --git a/internal-prebuilts/com/android/databinding/bintray/maven-metadata.xml.md5 b/internal-prebuilts/com/android/databinding/bintray/maven-metadata.xml.md5 index 9f45d3ea..838e22ae 100644 --- a/internal-prebuilts/com/android/databinding/bintray/maven-metadata.xml.md5 +++ b/internal-prebuilts/com/android/databinding/bintray/maven-metadata.xml.md5 @@ -1 +1 @@ -f3a5e8d7604ecaed81ecfa305606cf80
\ No newline at end of file +2df6821262c2d4c1385ef99a8f0dcfa7
\ No newline at end of file diff --git a/internal-prebuilts/com/android/databinding/bintray/maven-metadata.xml.sha1 b/internal-prebuilts/com/android/databinding/bintray/maven-metadata.xml.sha1 index cf07f36f..31f44bb9 100644 --- a/internal-prebuilts/com/android/databinding/bintray/maven-metadata.xml.sha1 +++ b/internal-prebuilts/com/android/databinding/bintray/maven-metadata.xml.sha1 @@ -1 +1 @@ -c56a6c9a82b9a81081abe7b39dc85c7cf0591fdd
\ No newline at end of file +8bb8aa3b59a8a640773a11832be32a62c407ea45
\ No newline at end of file |