diff --git a/build-logic/src/main/kotlin/buildlogic.artifactory-root.gradle.kts b/build-logic/src/main/kotlin/buildlogic.artifactory-root.gradle.kts index 698fb424b..c1032b9cd 100644 --- a/build-logic/src/main/kotlin/buildlogic.artifactory-root.gradle.kts +++ b/build-logic/src/main/kotlin/buildlogic.artifactory-root.gradle.kts @@ -1,4 +1,3 @@ -import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention import org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask plugins { @@ -13,7 +12,7 @@ if (!project.hasProperty(ARTIFACTORY_CONTEXT_URL)) ext[ARTIFACTORY_CONTEXT_URL] if (!project.hasProperty(ARTIFACTORY_USER)) ext[ARTIFACTORY_USER] = "guest" if (!project.hasProperty(ARTIFACTORY_PASSWORD)) ext[ARTIFACTORY_PASSWORD] = "" -configure { +artifactory { setContextUrl("${project.property(ARTIFACTORY_CONTEXT_URL)}") clientConfig.publisher.run { repoKey = when { diff --git a/build-logic/src/main/kotlin/buildlogic.libs.gradle.kts b/build-logic/src/main/kotlin/buildlogic.libs.gradle.kts index ca37db667..eae8d60cf 100644 --- a/build-logic/src/main/kotlin/buildlogic.libs.gradle.kts +++ b/build-logic/src/main/kotlin/buildlogic.libs.gradle.kts @@ -96,6 +96,9 @@ tasks.register("sourcesJar") { it.replaceFirst(textPattern, to) } path = path.replaceFirst(filePattern, "$1${to.replace('.', '/')}$2") + permissions { + unix("rw-r--r--") + } } } archiveClassifier.set("sources") diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/PaperInterop.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/PaperInterop.java index 7f37b8209..ad7c3ff1b 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/PaperInterop.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/PaperInterop.java @@ -26,10 +26,9 @@ import org.bukkit.entity.Entity; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.concurrent.CompletableFuture; /** @@ -37,6 +36,9 @@ */ public class PaperInterop { + private PaperInterop() { + } + public static @Nullable InventoryHolder getHolder(@Nonnull Inventory inventory, boolean useSnapshot) { if (PaperLib.isPaper()) { return inventory.getHolder(useSnapshot); @@ -45,7 +47,7 @@ public class PaperInterop { return inventory.getHolder(); } - public static @NotNull BlockState getBlockState(@Nonnull Block block, boolean useSnapshot) { + public static @Nonnull BlockState getBlockState(@Nonnull Block block, boolean useSnapshot) { if (PaperLib.isPaper()) { return block.getState(useSnapshot); } @@ -53,7 +55,7 @@ public class PaperInterop { return block.getState(); } - public static @NotNull CompletableFuture teleportAsync(@Nonnull Entity entity, @Nonnull Location location) { + public static @Nonnull CompletableFuture teleportAsync(@Nonnull Entity entity, @Nonnull Location location) { if (PaperLib.isPaper()) { return entity.teleportAsync(location); }