From 7451517d63ceb174268367fe4a5e0782591da1f2 Mon Sep 17 00:00:00 2001
From: Yves Fischer <yvesf-git@xapek.org>
Date: Sat, 21 May 2016 22:40:24 +0200
Subject: stop using intermediate projects for config inheritance

---
 packages/idea-iu/build.gradle             | 25 -------------------------
 packages/idea-iu/idea-iu.gradle           | 31 +++++++++++++++++++++++++++++++
 packages/idea-iu/idea-iu15/build.gradle   |  2 ++
 packages/idea-iu/idea-iu2016/build.gradle |  2 ++
 4 files changed, 35 insertions(+), 25 deletions(-)
 delete mode 100644 packages/idea-iu/build.gradle
 create mode 100644 packages/idea-iu/idea-iu.gradle

(limited to 'packages/idea-iu')

diff --git a/packages/idea-iu/build.gradle b/packages/idea-iu/build.gradle
deleted file mode 100644
index 54126f7..0000000
--- a/packages/idea-iu/build.gradle
+++ /dev/null
@@ -1,25 +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 {
-        into "/opt/${project.name}"
-        from untar.outputs.files
-    }
-
-    activator.bin['idea'] = "/opt/${project.name}/bin/idea.sh"
-
-    project.afterEvaluate {
-        download.source "https://download.jetbrains.com/idea/ideaIU-${project.version}.tar.gz"
-        untar.from tarTree(download.destFile)
-    }
-}
diff --git a/packages/idea-iu/idea-iu.gradle b/packages/idea-iu/idea-iu.gradle
new file mode 100644
index 0000000..5afd834
--- /dev/null
+++ b/packages/idea-iu/idea-iu.gradle
@@ -0,0 +1,31 @@
+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 {
+    into "/opt/${project.name}"
+    from untar.outputs.files
+}
+
+activator.bin['idea'] = "/opt/${project.name}/bin/idea.sh"
+
+project.afterEvaluate {
+    download.source "https://download.jetbrains.com/idea/ideaIU-${project.version}.tar.gz"
+    untar.from tarTree(download.destFile)
+}
diff --git a/packages/idea-iu/idea-iu15/build.gradle b/packages/idea-iu/idea-iu15/build.gradle
index 850edb2..9ad3d72 100644
--- a/packages/idea-iu/idea-iu15/build.gradle
+++ b/packages/idea-iu/idea-iu15/build.gradle
@@ -1,3 +1,5 @@
 version '15.0.2'
 
+apply from: '../idea-iu.gradle'
+
 download.sha256sum 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
diff --git a/packages/idea-iu/idea-iu2016/build.gradle b/packages/idea-iu/idea-iu2016/build.gradle
index 0dcee59..64479a1 100644
--- a/packages/idea-iu/idea-iu2016/build.gradle
+++ b/packages/idea-iu/idea-iu2016/build.gradle
@@ -1,3 +1,5 @@
 version '2016.1.2'
 
+apply from: '../idea-iu.gradle'
+
 download.sha256sum 'fe51f5e0cd9dde166ff5ff7194221c760e3e5a12e0e3423b7ebb10d42de9b737'
-- 
cgit v1.2.1