Skip to content

Commit 0162587

Browse files
authored
Merge pull request #6 from qupath/0.5.0
0.5.0
2 parents ab872e6 + acfd4d6 commit 0162587

File tree

15 files changed

+259
-828
lines changed

15 files changed

+259
-828
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## v0.4.0
2+
3+
* Support for QuPath v0.5.0
4+
5+
6+
## v0.3.0
7+
8+
* First version after extracting extension from QuPath's main repo.

LICENSE.txt renamed to LICENSE

File renamed without changes.

LICENSE.md

Lines changed: 0 additions & 675 deletions
This file was deleted.

build.gradle

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
plugins {
2-
id 'java-library'
3-
// To create a shadow/fat jar, including dependencies
4-
// (not very useful here)
5-
id 'com.github.johnrengelman.shadow' version '7.0.0'
2+
id 'java-library'
3+
// To create a shadow/fat jar, including dependencies
4+
// (not very useful here)
5+
id 'com.github.johnrengelman.shadow' version '8.1.1'
6+
id 'org.openjfx.javafxplugin' version '0.1.0'
67
}
78

89
repositories {
9-
// mavenLocal()
10+
1011
mavenCentral()
1112

1213
maven {
@@ -21,17 +22,21 @@ repositories {
2122

2223
ext.moduleName = 'qupath.extension.align'
2324

24-
description = 'QuPath extension for interactive image alignment'
25-
26-
version = "0.3.0"
25+
base {
26+
description = 'QuPath extension for interactive image alignment'
27+
version = "0.4.0"
28+
group = "io.github.qupath"
29+
}
30+
ext.qupathVersion = gradle.ext.qupathVersion
31+
ext.qupathJavaVersion = 17
2732

2833
dependencies {
29-
shadow "io.github.qupath:qupath-gui-fx:0.3.0"
34+
shadow "io.github.qupath:qupath-gui-fx:${qupathVersion}"
3035
shadow "org.slf4j:slf4j-api:1.7.30"
3136
}
3237

3338
processResources {
34-
from ("${projectDir}/LICENSE.txt") {
39+
from ("${projectDir}/LICENSE") {
3540
into 'licenses/'
3641
}
3742
}
@@ -43,15 +48,9 @@ task copyDependencies(type: Copy) {
4348
}
4449

4550
java {
46-
def version = project.findProperty('toolchain')
47-
if (!version)
48-
version = 11
49-
else if (version.strip() == 'skip')
50-
version = null
51-
if (version != null) {
52-
logger.quiet("Setting toolchain to {}", version)
53-
toolchain {
54-
languageVersion = JavaLanguageVersion.of(version)
55-
}
51+
toolchain {
52+
languageVersion = JavaLanguageVersion.of(qupathJavaVersion)
5653
}
54+
withSourcesJar()
55+
withJavadocJar()
5756
}

gradle/wrapper/gradle-wrapper.jar

4.41 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)