Skip to content

Commit

Permalink
build
Browse files Browse the repository at this point in the history
- SnakeYaml and CommonsIO are now implementation dependencies
- Updated version of SnakeYaml
  • Loading branch information
lessthanoptimal committed Oct 9, 2024
1 parent 0f7d5eb commit 4988be7
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 22 deletions.
1 change: 1 addition & 0 deletions applications/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies {
api project(':integration:boofcv-pdf')

api "args4j:args4j:$args4j_version"
implementation("commons-io:commons-io:$commons_io_version")
}

// Create a jar which contains all the applications
Expand Down
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ allprojects {
project.ext.commons_io_version = '2.16.1'
project.ext.deepboof_version = '0.5.2'
project.ext.lombok_version = '1.18.28'
project.ext.jabel_version = '1.0.0'
project.ext.jabel_version = '1.0.1-1'
project.ext.guava_version = '33.2.0-jre'
project.ext.args4j_version = '2.33'
project.ext.junit_version = '5.10.0'
project.ext.errorprone_version = '2.21.1'
project.ext.nullaway_version = '0.10.11'
project.ext.auto64to32_version = '3.2.2'
project.ext.snakeyaml_version = '2.2'
project.ext.snakeyaml_version = '2.3'
project.ext.jmh_version = '1.36'
project.ext.jetnull_version = '23.0.0'
project.ext.jsr250_version = '1.0'
Expand Down Expand Up @@ -132,10 +132,10 @@ subprojects {
}

dependencies {
api(group: 'org.georegression', name: 'georegression', version: '0.27.3') { exclude group: 'org.ddogleg' }
api(group: 'org.ddogleg', name: 'ddogleg', version: '0.23.4')
api("org.georegression:georegression:0.27.3") { exclude group: 'org.ddogleg' }
api("org.ddogleg:ddogleg:0.23.4")

api group: 'net.sf.trove4j', name: 'trove4j', version: project.trove4j_version
api("net.sf.trove4j:trove4j:${project.trove4j_version}")

compileOnly "org.projectlombok:lombok:${project.lombok_version}"
compileOnly "org.jetbrains:annotations:$project.jetnull_version" // @Nullable
Expand Down Expand Up @@ -164,11 +164,11 @@ subprojects {
benchmarkAnnotationProcessor("org.openjdk.jmh:jmh-generator-annprocess:$jmh_version")

// needed to use Java 11+ syntax with Java 1.8 byte code
annotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:${project.jabel_version}")
noautoAnnotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:${project.jabel_version}")
testAnnotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:${project.jabel_version}")
benchmarkAnnotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:${project.jabel_version}")
generateAnnotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:${project.jabel_version}")
annotationProcessor("com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}")
noautoAnnotationProcessor("com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}")
testAnnotationProcessor("com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}")
benchmarkAnnotationProcessor("com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}")
generateAnnotationProcessor("com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}")

annotationProcessor "org.projectlombok:lombok:${project.lombok_version}" // @Getter @Setter
noautoAnnotationProcessor "org.projectlombok:lombok:${project.lombok_version}" // @Getter @Setter
Expand Down
2 changes: 2 additions & 0 deletions demonstrations/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ dependencies {
implementation project(':integration:boofcv-ffmpeg')
implementation project(':integration:boofcv-jcodec')
implementation project(':integration:boofcv-WebcamCapture')

implementation("commons-io:commons-io:$commons_io_version")
}

// Create a jar which contains all the applications
Expand Down
2 changes: 2 additions & 0 deletions examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ dependencies {
implementation project(':integration:boofcv-jcodec')
implementation project(':integration:boofcv-WebcamCapture')

implementation("commons-io:commons-io:$commons_io_version")

api("org.reflections:reflections:0.10.2") {
exclude group: "org.slf4j"
exclude group: "com.google.guava"
Expand Down
2 changes: 1 addition & 1 deletion integration/boofcv-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ dependencies {

implementation "androidx.annotation:annotation:1.7.1"

annotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:${project.jabel_version}")
annotationProcessor("com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}")
}

afterEvaluate {
Expand Down
21 changes: 12 additions & 9 deletions integration/boofcv-swing/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
dependencies {
api project(':main:boofcv-types')
api project(':main:boofcv-io')
api project(':main:boofcv-feature')
api project(':main:boofcv-geo')
api project(':main:boofcv-sfm')
api project(':main:boofcv-recognition')
api 'com.fifesoft:rsyntaxtextarea:2.6.1'
api 'io.github.vincenzopalazzo:material-ui-swing:1.1.1_pre-release_6.1'
api 'com.github.weisj:darklaf-core:1.4.3.1'
api project(':main:boofcv-types')
api project(':main:boofcv-io')
api project(':main:boofcv-feature')
api project(':main:boofcv-geo')
api project(':main:boofcv-sfm')
api project(':main:boofcv-recognition')
api 'com.fifesoft:rsyntaxtextarea:2.6.1'
api 'io.github.vincenzopalazzo:material-ui-swing:1.1.1_pre-release_6.1'
api 'com.github.weisj:darklaf-core:1.4.3.1'

implementation("org.yaml:snakeyaml:$snakeyaml_version")
implementation("commons-io:commons-io:$commons_io_version")
}
4 changes: 2 additions & 2 deletions main/boofcv-io/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ dependencies {
api project(':main:boofcv-recognition')
api project(':main:boofcv-reconstruction')

api group: 'org.yaml', name: 'snakeyaml', version: snakeyaml_version
api group: 'commons-io', name: 'commons-io', version: commons_io_version
implementation("org.yaml:snakeyaml:$snakeyaml_version")
implementation("commons-io:commons-io:$commons_io_version")
}

0 comments on commit 4988be7

Please sign in to comment.