Skip to content

Commit

Permalink
Use relative project dependencies to enable integration of the opt4j …
Browse files Browse the repository at this point in the history
…project as a subproject of a top project.
  • Loading branch information
JoachimFalk committed Jul 19, 2019
1 parent 513d2c0 commit 78c0ec5
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 28 deletions.
22 changes: 12 additions & 10 deletions build.gradle
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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')
Expand Down
6 changes: 3 additions & 3 deletions opt4j-benchmarks/build.gradle
@@ -1,4 +1,4 @@
dependencies {
compile project(':opt4j-core')
compile project(':opt4j-satdecoding')
}
compile parent.project('opt4j-core')
compile parent.project('opt4j-satdecoding')
}
4 changes: 2 additions & 2 deletions opt4j-operators/build.gradle
@@ -1,3 +1,3 @@
dependencies {
compile project(':opt4j-core')
}
compile parent.project('opt4j-core')
}
6 changes: 3 additions & 3 deletions 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'
}
}
4 changes: 2 additions & 2 deletions opt4j-satdecoding/build.gradle
Expand Up @@ -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'
}
}
12 changes: 6 additions & 6 deletions opt4j-tutorial/build.gradle
Expand Up @@ -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) {
Expand Down Expand Up @@ -49,4 +49,4 @@ task tutorial(type: Copy, dependsOn: filterSources) {
exclude '**/*properties'
}
into 'build/tutorial'
}
}
4 changes: 2 additions & 2 deletions opt4j-viewer/build.gradle
@@ -1,7 +1,7 @@
dependencies {
compile project(':opt4j-core')
compile parent.project('opt4j-core')
}

javadoc {
exclude 'ptolemy/**'
}
}

0 comments on commit 78c0ec5

Please sign in to comment.