Declare dependencies on josm-latest or josm-tested as changing

floscher · Dec 10, 2017 · d1e053f · d1e053f
1 parent 35615f9
commit d1e053f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/groovy/org/openstreetmap/josm/gradle/plugin/JosmPlugin.groovy b/src/main/groovy/org/openstreetmap/josm/gradle/plugin/JosmPlugin.groovy
@@ -1,5 +1,6 @@
 package org.openstreetmap.josm.gradle.plugin
 
+import org.gradle.api.artifacts.ExternalModuleDependency
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -69,7 +70,18 @@ class JosmPlugin implements Plugin<Project> {
 
     project.afterEvaluate {
       // Adding dependencies for JOSM and the required plugins
-      project.dependencies.add('implementation', 'org.openstreetmap.josm:josm:'+project.josm.josmCompileVersion)
+      project.dependencies.add(
+        'implementation',
+        'org.openstreetmap.josm:josm:' + project.josm.josmCompileVersion,
+        {ExternalModuleDependency d ->
+          if ("latest".equals(project.josm.josmCompileVersion) || "tested".equals(project.josm.josmCompileVersion)) {
+            project.logger.info 'Compile against the variable JOSM version ' + project.josm.josmCompileVersion
+            d.changing = true
+          } else {
+            project.logger.info 'Compile against the JOSM version ' + project.josm.josmCompileVersion
+          }
+        }
+      )
       requirePlugins(project, project.josm.manifest.pluginDependencies.toArray(new String[project.josm.manifest.pluginDependencies.size()]))
     }
 

diff --git a/src/main/groovy/org/openstreetmap/josm/gradle/plugin/config/I18nConfig.groovy b/src/main/groovy/org/openstreetmap/josm/gradle/plugin/config/I18nConfig.groovy
@@ -37,7 +37,6 @@ public class I18nConfig {
   def Closure pathTransformer = Closure.IDENTITY
 
   public final Closure getGithubPathTransformer(final String repoSlug) {
-    println 'Get Github transformer for ' + repoSlug
     return { final String path ->
       Matcher lineNumberMatcher = Pattern.compile(".*:([1-9][0-9]*)").matcher(path)
       String lineNumber = null