Skip to content

Commit ccaa544

Browse files
committed
Merge branch '3.0.x' into 3.1.x
2 parents e957c30 + b1eb08f commit ccaa544

File tree

1 file changed

+2
-7
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling

1 file changed

+2
-7
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.gradle.api.internal.file.copy.CopyActionProcessingStream;
4747
import org.gradle.api.java.archives.Attributes;
4848
import org.gradle.api.java.archives.Manifest;
49-
import org.gradle.api.provider.Provider;
5049
import org.gradle.api.specs.Spec;
5150
import org.gradle.api.tasks.WorkResult;
5251
import org.gradle.api.tasks.WorkResults;
@@ -460,15 +459,11 @@ private int getFileMode(FileCopyDetails details) {
460459
: UnixStat.FILE_FLAG | getPermissions(details);
461460
}
462461

463-
@SuppressWarnings("unchecked")
464462
private int getPermissions(FileCopyDetails details) {
465463
if (GradleVersion.current().compareTo(GradleVersion.version("8.3")) >= 0) {
466464
try {
467-
Object permissions = ((Provider<Object>) details.getClass()
468-
.getMethod("getPermissions")
469-
.invoke(details)).get();
470-
return ((Provider<Integer>) permissions.getClass().getMethod("toUnixNumeric").invoke(permissions))
471-
.get();
465+
Object permissions = details.getClass().getMethod("getPermissions").invoke(details);
466+
return (int) permissions.getClass().getMethod("toUnixNumeric").invoke(permissions);
472467
}
473468
catch (Exception ex) {
474469
throw new GradleException("Failed to get permissions", ex);

0 commit comments

Comments
 (0)