diff --git a/build.gradle b/build.gradle index 14a61c5..74c2ca5 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { wrapper { gradleVersion = libs.versions.gradle.get() - distributionType = Wrapper.DistributionType.ALL + distributionType = Wrapper.DistributionType.BIN } ext { diff --git a/gradle/repositories/maven.gradle b/gradle/repositories/maven.gradle index 34e0b5d..4d03e4b 100644 --- a/gradle/repositories/maven.gradle +++ b/gradle/repositories/maven.gradle @@ -2,7 +2,8 @@ repositories { mavenLocal() mavenCentral() maven { - url 'https://www.dcm4che.org/maven2/' + //url 'https://www.dcm4che.org/maven2/' + url 'https://maven.scijava.org/content/repositories/public/' } maven { url 'https://raw.githubusercontent.com/nroduit/mvn-repo/master/' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e6aba25..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/graphics-ghostscript/src/main/java/org/xbib/graphics/ghostscript/internal/GhostscriptLibraryLoader.java b/graphics-ghostscript/src/main/java/org/xbib/graphics/ghostscript/internal/GhostscriptLibraryLoader.java index 5a202d4..9fc67ec 100644 --- a/graphics-ghostscript/src/main/java/org/xbib/graphics/ghostscript/internal/GhostscriptLibraryLoader.java +++ b/graphics-ghostscript/src/main/java/org/xbib/graphics/ghostscript/internal/GhostscriptLibraryLoader.java @@ -21,13 +21,8 @@ public class GhostscriptLibraryLoader { }; private static final String[] MAC_LIBNAMES = { - "libgs.9.54.dylib", - "libgs.9.54", "gs.9.54", - "libgs.9.25.dylib", - "libgs.9.25", - "gs.9.25", - "libgs.dylib", + "gs.9.26", "gs", }; diff --git a/settings.gradle b/settings.gradle index c4fd475..ab02d45 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,9 +15,9 @@ pluginManagement { dependencyResolutionManagement { versionCatalogs { libs { - version('gradle', '8.5') - version('groovy', '4.0.16') - version('datastructures', '5.0.6') + version('gradle', '8.7') + version('groovy', '4.0.21') + version('datastructures', '5.0.7') library('groovy', 'org.apache.groovy', 'groovy').versionRef('groovy') library('groovy-xml', 'org.apache.groovy', 'groovy-xml').versionRef('groovy') library('jna', 'net.java.dev.jna', 'jna').version('5.14.0')