Skip to content

Commit

Permalink
Update gradle + deps
Browse files Browse the repository at this point in the history
  • Loading branch information
cjfuller committed Feb 24, 2024
1 parent f05bcc6 commit 610f6db
Show file tree
Hide file tree
Showing 6 changed files with 259 additions and 183 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ target
src/main/resources/edu/stanford/cfuller/imageanalysistools/resources/version_info.xml
.gradle
build
.DS_Store
55 changes: 22 additions & 33 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,36 +1,25 @@
buildscript {
ext.kotlin_version = '1.1.0'

repositories {
jcenter()
mavenCentral()
}

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.github.jengelman.gradle.plugins:shadow:1.2.4"
}
plugins {
id "application"
id "org.jetbrains.kotlin.jvm" version "1.9.22"
id "com.github.johnrengelman.shadow" version "8.1.1"
}

apply plugin: "com.github.johnrengelman.shadow"
apply plugin: "kotlin"
apply plugin: "application"

repositories {
mavenCentral()
maven {
url "http://maven.imagej.net/content/repositories/public"
url "https://maven.imagej.net/content/repositories/public"
}
}

def kotlinVersion = "1.9.22"
def DepVersionLoci = "4.4.5"
def DepVersionIJ = "2.0.0-beta4"
def DepVersionImgLib = "2.0.0-beta5"
def DepVersionCommonsMath = "3.1.1"
def DepVersionJRuby = "1.7.0"
def VersionInfoFilename = "src/main/resources/edu/stanford/cfuller/imageanalysistools/resources/version_info.xml"

def Version = "5.1.5-pre.0"
def Version = "6.0.0"

task updateVersionInfo(type: Exec) {
commandLine "sh", "-c", (
Expand All @@ -39,20 +28,20 @@ task updateVersionInfo(type: Exec) {
}

dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "org.slf4j:slf4j-simple:1.7.21"
testCompile "junit:junit:4.10"
testCompile "io.kotlintest:kotlintest:1.3.7"
compile "org.apache.commons:commons-math3:$DepVersionCommonsMath"
compile "loci:scifio:$DepVersionLoci"
compile "loci:bio-formats:$DepVersionLoci"
compile "loci:ome_tools:$DepVersionLoci"
compile "net.imagej:ij-core:$DepVersionIJ"
compile "net.imglib2:imglib2:$DepVersionImgLib"
compile "net.imglib2:imglib2-io:$DepVersionImgLib"
compile "net.imglib2:imglib2-algorithms:$DepVersionImgLib"
compile "org.jruby:jruby:$DepVersionJRuby"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
implementation "org.slf4j:slf4j-simple:1.7.21"
testImplementation "junit:junit:4.10"
testImplementation "io.kotlintest:kotlintest:1.3.7"
implementation "org.apache.commons:commons-math3:$DepVersionCommonsMath"
implementation "loci:scifio:$DepVersionLoci"
implementation "loci:bio-formats:$DepVersionLoci"
implementation "loci:ome_tools:$DepVersionLoci"
implementation "net.imagej:ij-core:$DepVersionIJ"
implementation "net.imglib2:imglib2:$DepVersionImgLib"
implementation "net.imglib2:imglib2-io:$DepVersionImgLib"
implementation "net.imglib2:imglib2-algorithms:$DepVersionImgLib"
implementation "org.jruby:jruby:$DepVersionJRuby"
implementation "javax.xml.bind:jaxb-api:2.3.1"
}

build.dependsOn updateVersionInfo
Expand All @@ -67,4 +56,4 @@ jar {

test {
environment "PROJECT_ROOT", "$projectDir"
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Sat Feb 25 12:21:33 EST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
Loading

0 comments on commit 610f6db

Please sign in to comment.