Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build:
strategy:
matrix:
java: [8, 11, 17, 21]
java: [17, 21, 25]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
Expand All @@ -38,7 +38,7 @@ jobs:
path: build/distributions/*.zip
retention-days: 30
- name: Publish artifacts
if: github.event_name != 'pull_request' && matrix.java == 11 && github.repository_owner == 'glencoesoftware'
if: github.event_name != 'pull_request' && matrix.java == 17 && github.repository_owner == 'glencoesoftware'
run: |
./gradlew -PArtifactoryUserName=${ArtifactoryUserName} -PArtifactoryPassword=${ArtifactoryPassword} publish
release:
Expand All @@ -50,7 +50,7 @@ jobs:
- name: Download artifacts from build
uses: actions/download-artifact@v4
with:
name: raw2ometiff 8
name: raw2ometiff 17
- name: List artifacts
run: ls -R
- name: Create a GitHub release
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This is the second half of iSyntax/.mrxs => OME-TIFF conversion.
Requirements
============

Java 8 or later is required.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As in https://github.com/glencoesoftware/bioformats2raw/tree/master?tab=readme-ov-file#development-installation can we also amend the README to update the build requirements?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 3f3271e

As of 0.10.0, Java 11 or later is required.

libblosc (https://github.com/Blosc/c-blosc) version 1.9.0 or later must be installed separately.
The native libraries are not packaged with any relevant jars. See also note in jzarr readme (https://github.com/bcdev/jzarr/blob/master/README.md)
Expand All @@ -27,6 +27,8 @@ Installation
Development Installation
========================

As of 0.10.0, Java 17 is required to build raw2ometiff.

1. Clone the repository:

git clone git@github.com:glencoesoftware/raw2ometiff.git
Expand Down
18 changes: 11 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@ plugins {
group = 'com.glencoesoftware'
version = '0.10.0-SNAPSHOT'

mainClassName = 'com.glencoesoftware.pyramid.PyramidFromDirectoryWriter'
sourceCompatibility = 1.8
targetCompatibility = 1.8
application {
mainClass = 'com.glencoesoftware.pyramid.PyramidFromDirectoryWriter'
}
java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
}
}

repositories {
mavenCentral()
Expand All @@ -30,12 +35,11 @@ repositories {

dependencies {
implementation 'net.java.dev.jna:jna:5.10.0'
implementation 'dev.zarr:jzarr:0.4.2'
implementation 'dev.zarr:zarr-java:0.0.10'
implementation 'dev.zarr:zarr-java:0.1.0'
implementation 'info.picocli:picocli:4.7.5'
implementation 'me.tongfei:progressbar:0.9.0'
implementation 'ome:formats-bsd:8.5.0'
implementation 'com.glencoesoftware:bioformats2raw:0.12.0-rc1'
implementation 'com.glencoesoftware:bioformats2raw:0.12.0-rc2'
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.16'
implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.3.16'

Expand All @@ -62,7 +66,7 @@ jar {
"Implementation-Title": "raw2ometiff converter",
"Implementation-Version": archiveVersion,
"Implementation-Vendor": "Glencoe Software Inc.",
"Main-Class": mainClassName
"Main-Class": application.mainClass
)
}
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
29 changes: 17 additions & 12 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading