buildscripts: replace Ant tasks with a de.undercouch plugin

stephengold · Jun 5, 2024 · efc98f7 · efc98f7
1 parent 71555df
commit efc98f7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 38 deletions.
diff --git a/apps/build.gradle b/apps/build.gradle
@@ -3,6 +3,7 @@
 plugins {
     id 'application' // to build JVM applications
     id 'checkstyle'  // to analyze Java sourcecode for style violations
+    alias(libs.plugins.download) // to retrive files from URLs
 }
 
 checkstyle {
@@ -317,24 +318,8 @@ void registerPlatformTasks(String platform, String suffix) {
         delete downloadsDir + filename
     }
 
-    tasks.register('download' + platform, MyDownload) {
-        sourceUrl = libbulletjmeUrl + filename
-        target = file(downloadsDir + filename)
-    }
-}
-
-// helper class to wrap Ant download task:
-
-class MyDownload extends DefaultTask {
-    @Input
-    String sourceUrl
-
-    @OutputFile
-    File target
-
-    @TaskAction
-    void download() {
-        ant.get(src: sourceUrl, dest: target)
-        println sourceUrl
+    tasks.register('download' + platform, Download) {
+        src libbulletjmeUrl + filename
+        dest file(downloadsDir + filename)
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -23,4 +23,5 @@ sport = "com.github.stephengold:sport:0.9.4"
 
 [plugins]
 
+download = { id = "de.undercouch.download", version = "5.6.0" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "2.0.0" }
diff --git a/kotlin-apps/build.gradle b/kotlin-apps/build.gradle
@@ -2,6 +2,7 @@
 
 plugins {
     id 'application' // to build JVM applications
+    alias(libs.plugins.download) // to retrieve files from URLs
     alias(libs.plugins.kotlin.jvm) // to compile Kotlin
 }
 
@@ -254,24 +255,8 @@ void registerPlatformTasks(String platform, String suffix) {
         delete downloadsDir + filename
     }
 
-    tasks.register('download' + platform, MyDownload) {
-        sourceUrl = libbulletjmeUrl + filename
-        target = file(downloadsDir + filename)
-    }
-}
-
-// helper class to wrap Ant download task:
-
-class MyDownload extends DefaultTask {
-    @Input
-    String sourceUrl
-
-    @OutputFile
-    File target
-
-    @TaskAction
-    void download() {
-        ant.get(src: sourceUrl, dest: target)
-        println sourceUrl
+    tasks.register('download' + platform, Download) {
+        src libbulletjmeUrl + filename
+        dest file(downloadsDir + filename)
     }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,4 +23,5 @@ sport = "com.github.stephengold:sport:0.9.4"

		[plugins]

		download = { id = "de.undercouch.download", version = "5.6.0" }
		kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "2.0.0" }