Merge branch '2.x' into feature/custom-syntax-rewrite

# Conflicts:
#	build.gradle

Author: UnderscoreTud

.github/workflows/gradle.yml

@@ -2,8 +2,6 @@ name: Build and test
 
 on:
   push:
-    branches:
-      - 2.x
   pull_request:
 
 jobs:
@@ -38,7 +36,7 @@ jobs:
           path: extra-plugins/
           merge-multiple: true
       - name: Run tests
-        uses: SkriptLang/skript-test-action@v1.2
+        uses: SkriptLang/skript-test-action@v1.3
         with:
           test_script_directory: src/test/scripts
           extra_plugins_directory: extra-plugins/

build.gradle

@@ -3,6 +3,9 @@ import org.apache.tools.ant.filters.ReplaceTokens
 group 'com.btk5h.skript-mirror'
 version '2.6.3'
 
+def latestJava = 25
+def oldestJava = 21
+
 apply plugin: 'java'
 
 repositories {
@@ -18,15 +21,19 @@ processResources {
 }
 
 java {
-	toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+	toolchain.languageVersion.set(JavaLanguageVersion.of(latestJava))
 }
 
 tasks.withType(JavaCompile).configureEach {
 	options.encoding = 'UTF-8'
+	options.compilerArgs += [
+	    '-source', "${oldestJava}",
+	    '-target', "${oldestJava}"
+	]
 }
 
 dependencies {
-	compileOnly group: 'io.papermc.paper', name: 'paper-api', version: '1.21.10-R0.1-SNAPSHOT'
-	compileOnly group: 'com.github.SkriptLang', name: 'Skript', version: '2.14.0'
-	compileOnly group: 'org.ow2.asm', name: 'asm', version: '9.9'
+	compileOnly "io.papermc.paper:paper-api:26.1.2.build.+"
+	compileOnly "com.github.SkriptLang:Skript:2.15.2"
+	compileOnly "org.ow2.asm:asm:9.9"
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists