3 files changed, 24 insertions, 29 deletions
diff --git a/packages/groovy-bin/build.gradle b/packages/groovy-bin/build.gradle
deleted file mode 100644
index 35ef994..0000000
--- a/packages/groovy-bin/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-import org.xapek.yvesf.gradle.DownloadTask
-
-subprojects {
-    task download(type: DownloadTask) {}
-
-    task unzip(type: Copy) {
-        into file("${buildDir}/unpacked/dist")
-        eachFile { FileCopyDetails fcd ->
-            fcd.path = fcd.path.substring(path.indexOf('/')+1)
-        }
-    }
-    unzip.dependsOn(download)
-
-    ospackage {
-        into "/opt/${project.name}"
-        from unzip.outputs.files
-    }
-
-    project.afterEvaluate {
-        download.source "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${project.version}.zip"
-        unzip.from zipTree(download.destFile)
-    }
-
-    activator.bin['groovysh'] = "/opt/${project.name}/bin/groovysh"
-    activator.bin['groovy'] = "/opt/${project.name}/bin/groovy"
-    activator.bin['groovyConsole'] = "/opt/${project.name}/bin/groovyConsole"
-    activator.env['GROOVY_HOME'] = "/opt/${project.name}"
-}
diff --git a/packages/groovy-bin/groovy-bin-2.4.5/build.gradle b/packages/groovy-bin/groovy-bin-2.4.5/build.gradle
index 866f8b0..6ce2338 100644
--- a/packages/groovy-bin/groovy-bin-2.4.5/build.gradle
+++ b/packages/groovy-bin/groovy-bin-2.4.5/build.gradle
@@ -1,2 +1,3 @@
 version '2.4.5'
-download.sha256sum '87e8e9af1f718b84c9bca5a8c42425aadb9e97d8e4ad64e0c91f7c1454cd4caa'
+ext.sha256sum = '87e8e9af1f718b84c9bca5a8c42425aadb9e97d8e4ad64e0c91f7c1454cd4caa'
+apply from: '../groovy.gradle'
diff --git a/packages/groovy-bin/groovy.gradle b/packages/groovy-bin/groovy.gradle
new file mode 100644
index 0000000..6a42d6d
--- /dev/null
+++ b/packages/groovy-bin/groovy.gradle
@@ -0,0 +1,22 @@
+final download = makeDownloadTask(
+    url: "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${project.version}.zip",
+    sha256: sha256sum)
+
+task unzip(type: Copy) {
+  from zipTree(download.dest)
+  into file("${buildDir}/unpacked/dist")
+  eachFile { FileCopyDetails fcd ->
+    fcd.path = fcd.path.substring(path.indexOf('/') + 1)
+  }
+}
+unzip.dependsOn(download)
+
+ospackage {
+  into "/opt/${project.name}"
+  from unzip.outputs.files
+}
+
+activator.bin['groovysh'] = "/opt/${project.name}/bin/groovysh"
+activator.bin['groovy'] = "/opt/${project.name}/bin/groovy"
+activator.bin['groovyConsole'] = "/opt/${project.name}/bin/groovyConsole"
+activator.env['GROOVY_HOME'] = "/opt/${project.name}"
+\ No newline at end of file