Use localdeps.gradle to define which local directories to optionally …

…depend on
libris · Jun 16, 2016 · 0c40afd · 0c40afd
1 parent ab9f4c2
commit 0c40afd
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/harvesters/build.gradle b/harvesters/build.gradle
@@ -81,7 +81,11 @@ dependencies {
     def groovyVersion=GroovySystem.getVersion()
     def jettyVersion="8.1.16.v20140903"
 
-    compile 'com.github.libris:whelk-core:0.1.4'
+    if ('useLocalDeps' in System.properties.keySet()) {
+        compile project(':../../whelk-core')
+    } else {
+        compile 'com.github.libris:whelk-core:0.1.4'
+    }
 
     // Common tools
     compile "org.codehaus.groovy:groovy-all:${groovyVersion}"

diff --git a/harvesters/settings.gradle b/harvesters/settings.gradle
@@ -0,0 +1 @@
+apply from: file('../localdeps.gradle')
diff --git a/importers/build.gradle b/importers/build.gradle
@@ -34,9 +34,11 @@ dependencies {
 
     // LIBRISXL modules
     compile project(':../harvesters')
-    compile('../../whelk-core' in project.subprojects*.name?
-            project(':../../whelk-core') :
-            'com.github.libris:whelk-core:0.1.4')
+    if ('useLocalDeps' in System.properties.keySet()) {
+        compile project(':../../whelk-core')
+    } else {
+        compile 'com.github.libris:whelk-core:0.1.4'
+    }
 
     // Common tools
     compile "org.codehaus.groovy:groovy-all:${groovyVersion}"

diff --git a/importers/settings.gradle b/importers/settings.gradle
@@ -1,7 +1,3 @@
-include '../harvesters'
+apply from: file('../localdeps.gradle')
 
-if ('useLocalDeps' in System.properties.keySet()) {
-    if (new File('../../whelk-core').directory) {
-        include ':../../whelk-core'
-    }
-}
+include '../harvesters'
diff --git a/localdeps.gradle b/localdeps.gradle
@@ -0,0 +1,5 @@
+if ('useLocalDeps' in System.properties.keySet()) {
+    if (new File('../../whelk-core').directory) {
+        include ':../../whelk-core'
+    }
+}