From 2a40f52deab79bbf5587cb8e1b6ad3e0ec4ed153 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Sun, 5 Dec 2021 23:29:28 +0100 Subject: [PATCH] docs: Update issue template to 1.18 --- .github/ISSUE_TEMPLATE/bug_report.yml | 3 +-- .github/workflows/build.yml | 6 +++--- Bukkit/build.gradle.kts | 8 ++++---- Core/build.gradle.kts | 1 - build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 14 ++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index b5315f3d0..27a44fc59 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -18,8 +18,6 @@ body: options: - Paper - Spigot - - Tuinity - - Purpur validations: required: true @@ -29,6 +27,7 @@ body: description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first. multiple: false options: + - '1.18' - '1.17.1' - '1.16.5' - '1.15.2' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 764d5340a..f4c1c5726 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,11 +7,11 @@ jobs: runs-on: "ubuntu-20.04" steps: - name: "Checkout Repository" - uses: "actions/checkout@v2.3.4" + uses: "actions/checkout@v2.4.0" - name: "Validate Gradle Wrapper" uses: "gradle/wrapper-validation-action@v1.0.4" - name: "Setup Java" - uses: "actions/setup-java@v2.3.1" + uses: "actions/setup-java@v2.4.0" with: distribution: "temurin" java-version: "17" @@ -27,7 +27,7 @@ jobs: fi - name: "Publish Release" if: "${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}" - run: "./gradlew publishToSonatype closeSonatypeStagingRepository" + run: "./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository" env: ORG_GRADLE_PROJECT_sonatypeUsername: "${{ secrets.SONATYPE_USERNAME }}" ORG_GRADLE_PROJECT_sonatypePassword: "${{ secrets.SONATYPE_PASSWORD }}" diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index 8a2d21e66..cbaf0be8d 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -94,10 +94,10 @@ tasks.named("shadowJar") { tasks { withType { val opt = options as StandardJavadocDocletOptions - opt.links("https://papermc.io/javadocs/paper/1.17/") - opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/7.2.6/") - opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/7.2.6/") - opt.links("https://jd.adventure.kyori.net/api/4.9.1/") + opt.links("https://papermc.io/javadocs/paper/1.18/") + opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/7.2.7/") + opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/7.2.7/") + opt.links("https://jd.adventure.kyori.net/api/4.9.3/") opt.links("https://google.github.io/guice/api-docs/5.0.1/javadoc/") opt.links("https://checkerframework.org/api/") } diff --git a/Core/build.gradle.kts b/Core/build.gradle.kts index 08dd35a2c..f220b34f3 100644 --- a/Core/build.gradle.kts +++ b/Core/build.gradle.kts @@ -5,7 +5,6 @@ dependencies { compileOnlyApi(libs.checkerqual) // Minecraft expectations - compileOnlyApi(libs.guava) compileOnlyApi(libs.gson) // Platform expectations diff --git a/build.gradle.kts b/build.gradle.kts index 967f4fe22..54c4f9983 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -73,7 +73,7 @@ allprojects { plugins.withId("java") { the().toolchain { - languageVersion.set(JavaLanguageVersion.of(16)) + languageVersion.set(JavaLanguageVersion.of(17)) } } @@ -236,7 +236,7 @@ tasks { val rootOptions = aggregatedJavadocs.options as StandardJavadocDocletOptions val subOptions = task.options as StandardJavadocDocletOptions - rootOptions.links(*subOptions.links.orEmpty().minus(rootOptions.links.orEmpty()).toTypedArray()) + rootOptions.links(*subOptions.links.orEmpty().minus(rootOptions.links.orEmpty().toSet()).toTypedArray()) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 29a7f3f99..fdca018d2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,10 @@ [versions] # Minecraft expectations -guava = "21.0" # Version set by Minecraft -gson = "2.8.0" # Version set by Minecraft +gson = "2.8.8" # Version set by Minecraft log4j-api = "2.14.1" # Version set by Minecraft # Platform expectations -paper = "1.17.1-R0.1-SNAPSHOT" +paper = "1.18-R0.1-SNAPSHOT" checker-qual = "3.19.0" guice = "5.0.1" findbugs = "3.0.1" @@ -18,11 +17,11 @@ adventure-platform-bukkit = "4.0.0" # Plugins worldedit = "7.2.7" -fawe = "1.17-397" +fawe = "1.17-410" vault = "1.7.1" placeholderapi = "2.10.10" luckperms = "5.3" -essentialsx = "2.18.2" +essentialsx = "2.19.0" hyperverse = "0.6.0-SNAPSHOT" mvdwapi = "3.1.1" @@ -40,7 +39,7 @@ http4j = "1.3" # Gradle plugins shadow = "7.1.0" -grgit = "4.1.0" +grgit = "4.1.1" licenser = "0.6.1" nexus = "1.1.0" @@ -50,7 +49,6 @@ paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checker-qual" } # Minecraft expectations -guava = { group = "com.google.guava", name = "guava", version.ref = "guava" } gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } log4j = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j-api" } @@ -73,7 +71,7 @@ fastasyncworldeditCore = { group = "com.fastasyncworldedit", name = "FastAsyncWo vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" } placeholderapi = { group = "me.clip", name = "placeholderapi", version.ref = "placeholderapi" } luckperms = { group = "net.luckperms", name = "api", version.ref = "luckperms" } -essentialsx = { group = "net.ess3", name = "EssentialsX", version.ref = "essentialsx" } +essentialsx = { group = "net.essentialsx", name = "EssentialsX", version.ref = "essentialsx" } hyperverse = { group = "se.hyperver.hyperverse", name = "Core", version.ref = "hyperverse" } # Third party diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102e0..84d1f85fd 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.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists