Setup Gradle from base folder

- less duplication of gradle - allow projects to be built depending on each other
Arpic · Sep 18, 2019 · 6343bbe · 6343bbe
1 parent 8a1ff83
commit 6343bbe
Show file tree

Hide file tree

Showing 24 changed files with 61 additions and 898 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,13 @@
 **/.settings/
 **/bin/
 
+#Intellij
+*.iml
+.idea
+
 #Gradle 
 **/.gradle/
-**/build/*
+**/build/*
+
+#macOS
+.DS_Store
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,39 @@
+buildscript {
+    repositories {
+        maven {
+            credentials {
+                username "$slimsApiArtifactoryUser"
+                password "$slimsApiArtifactoryPassword"
+            }
+            url "$slimsApiArtifactoryRepository"
+        }
+    }
+    dependencies {
+        classpath 'com.genohm:slims-plugin:0.1.0'
+    }
+}
+
+subprojects {
+    repositories {
+        maven {
+            credentials {
+                username "$slimsApiArtifactoryUser"
+                password "$slimsApiArtifactoryPassword"
+            }
+            url "$slimsApiArtifactoryRepository"
+        }
+    }
+    apply plugin: 'idea'
+    apply plugin: 'eclipse'
+    if (file('src/main/resources/plugin.properties').exists()) {
+        println("Applying slimsplugin to project $it.name")
+        apply plugin: 'com.genohm.slimsplugin'
+    }
+    idea {
+        module {
+            if (scopes.COMPILE) {
+                scopes.COMPILE.plus += [configurations.provided]
+            }
+        }
+    }
+}
diff --git a/...emplate/gradle/wrapper/gradle-wrapper.jar → gradle/wrapper/gradle-wrapper.jar b/...emplate/gradle/wrapper/gradle-wrapper.jar → gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → gradle/wrapper/gradle-wrapper.properties
diff --git a/templates/dto-template/gradlew → gradlew b/templates/dto-template/gradlew → gradlew
diff --git a/templates/dto-template/gradlew.bat → gradlew.bat b/templates/dto-template/gradlew.bat → gradlew.bat
diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1,4 @@
+include 'templates:slimsgate-template'
+include 'templates:slims-vaadin-template'
+include 'templates:library-template'
+include 'templates:dto-template'
diff --git a/templates/README.md b/templates/README.md
@@ -2,17 +2,13 @@
 
 There are some empty template projects listed here. They provide you with an empty project where the minimal required files are present. The following templates are present
 
- - slimsgate-template
-   An empty slimsgate plugin. SLIMSGATE plugins are used to connect to machines and external systems. They also can implement extra business logic required for your lab.
+ * slimsgate-template: An empty slimsgate plugin. SLIMSGATE plugins are used to connect to machines and external systems. They also can implement extra business logic required for your lab.
 
- - slims-vaadin-template 
-   An empty slims vaadin plugin. Slims vaadin plugins are used to create custom UIs and external portals for SLIMS.
+ * slims-vaadin-template: An empty slims vaadin plugin. Slims vaadin plugins are used to create custom UIs and external portals for SLIMS.
 
- - dto-template
-   An empty DTO project. Can be used to put DTO objects in to transfer in between SLIMS and SLIMS GATE
+ * dto-template: An empty DTO project. Can be used to put DTO objects in to transfer in between SLIMS and SLIMS GATE
 
- - library-template
-   An empty library project. Can be used to put common code into.
+ * library-template: An empty library project. Can be used to put common code into.
 
 ## Prerequisites.
 
@@ -37,16 +33,18 @@ You will need to place this file in
 
 ## Using gradle
 
-Once you are setup download any of these projects to try and create a dummy project. We suggest starting with slimsgate-template. 
+Once you are setup, download this repository and try to create a dummy project. We suggest starting with slimsgate-template. 
 
-Navigate to the plugin folder with the command line interface you use. We suggest using GIT Bash for Windows. You can test out if you can build your plugin with
+Navigate to the base folder of the repository with the command line interface you use. We suggest using GIT Bash for Windows. You can test out if you can build your plugin with
 
 ```
-./gradlew fatjar
+./gradlew templates:slimsgate-template:fatjar
 ```
 
 You can upload and deploy your plugin with
 
 ```
-./gradlew uploadToSlims
+./gradlew templates:slimsgate-template:uploadToSlims
 ```
+
+Make sure that new defined projects are included in [settings.gradle](../settings.gradle).
diff --git a/templates/dto-template/build.gradle b/templates/dto-template/build.gradle
@@ -1,26 +0,0 @@
-buildscript {
-    repositories {
-        maven {
-            credentials {
-                username "$slimsApiArtifactoryUser"
-                password "$slimsApiArtifactoryPassword"
-            }
-            url "$slimsApiArtifactoryRepository"
-        }
-    }
-    dependencies {
-        classpath 'com.genohm:slims-plugin:0.1.0'
-    }
-}
-
-repositories {
-    maven {
-        credentials {
-            username "$slimsApiArtifactoryUser"
-            password "$slimsApiArtifactoryPassword"
-        }
-        url "$slimsApiArtifactoryRepository"
-    }
-}
-
-apply plugin: 'com.genohm.slimsplugin'

diff --git a/templates/library-template/build.gradle b/templates/library-template/build.gradle
@@ -1,26 +0,0 @@
-buildscript {
-    repositories {
-        maven {
-            credentials {
-                username "$slimsApiArtifactoryUser"
-                password "$slimsApiArtifactoryPassword"
-            }
-            url "$slimsApiArtifactoryRepository"
-        }
-    }
-    dependencies {
-        classpath 'com.genohm:slims-plugin:0.1.0'
-    }
-}
-
-repositories {
-    maven {
-        credentials {
-            username "$slimsApiArtifactoryUser"
-            password "$slimsApiArtifactoryPassword"
-        }
-        url "$slimsApiArtifactoryRepository"
-    }
-}
-
-apply plugin: 'com.genohm.slimsplugin'

diff --git a/templates/library-template/gradle/wrapper/gradle-wrapper.jar b/templates/library-template/gradle/wrapper/gradle-wrapper.jar
diff --git a/templates/library-template/gradle/wrapper/gradle-wrapper.properties b/templates/library-template/gradle/wrapper/gradle-wrapper.properties
diff --git a/templates/library-template/gradlew b/templates/library-template/gradlew