diff --git a/build.gradle b/build.gradle index d92241f4..7d7aab4b 100644 --- a/build.gradle +++ b/build.gradle @@ -178,13 +178,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 { @@ -228,8 +228,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 } @@ -274,7 +274,9 @@ task alldocs(type: Javadoc) { task release(dependsOn: [distZip,website] ){} -wrapper.gradleVersion = '4.10.2' +task wrapper(type: Wrapper) { + gradleVersion = '4.10.2' +} task fatjar(dependsOn: subprojects.jar, type: Jar) { destinationDir = new File(project.buildDir, 'fatjar') 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 afbebda5..2bb0a180 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.12' testCompile group: 'org.mockito', name: 'mockito-core', version: '2.22.0' -} \ No newline at end of file +} diff --git a/opt4j-satdecoding/build.gradle b/opt4j-satdecoding/build.gradle index 4a51e8ff..58d322f8 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.5' compile group: 'org.ow2.sat4j', name: 'org.ow2.sat4j.pb', version: '2.3.5' - compile project(':opt4j-core') + compile parent.project('opt4j-core') testCompile group: 'junit', name: 'junit', version: '4.12' -} \ 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 +}