diff options
| author | Yigit Boyar <yboyar@google.com> | 2015-10-29 17:17:48 -0700 |
|---|---|---|
| committer | Yigit Boyar <yboyar@google.com> | 2015-11-05 14:29:37 -0800 |
| commit | 59229481aec5a284d322a2ca80dff836485feb0c (patch) | |
| tree | 17ad6ab772d26599ba3476e75f49d268962ba759 /developmentPlugins | |
| parent | 0dfa8cd57fb5acc72167b4c760e823d0b35efd4a (diff) | |
| download | data-binding-59229481aec5a284d322a2ca80dff836485feb0c.tar.gz | |
upgrade kotlin to 1.0-beta1
Change-Id: I62b77fd118e2715d272a16d96b9083d2347f5fb1
Diffstat (limited to 'developmentPlugins')
2 files changed, 8 insertions, 4 deletions
diff --git a/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/LocalizeDependenciesTask.groovy b/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/LocalizeDependenciesTask.groovy index 37db3068..a14fabcb 100644 --- a/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/LocalizeDependenciesTask.groovy +++ b/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/LocalizeDependenciesTask.groovy @@ -70,9 +70,13 @@ class LocalizeDependenciesTask extends DefaultTask { LocalizePluginExtension extension = project.extensions. getByName(MavenDependencyCollectorPlugin.EXTENSION_NAME) if (extension.localRepoDir == null || extension.otherRepoDirs == null) { -// throw new IllegalArgumentException("you must configure " + -// "${MavenDependencyCollectorPlugin.EXTENSION_NAME} with localRepoDir and" + -// " otherRepoDirs") + + def msg = "you must configure " + + "${MavenDependencyCollectorPlugin.EXTENSION_NAME} with localRepoDir and" + + " otherRepoDirs. localRepoDir: " + extension.localRepoDir + + "\notherRepoDir:" + extension.otherRepoDirs; + println(msg) + println("skipping ${project}") return } localRepoDir = extension.localRepoDir diff --git a/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/MavenDependencyCollectorPlugin.groovy b/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/MavenDependencyCollectorPlugin.groovy index fd163da4..0fd805d2 100644 --- a/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/MavenDependencyCollectorPlugin.groovy +++ b/developmentPlugins/localizeMavenPlugin/src/main/groovy/android/databinding/MavenDependencyCollectorPlugin.groovy @@ -24,7 +24,7 @@ public class MavenDependencyCollectorPlugin implements Plugin<Project> { static final String EXTENSION_NAME = "localizeMaven" @Override void apply(Project project) { - Project parent = project.parent == null ? project : project.parent; + Project parent = project.getRootProject(); def localizeDependenciesTask = parent.tasks.findByName(DEFAULT_TASK_NAME) if (localizeDependenciesTask == null) { localizeDependenciesTask = parent.tasks. |