stop using intermediate projects for config inheritance

4 files changed, 39 insertions, 29 deletions

diff --git a/packages/oraclejdk/build.gradle b/packages/oraclejdk/build.gradle
deleted file mode 100644
index e2e8c90..0000000
--- a/packages/oraclejdk/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-import org.xapek.yvesf.gradle.DownloadTask
-
-subprojects {
-  task download(type: DownloadTask) {}
-
-  task untar(type: Copy) {
-    into file("${buildDir}/unpacked/dist")
-    eachFile { FileCopyDetails fcd ->
-      fcd.path = fcd.path.substring(path.indexOf('/') + 1)
-    }
-  }
-  untar.dependsOn(download)
-
-  ospackage {
-    from untar.outputs.files
-  }
-
-  project.afterEvaluate {
-    untar.from tarTree(download.destFile)
-  }
-
-  tasks.getByName('createActivator').dependsOn('untar')
-  tasks.getByName('createActivator').doFirst {
-    file("${buildDir}/unpacked/dist/bin").list().each {
-      activator.bin[it] = "/opt/${project.name}/bin/${it}"
-    }
-  }
-}
\ No newline at end of file
diff --git a/packages/oraclejdk/oracle.gradle b/packages/oraclejdk/oracle.gradle
new file mode 100644
index 0000000..498b3d7
--- /dev/null
+++ b/packages/oraclejdk/oracle.gradle
@@ -0,0 +1,34 @@
+buildscript {
+  repositories {
+    mavenLocal()
+    mavenCentral()
+  }
+  dependencies {
+    classpath 'org.xapek.yvesf:gradle-download-task:0.1-SNAPSHOT'
+  }
+}
+
+task download(type: org.xapek.yvesf.gradle.DownloadTask) {}
+
+task untar(type: Copy) {
+  into file("${buildDir}/unpacked/dist")
+  eachFile { FileCopyDetails fcd ->
+    fcd.path = fcd.path.substring(path.indexOf('/') + 1)
+  }
+}
+untar.dependsOn(download)
+
+ospackage {
+  from untar.outputs.files
+}
+
+project.afterEvaluate {
+  untar.from tarTree(download.destFile)
+}
+
+tasks.getByName('activator').dependsOn('untar')
+tasks.getByName('activator').doFirst {
+  file("${buildDir}/unpacked/dist/bin").list().each {
+    activator.bin[it] = "/opt/${project.name}/bin/${it}"
+  }
+}
diff --git a/packages/oraclejdk/oraclejdk7/build.gradle b/packages/oraclejdk/oraclejdk7/build.gradle
index 97d6f9a..f0ee830 100644
--- a/packages/oraclejdk/oraclejdk7/build.gradle
+++ b/packages/oraclejdk/oraclejdk7/build.gradle
@@ -1,9 +1,11 @@
 version '7.80'
 
+apply from: '../oracle.gradle'
+
 download.source 'http://ftp.heanet.ie/mirrors/funtoo/distfiles/oracle-java/jdk-7u80-linux-x64.tar.gz'
 download.sha256sum 'bad9a731639655118740bee119139c1ed019737ec802a630dd7ad7aab4309623'
 
 ospackage {
   into '/usr/lib/jvm/java-7-oraclejdk'
 }
-activator.env['JAVA_HOME'] = '/usr/lib/jvm/java-7-oraclejdk'
\ No newline at end of file
+activator.env['JAVA_HOME'] = '/usr/lib/jvm/java-7-oraclejdk'
diff --git a/packages/oraclejdk/oraclejdk8/build.gradle b/packages/oraclejdk/oraclejdk8/build.gradle
index 3af763a..d6d73c7 100644
--- a/packages/oraclejdk/oraclejdk8/build.gradle
+++ b/packages/oraclejdk/oraclejdk8/build.gradle
@@ -1,5 +1,7 @@
 version '8.66'
 
+apply from: '../oracle.gradle'
+
 download.source 'http://ftp.heanet.ie/mirrors/funtoo/distfiles/oracle-java/jdk-8u66-linux-x64.tar.gz'
 download.sha256sum '7e95ad5fa1c75bc65d54aaac9e9986063d0a442f39a53f77909b044cef63dc0a'