Skip to content

Commit

Permalink
Merge pull request #6 from qupath/0.5.0
Browse files Browse the repository at this point in the history
0.5.0
  • Loading branch information
petebankhead authored Dec 5, 2023
2 parents ab872e6 + acfd4d6 commit 0162587
Show file tree
Hide file tree
Showing 15 changed files with 259 additions and 828 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
## v0.4.0

* Support for QuPath v0.5.0


## v0.3.0

* First version after extracting extension from QuPath's main repo.
File renamed without changes.
675 changes: 0 additions & 675 deletions LICENSE.md

This file was deleted.

39 changes: 19 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
plugins {
id 'java-library'
// To create a shadow/fat jar, including dependencies
// (not very useful here)
id 'com.github.johnrengelman.shadow' version '7.0.0'
id 'java-library'
// To create a shadow/fat jar, including dependencies
// (not very useful here)
id 'com.github.johnrengelman.shadow' version '8.1.1'
id 'org.openjfx.javafxplugin' version '0.1.0'
}

repositories {
// mavenLocal()

mavenCentral()

maven {
Expand All @@ -21,17 +22,21 @@ repositories {

ext.moduleName = 'qupath.extension.align'

description = 'QuPath extension for interactive image alignment'

version = "0.3.0"
base {
description = 'QuPath extension for interactive image alignment'
version = "0.4.0"
group = "io.github.qupath"
}
ext.qupathVersion = gradle.ext.qupathVersion
ext.qupathJavaVersion = 17

dependencies {
shadow "io.github.qupath:qupath-gui-fx:0.3.0"
shadow "io.github.qupath:qupath-gui-fx:${qupathVersion}"
shadow "org.slf4j:slf4j-api:1.7.30"
}

processResources {
from ("${projectDir}/LICENSE.txt") {
from ("${projectDir}/LICENSE") {
into 'licenses/'
}
}
Expand All @@ -43,15 +48,9 @@ task copyDependencies(type: Copy) {
}

java {
def version = project.findProperty('toolchain')
if (!version)
version = 11
else if (version.strip() == 'skip')
version = null
if (version != null) {
logger.quiet("Setting toolchain to {}", version)
toolchain {
languageVersion = JavaLanguageVersion.of(version)
}
toolchain {
languageVersion = JavaLanguageVersion.of(qupathJavaVersion)
}
withSourcesJar()
withJavadocJar()
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 0162587

Please sign in to comment.