Skip to content

Commit

Permalink
0.5.0 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
alanocallaghan committed Nov 1, 2023
1 parent 0b175ea commit ea4c8ce
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 12 deletions.
29 changes: 21 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,37 @@
plugins {
id 'java-library'
id 'maven-publish'
// To manage included native libraries
alias(libs.plugins.javacpp)
id 'java-library'
id 'maven-publish'
// To manage included native libraries
// alias(libs.plugins.javacpp)
id 'org.openjfx.javafxplugin' version '0.1.0'
}

ext.moduleName = 'qupath.extension.stardist'
ext.qupathVersion = gradle.ext.qupathVersion

description = 'QuPath extension to use StarDist'

version = "0.4.0"
version = "0.5.0"

dependencies {
implementation "io.github.qupath:qupath-gui-fx:${qupathVersion}"
implementation libs.bundles.logging

testImplementation libs.junit
testRuntimeOnly libs.junit.engine

}

repositories {
mavenCentral()

maven {
url "https://maven.scijava.org/content/repositories/releases"
}

maven {
url "https://maven.scijava.org/content/repositories/snapshots"
}

}

processResources {
Expand All @@ -40,7 +53,7 @@ tasks.register("copyDependencies", Copy) {
*/
java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
if (project.properties['sources'])
withSourcesJar()
Expand Down Expand Up @@ -112,4 +125,4 @@ publishing {
}
}
}
}
}
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
rootProject.name = 'qupath-extension-stardist'

gradle.ext.qupathVersion = "0.4.0"
gradle.ext.qupathVersion = "0.5.0-SNAPSHOT"

dependencyResolutionManagement {

Expand All @@ -26,4 +26,4 @@ dependencyResolutionManagement {
from("io.github.qupath:qupath-catalog:${gradle.ext.qupathVersion}")
}
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/qupath/ext/stardist/StarDistExtension.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public void installExtension(QuPathGUI qupath) {
var name = entry.getValue();
var command = entry.getKey();
try (var stream = StarDist2D.class.getClassLoader().getResourceAsStream(name)) {
var script = new String(stream.readAllBytes(), StandardCharsets.UTF_8);
if (script != null) {
if (stream != null) {
var script = new String(stream.readAllBytes(), StandardCharsets.UTF_8);
MenuTools.addMenuItems(
qupath.getMenu("Extensions>StarDist", true),
new Action(command, e -> openScript(qupath, script)));
Expand Down

0 comments on commit ea4c8ce

Please sign in to comment.