From d8f180064b891b565a443871ac08571f221658e4 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 17 Aug 2021 16:37:14 -0500 Subject: [PATCH] Use release version of paperweight --- .github/workflows/build.yml | 6 ------ build.gradle.kts | 25 ++++--------------------- settings.gradle.kts | 2 +- 3 files changed, 5 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c045b7..dd0e0c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,12 +25,6 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: | ${{ runner.os }}-gradle- - - name: Build paperweight - run: | - git clone https://github.com/PaperMC/paperweight.git - cd paperweight - git switch userdev - ./gradlew publishToMavenLocal --stacktrace - name: Build Paper run: | git clone https://github.com/PaperMC/Paper.git diff --git a/build.gradle.kts b/build.gradle.kts index 2bd25e0..3fc8cc6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,18 +1,18 @@ import net.minecrell.pluginyml.bukkit.BukkitPluginDescription -import xyz.jpenilla.runpaper.task.RunServerTask plugins { `java-library` - id("io.papermc.paperweight.userdev") version "1.1.10-LOCAL-SNAPSHOT" - id("xyz.jpenilla.run-paper") version "1.0.3" + id("io.papermc.paperweight.userdev") version "1.1.10" + id("xyz.jpenilla.run-paper") version "1.0.4-SNAPSHOT" // Adds runServer and runMojangMappedServer tasks for testing id("net.minecrell.plugin-yml.bukkit") version "0.4.0" } group = "io.papermc.paperweight" version = "1.0.0-SNAPSHOT" +description = "Test plugin for paperweight-userdev" repositories { - mavenLocal() { + mavenLocal { content { includeGroup("io.papermc.paper") } } } @@ -21,10 +21,6 @@ dependencies { paperDevBundle("1.17.1-R0.1-SNAPSHOT") } -runPaper { - disablePluginJarDetection() -} - tasks { // Run reobfJar on build build { @@ -41,19 +37,6 @@ tasks { processResources { filteringCharset = Charsets.UTF_8.name() } - - // Task to run obfuscated/production server and plugin - runServer { - minecraftVersion("1.17.1") - pluginJars(reobfJar.flatMap { it.outputJar }) - } - - // Task to run mojang mapped/dev server and plugin - register("runMojangMappedServer") { - minecraftVersion("1.17.1") - pluginJars(jar.flatMap { it.archiveFile }) - paperclip(paperweight.mojangMappedServerJar) - } } bukkit { diff --git a/settings.gradle.kts b/settings.gradle.kts index c8213ff..3b89b4c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,8 +1,8 @@ pluginManagement { repositories { - mavenLocal() gradlePluginPortal() maven("https://papermc.io/repo/repository/maven-public/") + maven("https://repo.jpenilla.xyz/snapshots/") } }