Skip to content

Commit

Permalink
bump dependency versions and build tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
paulk-asert committed Dec 12, 2023
1 parent 4ef476c commit 368128f
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 66 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ commonsCsvVersion = 1.10.0
commonsIoVersion = 2.11.0
commonsMath3Version = 3.6.1
commonsMath4Version = 4.0-beta1
djlVersion = 0.22.1
djlVersion = 0.25.0
groovy3Version = 3.0.19
groovy4Version = 4.0.16
igniteVersion = 2.15.0
Expand Down
2 changes: 0 additions & 2 deletions subprojects/DeepLearningMxnet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@ apply plugin: 'groovy'
apply plugin: 'application'

repositories {
mavenCentral()
// maven {
// url 'https://repository.apache.org/content/groups/snapshots'
// }
// mavenLocal()
}

ext.appName = 'ObjectDetect'
Expand Down
4 changes: 0 additions & 4 deletions subprojects/HousePricesCamel/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
apply plugin: 'groovy'
apply plugin: 'application'

repositories {
mavenCentral()
}

// Camel's API didn't change but the minimum JDK version did with 3.14.x being needed for JDK8
ext.camel = JavaVersion.current().isJava8() ? camelLegacyVersion : camelVersion
ext.appName = 'ExploreOutlier_ApacheCamelCSV'
Expand Down
31 changes: 17 additions & 14 deletions subprojects/HousePricesGPars/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,6 @@ apply plugin: 'groovy'

sourceCompatibility = 1.8

FileUtil.baseNames(sourceSets.main.allSource.files).each { name ->
tasks.register("run$name", JavaExec) {
dependsOn compileGroovy
group 'Application'
description "Run ${name}.groovy as a JVM application/Groovy script"
classpath = sourceSets.main.runtimeClasspath
mainClass = name
}
}

repositories {
mavenCentral()
}

dependencies {
implementation "org.apache.groovy:groovy:$groovy4Version"
implementation 'org.codehaus.gpars:gpars:1.2.1'
Expand All @@ -39,3 +25,20 @@ dependencies {
runtimeOnly "org.slf4j:slf4j-jdk14:$slf4jVersion"
runtimeOnly "org.bytedeco:openblas-platform:$openblasPlatformVersion"
}

def runall = tasks.register('runAll') {
group 'Application'
}

FileUtil.baseNames(sourceSets.main.allSource.files).each { name ->
def subtask = tasks.register("run$name", JavaExec) {
dependsOn compileGroovy
group 'Application'
description "Run ${name}.groovy as a JVM application/Groovy script"
classpath = sourceSets.main.runtimeClasspath
mainClass = name
}
runall.configure {
dependsOn subtask
}
}
4 changes: 0 additions & 4 deletions subprojects/HousePricesGroovyFX/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ import static JavaFXUtil.checkForJavaFX

apply plugin: 'groovy'

repositories {
mavenCentral()
}

tasks.register('versionInfo') {
doLast {
File javaHome = new File(System.getProperty('java.home'))
Expand Down
1 change: 0 additions & 1 deletion subprojects/Iris/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ if (JavaVersion.current().java11Compatible) {
}

repositories {
mavenCentral()
maven { url 'https://jitpack.io' } // JSATFX
}

Expand Down
4 changes: 0 additions & 4 deletions subprojects/IrisGraalVM/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ plugins {
id 'groovy'
}

repositories {
mavenCentral()
}

dependencies {
implementation "org.apache.groovy:groovy:$groovy4Version"
implementation("com.deepnetts:deepnetts-core:1.13.2") {
Expand Down
5 changes: 0 additions & 5 deletions subprojects/Mnist/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ import static JavaFXUtil.checkForJavaFX

apply plugin: 'groovy'

repositories {
// mavenLocal()
mavenCentral()
}

tasks.register('checkJdk8Compatibility') {
doLast {
assert JavaVersion.current().isJava8(), "JDK8 is required but found ${JavaVersion.current()}!"
Expand Down
41 changes: 19 additions & 22 deletions subprojects/Whiskey/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,21 @@
*/
apply plugin: 'groovy'

repositories {
mavenCentral()
}

tasks.register('installWekaPackages', JavaExec) {
group 'Setup'
description "Install Weka optional packages"
classpath = sourceSets.main.runtimeClasspath
mainClass = 'InstallWekaPackages'
}

tasks.register('checkJdk11Compatibility') {
doLast {
assert JavaVersion.current().isJava11Compatible(), "JDK11+ is required but found ${JavaVersion.current()}!"
}
}

FileUtil.baseNames(sourceSets.main.allSource.files, ['InstallWekaPackages']).each { name ->
tasks.register("run$name", JavaExec) {
dependsOn compileGroovy
if (name.contains('Datumbox')) dependsOn(checkJdk11Compatibility)
group 'Application'
description "Run ${name}.groovy as a JVM application/Groovy script"
classpath = sourceSets.main.runtimeClasspath
mainClass = name
}
}

dependencies {
implementation "org.apache.groovy:groovy:$groovy4Version"
implementation project(':ChartUtil')
implementation "nz.ac.waikato.cms.weka:weka-dev:$wekaVersion"
// If Weka is installed along with some optional packages, add the respective Jars to classpath
// TODO can we get Weka library to autodownload these
implementation files(['SelfOrganizingMap', 'LVQ', 'GenClustPlusPlus', 'XMeans', 'cascadeKMeans'].collect{
"${System.getProperty('user.home')}/wekafiles/packages/${it}/${it}.jar"})
"${System.getProperty('user.home')}/wekafiles/packages/${it}/${it}.jar"})
implementation "org.apache.commons:commons-csv:$commonsCsvVersion"
implementation "org.apache.commons:commons-math4-legacy:$commonsMath4Version"
implementation 'org.hipparchus:hipparchus-clustering:3.0'
Expand All @@ -72,3 +51,21 @@ dependencies {
runtimeOnly "org.bytedeco:openblas-platform:$openblasPlatformVersion"
runtimeOnly "org.bytedeco:arpack-ng-platform:$arpackNgPlatformVersion"
}

def runall = tasks.register('runAll') {
group 'Application'
}

FileUtil.baseNames(sourceSets.main.allSource.files, ['InstallWekaPackages']).each { name ->
def subtask = tasks.register("run$name", JavaExec) {
if (name.contains('Datumbox') && !JavaVersion.current().isJava11Compatible()) return
dependsOn compileGroovy
group 'Application'
description "Run ${name}.groovy as a JVM application/Groovy script"
classpath = sourceSets.main.runtimeClasspath
mainClass = name
}
runall.configure {
dependsOn subtask
}
}
10 changes: 1 addition & 9 deletions subprojects/WhiskeyIgnite/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

apply plugin: 'groovy'
apply plugin: 'application'

repositories {
mavenCentral()
// snapshot installed in local maven repo
// mavenLocal()
// maven {
// url 'file:/staging/'
// }
}

ext.appName = 'WhiskeyIgnite'

application {
Expand Down

0 comments on commit 368128f

Please sign in to comment.