woggioni/my-gradle-plugins
1
0
Fork 0
Code Actions Packages Releases Activity

fixed Java release version

Browse Source
This commit is contained in:
Walter Oggioni
2024-03-11 18:25:50 +08:00
parent 72bfcf4842
commit bc92b75136
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -10,7 +10,7 @@ subprojects { subproject ->
} }
int javaVersion int javaVersion
if(subproject.path == ':osgi-app' || ':multi-release-jar') { if(subproject.path == ':osgi-app' || subproject.path == ':multi-release-jar') {
javaVersion = 11 javaVersion = 11
} else { } else {
javaVersion = 8 javaVersion = 8

2
gradle.properties
View File

@@ -2,7 +2,7 @@ woggioniMavenRepositoryUrl=https://mvn.woggioni.net/
lys.catalog.version=2024.02.12 lys.catalog.version=2024.02.12
version.myGradlePlugins=2024.02.24 version.myGradlePlugins=2024.03.11
version.gradle=7.6 version.gradle=7.6
version.felix.config.admin=1.9.26 version.felix.config.admin=1.9.26
version.felix=7.0.5 version.felix=7.0.5

4
sambal/src/main/java/net/woggioni/gradle/sambal/SignJarTask.java
View File

@@ -1,5 +1,7 @@
package net.woggioni.gradle.sambal; 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.DefaultTask;
import org.gradle.api.file.DirectoryProperty; import org.gradle.api.file.DirectoryProperty;
import org.gradle.api.file.RegularFile; import org.gradle.api.file.RegularFile;
@@ -48,7 +50,7 @@ abstract class SignJarTask extends DefaultTask {
public Provider<RegularFile> getArchiveFile() { public Provider<RegularFile> getArchiveFile() {
StringBuilder sb = new StringBuilder(getArchiveBaseName().get()); StringBuilder sb = new StringBuilder(getArchiveBaseName().get());
sb.append('-').append(getArchiveVersion().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(getArchiveClassifier().get());
} }
sb.append('.').append(getArchiveExtension().get()); sb.append('.').append(getArchiveExtension().get());