From bc92b7513683a82b4a534c8c6820ce27bb05267a Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Mon, 11 Mar 2024 18:25:50 +0800 Subject: [PATCH] fixed Java release version --- build.gradle | 2 +- gradle.properties | 2 +- .../src/main/java/net/woggioni/gradle/sambal/SignJarTask.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index d59ab86..78398ee 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ subprojects { subproject -> } int javaVersion - if(subproject.path == ':osgi-app' || ':multi-release-jar') { + if(subproject.path == ':osgi-app' || subproject.path == ':multi-release-jar') { javaVersion = 11 } else { javaVersion = 8 diff --git a/gradle.properties b/gradle.properties index 6d8d413..6d82616 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ woggioniMavenRepositoryUrl=https://mvn.woggioni.net/ lys.catalog.version=2024.02.12 -version.myGradlePlugins=2024.02.24 +version.myGradlePlugins=2024.03.11 version.gradle=7.6 version.felix.config.admin=1.9.26 version.felix=7.0.5 diff --git a/sambal/src/main/java/net/woggioni/gradle/sambal/SignJarTask.java b/sambal/src/main/java/net/woggioni/gradle/sambal/SignJarTask.java index f4731b3..5dcf14f 100644 --- a/sambal/src/main/java/net/woggioni/gradle/sambal/SignJarTask.java +++ b/sambal/src/main/java/net/woggioni/gradle/sambal/SignJarTask.java @@ -1,5 +1,7 @@ package net.woggioni.gradle.sambal; +import org.codehaus.groovy.ant.Groovy; +import org.codehaus.groovy.util.StringUtil; import org.gradle.api.DefaultTask; import org.gradle.api.file.DirectoryProperty; import org.gradle.api.file.RegularFile; @@ -48,7 +50,7 @@ abstract class SignJarTask extends DefaultTask { public Provider getArchiveFile() { StringBuilder sb = new StringBuilder(getArchiveBaseName().get()); sb.append('-').append(getArchiveVersion().get()); - if(getArchiveClassifier().isPresent() && !getArchiveClassifier().get().isBlank()) { + if(getArchiveClassifier().isPresent() && !getArchiveClassifier().get().isEmpty()) { sb.append('-').append(getArchiveClassifier().get()); } sb.append('.').append(getArchiveExtension().get());