Don't set the project version if git-describe fails, show custom comp…

…ile tasks in task overview
floscher · Jun 16, 2018 · a5f7307 · a5f7307
1 parent 3f76bbe
commit a5f7307
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore
@@ -1,2 +1,3 @@
 /.gradle/
 /build/
+/out/
diff --git a/src/main/java/org/openstreetmap/josm/gradle/plugin/JosmPlugin.java b/src/main/java/org/openstreetmap/josm/gradle/plugin/JosmPlugin.java
@@ -34,7 +34,7 @@ public void apply(@Nonnull final Project project) {
     try {
       project.setVersion(new GitDescriber(project.getProjectDir()).describe(true));
     } catch (Exception e) {
-      project.setVersion("‹unknown›");
+      // Don't set the project version
     }
 
     // Apply the Java plugin if not available, because we rely on the `jar` task

diff --git a/src/main/kotlin/task/CustomJosmVersionCompile.kt b/src/main/kotlin/task/CustomJosmVersionCompile.kt
@@ -16,6 +16,8 @@ open class CustomJosmVersionCompile
   private lateinit var customJosm : Dependency
 
   init {
+    group = "JOSM"
+    description = "Compile the JOSM plugin against ${if (findNextVersion) { "the first available JOSM version since" } else { "JOSM version" }} $customVersion"
     classpath = additionalClasspath
     source.add(sourceSet.java)
     destinationDir =  File(project.buildDir, "classes/java/${sourceSet.name}_${customVersion}")