Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable integration as gradle subproject #47

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}

Expand Down
6 changes: 3 additions & 3 deletions opt4j-benchmarks/build.gradle
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies {
compile project(':opt4j-core')
}
compile parent.project('opt4j-core')
}
6 changes: 3 additions & 3 deletions opt4j-optimizers/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
}
4 changes: 2 additions & 2 deletions opt4j-satdecoding/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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,)'
}
}
12 changes: 6 additions & 6 deletions opt4j-tutorial/build.gradle
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
compile project(':opt4j-core')
compile parent.project('opt4j-core')
}

javadoc {
exclude 'ptolemy/**'
}
}