Release 1.1.3 (#23)

* Update dependency de.eldoria:eldo-util to v1.13.5 (#11) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update dependency gradle to v7.4.2 (#13) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update actions/checkout action to v2.4.0 (#8) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update dependency com.sk89q.worldguard:worldguard-bukkit to v7.0.7 (#10) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update dependency de.eldoria:schematicbrushreborn-api to v2.1.4 (#12) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.10 (#6) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update dependency net.kyori:adventure-text-minimessage to v4.10.1 (#14) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update dependency com.plotsquared:PlotSquared-Core to v6.6.2 (#16) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update dependency com.plotsquared:PlotSquared-Bukkit to v6.6.2 (#15) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update dependency org.junit.jupiter:junit-jupiter-api to v5.8.2 (#19) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update dependency net.kyori:adventure-platform-bukkit to v4.1.0 (#18) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update actions/setup-java action to v3 (#22) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update actions/checkout action to v3 (#21) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update plugin com.github.johnrengelman.shadow to v7.1.2 (#20) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update dependency de.eldoria:messageblocker to v1.1.1 (#17) * Update dependency de.eldoria:messageblocker to v1.1.1 * Migrate to message blocker interface Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Florian Fülling <46890129+RainbowDashLabs@users.noreply.github.com> * Fix schematic save order * Bump version to 1.1.3 * Adjust publishing * Disable shadow jar Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renovate Bot <bot@renovateapp.com>
eldoriarpg · Apr 14, 2022 · 483af9c · 483af9c
1 parent fc296ba
commit 483af9c
Show file tree

Hide file tree

Showing 13 changed files with 270 additions and 238 deletions.
diff --git a/.github/workflows/publish_to_nexus.yml b/.github/workflows/publish_to_nexus.yml
@@ -16,9 +16,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v3.0.0
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: adopt
           java-version: 17

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v3.0.0
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: adopt
           java-version: 17

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,13 +1,13 @@
 plugins {
     id("org.cadixdev.licenser") version "0.6.1"
-    id("com.github.johnrengelman.shadow") version "7.0.0"
+    id("com.github.johnrengelman.shadow") version "7.1.2"
     id("de.chojo.publishdata") version "1.0.4"
     java
     `maven-publish`
 }
 
 group = "de.eldoria"
-version = "1.1.2"
+version = "1.1.3"
 val shadebase = "de.eldoria." + rootProject.name + ".libs."
 
 repositories {
@@ -17,22 +17,18 @@ repositories {
 }
 
 dependencies {
-    compileOnly("de.eldoria", "schematicbrushreborn-api", "2.1.2")
-    compileOnly("de.eldoria", "eldo-util", "1.13.3")
+    compileOnly("de.eldoria", "schematicbrushreborn-api", "2.1.5")
     compileOnly("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT")
-    compileOnly("com.sk89q.worldedit", "worldedit-bukkit", "7.2.6")
-    compileOnly("com.plotsquared", "PlotSquared-Core", "6.4.0") // PlotSquared Core API
-    compileOnly("com.plotsquared:PlotSquared-Bukkit:6.4.0") { isTransitive = false } // PlotSquared Bukkit API
-    compileOnly("com.sk89q.worldguard", "worldguard-bukkit", "7.0.6")
-    compileOnly("de.eldoria", "messageblocker", "1.0.3c-DEV")
-    compileOnly("net.kyori", "adventure-platform-bukkit", "4.0.1")
-    compileOnly("net.kyori", "adventure-text-minimessage", "4.10.0-SNAPSHOT")
+    compileOnly("com.sk89q.worldedit", "worldedit-bukkit", "7.2.10")
+    compileOnly("com.plotsquared", "PlotSquared-Core", "6.6.2") // PlotSquared Core API
+    compileOnly("com.plotsquared", "PlotSquared-Bukkit", "6.6.2") { isTransitive = false } // PlotSquared Bukkit API
+    compileOnly("com.sk89q.worldguard", "worldguard-bukkit", "7.0.7")
 
 
-    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.6.0")
-    testImplementation("com.sk89q.worldedit", "worldedit-bukkit", "7.2.6")
+    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.8.2")
+    testImplementation("com.sk89q.worldedit", "worldedit-bukkit", "7.2.10")
     testImplementation("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT")
-    testImplementation("de.eldoria", "eldo-util", "1.13.0-DEV")
+    testImplementation("de.eldoria", "eldo-util", "1.13.5")
     testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine")
 }
 
@@ -49,10 +45,7 @@ java {
 
 publishData {
     useEldoNexusRepos()
-    publishTask("jar")
-    publishTask("shadowJar")
-    publishTask("sourcesJar")
-    publishTask("javadocJar")
+    publishComponent("java")
 }
 
 publishing {
@@ -90,12 +83,14 @@ tasks {
             events("passed", "skipped", "failed")
         }
     }
+
     shadowJar{
         relocate("de.eldoria.eldoutilities",  "de.eldoria.schematicbrush.libs.eldoutilities")
         relocate("de.eldoria.messageblocker", "de.eldoria.schematicbrush.libs.messageblocker")
         relocate("net.kyori", "de.eldoria.schematicbrush.libs.kyori")
         mergeServiceFiles()
     }
+
     processResources {
         from(sourceSets.main.get().resources.srcDirs) {
             filesMatching("plugin.yml") {
@@ -106,6 +101,7 @@ tasks {
             duplicatesStrategy = DuplicatesStrategy.INCLUDE
         }
     }
+
     register<Copy>("copyToServer") {
         val path = project.property("targetDir") ?: "";
         if (path.toString().isEmpty()) {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists