stop using intermediate projects for config inheritance

5 files changed, 34 insertions, 22 deletions

diff --git a/packages/grails/build.gradle b/packages/grails/build.gradle
deleted file mode 100644
index 6a101be..0000000
--- a/packages/grails/build.gradle
+++ /dev/null
@@ -1,22 +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 {
-        unzip.from zipTree(download.destFile)
-    }
-}
diff --git a/packages/grails/grails.gradle b/packages/grails/grails.gradle
new file mode 100644
index 0000000..1998b61
--- /dev/null
+++ b/packages/grails/grails.gradle
@@ -0,0 +1,28 @@
+buildscript {
+  repositories {
+    mavenLocal()
+    mavenCentral()
+  }
+  dependencies {
+    classpath 'org.xapek.yvesf:gradle-download-task:0.1-SNAPSHOT'
+  }
+}
+
+task download(type: org.xapek.yvesf.gradle.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 {
+    unzip.from zipTree(download.destFile)
+}
diff --git a/packages/grails/grails2.2.1/build.gradle b/packages/grails/grails2.2.1/build.gradle
index 7cc6b3b..cee5d9d 100644
--- a/packages/grails/grails2.2.1/build.gradle
+++ b/packages/grails/grails2.2.1/build.gradle
@@ -1,4 +1,6 @@
 version '2.2.1'
 
+apply from: '../grails.gradle'
+
 download.source "http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-${project.version}.zip"
 download.sha256sum '4ec22ff45718a0f4948261f15f7c46e67ab0c2294d83d6c3eddb110d00f9af1d'
diff --git a/packages/grails/grails3.0.x/build.gradle b/packages/grails/grails3.0.x/build.gradle
index a700108..b4f810e 100644
--- a/packages/grails/grails3.0.x/build.gradle
+++ b/packages/grails/grails3.0.x/build.gradle
@@ -1,4 +1,6 @@
 version '3.0.12'
 
+apply from: '../grails.gradle'
+
 download.source "https://github.com/grails/grails-core/releases/download/v${project.version}/grails-${project.version}.zip"
 download.sha256sum 'd3b0cf0966a42e3e76ecac593e81c96655b222fa2cc5b5940d1842c8a4753c11'
diff --git a/packages/grails/grails3.1.x/build.gradle b/packages/grails/grails3.1.x/build.gradle
index 4f59d87..22c9a96 100644
--- a/packages/grails/grails3.1.x/build.gradle
+++ b/packages/grails/grails3.1.x/build.gradle
@@ -1,4 +1,6 @@
 version '3.1.0'
 
+apply from: '../grails.gradle'
+
 download.source "https://github.com/grails/grails-core/releases/download/v${project.version}/grails-${project.version}.zip"
 download.sha256sum '35bd209d5f85ec6d4c5b152eb9a33142e2ac6cb67496b0853b472214140a9c53'