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

2 files changed, 10 insertions, 4 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
                 }
             }