From 847628bbea4bcc76b8634c1d5e4fac64c25f3d8a Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Mon, 14 Jun 2021 23:17:16 -0500 Subject: [PATCH] Gradle & Paperclip updates --- build.gradle.kts | 13 +++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c8e36de76b..ada32f29a8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,9 +4,6 @@ plugins { id("io.papermc.paperweight.core") version "1.0.0-SNAPSHOT" } -val mcVersion = providers.gradleProperty("mcVersion") -val packageVersion = providers.gradleProperty("packageVersion") - subprojects { apply(plugin = "java") @@ -39,7 +36,7 @@ subprojects { repositories { mavenCentral() - maven("https://wav.jfrog.io/artifactory/repo/") { // TODO replace with "https://papermc.io/repo/repository/maven-public/" once paperclip is deplyoed there + maven("https://papermc.io/repo/repository/maven-public/") { content { onlyForConfigurations("paperclip") } @@ -59,13 +56,13 @@ repositories { dependencies { paramMappings("org.quiltmc:yarn:1.17+build.2:mergedv2") remapper("org.quiltmc:tiny-remapper:0.4.1") - decompiler("net.minecraftforge:forgeflower:1.5.498.12@jar") - paperclip("io.papermc:paperclip:2.0.0-SNAPSHOT@jar") + decompiler("net.minecraftforge:forgeflower:1.5.498.12") + paperclip("io.papermc:paperclip:2.0.0@jar") } paperweight { - minecraftVersion.set(mcVersion) - versionPackage.set(packageVersion) + minecraftVersion.set(providers.gradleProperty("mcVersion")) + versionPackage.set(providers.gradleProperty("packageVersion")) serverProject.set(project(":Paper-Server")) paper { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf516..69a9715077 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists