diff options
| -rw-r--r-- | .github/workflows/build.yml | 14 | ||||
| -rw-r--r-- | build.gradle | 16 | ||||
| -rw-r--r-- | bukkit/build.gradle | 10 | ||||
| -rw-r--r-- | bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/itemstack/QItemStack.java | 2 | ||||
| -rw-r--r-- | settings.gradle | 10 |
5 files changed, 40 insertions, 12 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9003010c..0cda7c2d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ jobs: matrix: os: [ubuntu-latest] distribution: [temurin] - java-version: ["17"] + java-version: ["21"] runs-on: ${{ matrix.os }} if: "!startsWith(github.event.commits[0].message, '[ci-skip]')" steps: @@ -25,9 +25,17 @@ jobs: **/gradle-wrapper.properties - name: Build with Gradle run: ./gradlew allJar --no-daemon --stacktrace - - name: Upload the plugin JAR + - name: "Upload the Java ${{ matrix.java-version }} plugin JAR" uses: actions/upload-artifact@v4 with: name: "Quests-JDK${{ matrix.java-version }}" - path: build/libs/*.jar + path: | + build/libs/*.jar + !build/libs/*+java8.jar + if-no-files-found: error + - name: Upload the Java 8 plugin JAR + uses: actions/upload-artifact@v4 + with: + name: Quests-JDK8 (use at your own risk) + path: build/libs/*+java8.jar if-no-files-found: error diff --git a/build.gradle b/build.gradle index dce07df0..3224ed45 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,9 @@ +import net.raphimc.javadowngrader.gradle.task.DowngradeJarTask + plugins { id 'java' - id 'com.github.johnrengelman.shadow' version '8.1.1' + id 'io.github.goooler.shadow' version '8.1.7' + id 'net.raphimc.java-downgrader' version '1.1.2' id 'maven-publish' } @@ -12,8 +15,8 @@ allprojects { group = 'com.leonardobishop' version = '3.15' - sourceCompatibility = 17 - targetCompatibility = 17 + sourceCompatibility = 21 + targetCompatibility = 21 } task allJar( type: Jar, dependsOn: subprojects.tasks['build'] ) { @@ -33,6 +36,13 @@ task allJar( type: Jar, dependsOn: subprojects.tasks['build'] ) { archiveBaseName = 'Quests' } +tasks.register("java8Jar", DowngradeJarTask) { + input = tasks.jar.archiveFile.get().asFile + outputSuffix = "+java8" + compileClassPath = sourceSets.main.compileClasspath +}.get().dependsOn("allJar") +allJar.finalizedBy("java8Jar") + artifacts { archives allJar } diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 4c45e313..70029697 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'com.github.johnrengelman.shadow' + id 'io.github.goooler.shadow' } processResources { @@ -13,7 +13,9 @@ processResources { repositories { // Folia, Paper - maven { url = 'https://papermc.io/repo/repository/maven-public/' } + maven { url = 'https://repo.papermc.io/repository/maven-public/' } + // Paper (adventure-bom snapshots) + maven { url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/' } // ASkyBlock, BentoBox, bStats, Citizens maven { url = 'https://repo.codemc.org/repository/maven-public/' } // AuthLib @@ -54,14 +56,14 @@ repositories { dependencies { compileOnly project(':common') // Paper - compileOnly('io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT') { + compileOnly("io.papermc.paper:paper-api:1.20.5-R0.1-SNAPSHOT") { // exclude libraries not available in 1.8 exclude(group: 'it.unimi.dsi', module: 'fastutil') exclude(group: 'org.apache.maven', module: 'maven-resolver-provider') exclude(group: 'net.md-5', module: 'bungeecord-chat') } // Folia - compileOnly('dev.folia:folia-api:1.20.1-R0.1-SNAPSHOT') { + compileOnly('dev.folia:folia-api:1.20.4-R0.1-SNAPSHOT') { // exclude libraries not available in 1.8 exclude(group: 'it.unimi.dsi', module: 'fastutil') exclude(group: 'org.apache.maven', module: 'maven-resolver-provider') diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/itemstack/QItemStack.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/itemstack/QItemStack.java index 2984c066..b3a0cade 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/itemstack/QItemStack.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/itemstack/QItemStack.java @@ -105,7 +105,7 @@ public class QItemStack { } else { tempLore.addAll(globalLoreAppendStarted); } - ism.addEnchant(Enchantment.ARROW_INFINITE, 1, true); + ism.addEnchant(Enchantment.KNOCKBACK, 1, true); try { ism.addItemFlags(ItemFlag.HIDE_ENCHANTS); ism.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); diff --git a/settings.gradle b/settings.gradle index e0953f0a..b2d792fc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,12 @@ +pluginManagement { + repositories { + // io.github.goooler.shadow + maven { url = 'https://plugins.gradle.org/m2/' } + // net.raphimc.java-downgrader + maven { url = 'https://maven.lenni0451.net/releases' } + } +} + rootProject.name = 'Quests' include 'common' include 'bukkit' - |