From be9577bf10fd88badddeec99e60315795b15651f Mon Sep 17 00:00:00 2001
From: Joachim Falk <joachim.falk@fau.de>
Date: Tue, 4 Jul 2017 15:22:06 +0200
Subject: [PATCH] Use relative project dependencies to enable integration of
 the opt4j project as a subproject of a top project.

---
 build.gradle                   | 18 +++++++++---------
 opt4j-benchmarks/build.gradle  |  6 +++---
 opt4j-operators/build.gradle   |  4 ++--
 opt4j-optimizers/build.gradle  |  6 +++---
 opt4j-satdecoding/build.gradle |  4 ++--
 opt4j-tutorial/build.gradle    | 12 ++++++------
 opt4j-viewer/build.gradle      |  4 ++--
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/build.gradle b/build.gradle
index 12e4a312..f0ce4cb3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -163,13 +163,13 @@ uploadArchives.doFirst {
 }
 
 dependencies {
-	runtime project(':opt4j-core')
-	runtime project(':opt4j-satdecoding')
-	runtime project(':opt4j-operators')
-	runtime project(':opt4j-optimizers')
-	runtime project(':opt4j-benchmarks')
-	runtime project(':opt4j-viewer')
-	runtime project(':opt4j-tutorial')
+	runtime project('opt4j-core')
+	runtime project('opt4j-satdecoding')
+	runtime project('opt4j-operators')
+	runtime project('opt4j-optimizers')
+	runtime project('opt4j-benchmarks')
+	runtime project('opt4j-viewer')
+	runtime project('opt4j-tutorial')
 }
 
 jar {
@@ -213,8 +213,8 @@ task copyJavadoc(type: Copy, dependsOn: 'copyJavadocStyle'){
 	into 'build/website/javadoc/'+version
 }
 
-task copyTutorial(type: Copy, dependsOn: ":opt4j-tutorial:tutorial"){
-	from new File(project(':opt4j-tutorial').buildDir,'tutorial')
+task copyTutorial(type: Copy, dependsOn: "opt4j-tutorial:tutorial"){
+	from new File(project('opt4j-tutorial').buildDir,'tutorial')
 	into 'build/website/documentation/'+version
 }
 
diff --git a/opt4j-benchmarks/build.gradle b/opt4j-benchmarks/build.gradle
index afd5b669..9d6b1ac0 100644
--- a/opt4j-benchmarks/build.gradle
+++ b/opt4j-benchmarks/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
-	compile project(':opt4j-core')
-	compile project(':opt4j-satdecoding')
-}
\ No newline at end of file
+	compile parent.project('opt4j-core')
+	compile parent.project('opt4j-satdecoding')
+}
diff --git a/opt4j-operators/build.gradle b/opt4j-operators/build.gradle
index 6dce1097..9239d9c6 100644
--- a/opt4j-operators/build.gradle
+++ b/opt4j-operators/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-	compile project(':opt4j-core')
-}
\ No newline at end of file
+	compile parent.project('opt4j-core')
+}
diff --git a/opt4j-optimizers/build.gradle b/opt4j-optimizers/build.gradle
index c7090d01..6528abda 100644
--- a/opt4j-optimizers/build.gradle
+++ b/opt4j-optimizers/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
-	compile project(':opt4j-core')
-	compile project(':opt4j-operators')
+	compile parent.project('opt4j-core')
+	compile parent.project('opt4j-operators')
 	
 	testCompile	group: 'junit',			  name: 'junit',		   version: '[4.0,)'
 	testCompile group: 'org.mockito',     name: 'mockito-all',     version: '1.9.5'
-}
\ No newline at end of file
+}
diff --git a/opt4j-satdecoding/build.gradle b/opt4j-satdecoding/build.gradle
index 934b499b..19eca1ef 100644
--- a/opt4j-satdecoding/build.gradle
+++ b/opt4j-satdecoding/build.gradle
@@ -2,7 +2,7 @@ dependencies {
 	compile group: 'org.ow2.sat4j', name: 'org.ow2.sat4j.core', version: '2.3.3'
 	compile group: 'org.ow2.sat4j', name: 'org.ow2.sat4j.pb', version: '2.3.3'
 	
-	compile project(':opt4j-core')
+	compile parent.project('opt4j-core')
 	
 	testCompile group: 'junit', name: 'junit', version: '[4.0,)'
-}
\ No newline at end of file
+}
diff --git a/opt4j-tutorial/build.gradle b/opt4j-tutorial/build.gradle
index ca7df324..4b59a3fc 100644
--- a/opt4j-tutorial/build.gradle
+++ b/opt4j-tutorial/build.gradle
@@ -2,11 +2,11 @@ import org.apache.tools.ant.filters.*
 import java.util.regex.*
 
 dependencies {
-	compile project(':opt4j-core')
-	compile project(':opt4j-satdecoding')
-	compile project(':opt4j-optimizers')
-	compile project(':opt4j-operators')
-	compile project(':opt4j-viewer')
+	compile parent.project('opt4j-core')
+	compile parent.project('opt4j-satdecoding')
+	compile parent.project('opt4j-optimizers')
+	compile parent.project('opt4j-operators')
+	compile parent.project('opt4j-viewer')
 }
 
 task filterSources(type: Copy) {
@@ -49,4 +49,4 @@ task tutorial(type: Copy, dependsOn: filterSources) {
 		exclude '**/*properties'
 	}
 	into 'build/tutorial'
-}
\ No newline at end of file
+}
diff --git a/opt4j-viewer/build.gradle b/opt4j-viewer/build.gradle
index 2bd590a8..ab447ce5 100644
--- a/opt4j-viewer/build.gradle
+++ b/opt4j-viewer/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
-	compile project(':opt4j-core')
+	compile parent.project('opt4j-core')
 }
 
 javadoc {
    exclude 'ptolemy/**'
-}
\ No newline at end of file
+}