From e5d86675fe9a80d074c829f4dff17531ddcc9682 Mon Sep 17 00:00:00 2001 From: APickledWalrus Date: Thu, 16 Jan 2025 14:15:53 -0500 Subject: [PATCH] Begin updating for Skript 2.10 --- .github/workflows/gradle.yml | 4 ++-- build.gradle | 16 ++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../skriptgui/SkriptConverters.java | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 69bbec6..1a0f023 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -7,11 +7,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK 17 uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '8' + java-version: '17' - name: Build with Gradle run: ./gradlew nightlyBuild - name: Upload Nightly Build diff --git a/build.gradle b/build.gradle index 0807be4..2a0fbe2 100644 --- a/build.gradle +++ b/build.gradle @@ -4,29 +4,29 @@ plugins { id 'java' } -group 'io.github.apickledwalrus' -version '1.4.0-dev' +group = 'io.github.apickledwalrus' +version = '1.4.0-dev' compileJava.options.encoding = 'UTF-8' java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(17)) } } repositories { mavenCentral() - maven { url 'https://repo.skriptlang.org/releases' } - maven { url 'https://papermc.io/repo/repository/maven-public/' } - maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } + maven { url = 'https://repo.skriptlang.org/releases' } + maven { url = 'https://repo.papermc.io/repository/maven-public/' } + maven { url = 'https://oss.sonatype.org/content/repositories/snapshots' } } dependencies { implementation group: 'org.eclipse.jdt', name: 'org.eclipse.jdt.annotation', version: '2.2.600' implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1' - implementation group: 'com.destroystokyo.paper', name: 'paper-api', version: '1.16.5-R0.1-SNAPSHOT' - implementation (group: 'com.github.SkriptLang', name: 'Skript', version: '2.6.2') { + implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.19.4-R0.1-SNAPSHOT' + implementation (group: 'com.github.SkriptLang', name: 'Skript', version: '2.10.0') { transitive = false } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05679dc..d6e308a 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.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/io/github/apickledwalrus/skriptgui/SkriptConverters.java b/src/main/java/io/github/apickledwalrus/skriptgui/SkriptConverters.java index fa6942f..29acba4 100644 --- a/src/main/java/io/github/apickledwalrus/skriptgui/SkriptConverters.java +++ b/src/main/java/io/github/apickledwalrus/skriptgui/SkriptConverters.java @@ -1,8 +1,8 @@ package io.github.apickledwalrus.skriptgui; -import ch.njol.skript.registrations.Converters; import io.github.apickledwalrus.skriptgui.gui.GUI; import org.bukkit.inventory.Inventory; +import org.skriptlang.skript.lang.converter.Converters; public class SkriptConverters {