From 1d999ddc96e50355a486f7c0fae5287e8204f5f0 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Wed, 12 Mar 2025 23:27:55 +0800 Subject: [PATCH] make sure `includeLibraries` only includes jar files --- gradle.properties | 5 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/net/woggioni/gradle/envelope/EnvelopeJarTask.java | 5 ++++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index d5a9c26..3fd479f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,7 @@ gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven -lys.version = 2025.01.17 +lys.version = 2025.03.08 -version.envelope=2025.01.21 +version.envelope=2025.03.12 org.gradle.caching=true - diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a79..ed4c299 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.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/net/woggioni/gradle/envelope/EnvelopeJarTask.java b/src/main/java/net/woggioni/gradle/envelope/EnvelopeJarTask.java index eb14bde..678c691 100644 --- a/src/main/java/net/woggioni/gradle/envelope/EnvelopeJarTask.java +++ b/src/main/java/net/woggioni/gradle/envelope/EnvelopeJarTask.java @@ -135,7 +135,10 @@ public abstract class EnvelopeJarTask extends AbstractArchiveTask { } public void includeLibraries(Object... files) { - into(Constants.LIBRARIES_FOLDER, (copySpec) -> copySpec.from(files)); + into(Constants.LIBRARIES_FOLDER, (copySpec) -> { + copySpec.include("*.jar"); + copySpec.from(files); + }); }