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 @@ -13,7 +13,7 @@ jobs:
contents: read
strategy:
matrix:
java: [8, 11, 17, 21]
java: [17, 21, 25]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
path: build/distributions/*.zip
retention-days: 30
- name: Publish artifacts
if: github.event_name != 'pull_request' && matrix.java == 11
if: github.event_name != 'pull_request' && matrix.java == 17
run: |
./gradlew -PArtifactoryUserName=${ArtifactoryUserName} -PArtifactoryPassword=${ArtifactoryPassword} publish
release:
Expand All @@ -55,7 +55,7 @@ jobs:
- name: Download artifacts from build
uses: actions/download-artifact@v4
with:
name: bioformats2raw 11
name: bioformats2raw 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 @@ -14,7 +14,7 @@ Bio-Formats 5.9.x ("Faas") or Bio-Formats 6.x (true OME-TIFF) pyramid.
Requirements
============

Java 8 or later is required.
As of 0.12.0, Java 11 or later is required to run bioformats2raw.

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 Down Expand Up @@ -68,6 +68,8 @@ Installation
Development Installation
========================

As of 0.12.0, Java 17 is required to build bioformats2raw.

1. Clone the repository:

git clone https://github.com/glencoesoftware/bioformats2raw.git
Expand Down
13 changes: 9 additions & 4 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.12.0-SNAPSHOT'

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

repositories {
mavenLocal()
Expand Down Expand Up @@ -75,7 +80,7 @@ jar {
"Implementation-Title": "bioformats2raw 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.
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-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
41 changes: 28 additions & 13 deletions gradlew

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

35 changes: 19 additions & 16 deletions gradlew.bat

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