Merge pull request #122 from Shynixn/development

Merge changes to master --release
Shynixn · Aug 6, 2024 · 7d71acd · 7d71acd
2 parents 8dd0016 + 59c4bec
commit 7d71acd
Show file tree

Hide file tree

Showing 39 changed files with 242 additions and 93 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,13 +8,13 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'org.jetbrains.kotlin', name: 'kotlin-gradle-plugin', version: '1.7.10'
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.5.31"
+        classpath group: 'org.jetbrains.kotlin', name: 'kotlin-gradle-plugin', version: '1.9.25'
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.9.20"
     }
 }
 
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
+    id 'org.jetbrains.kotlin.jvm' version '1.9.25'
     id 'io.codearte.nexus-staging' version '0.20.0'
     id "de.marcphilipp.nexus-publish" version '0.2.0'
 }
@@ -43,11 +43,11 @@ tasks.register("printVersion") {
 
 subprojects {
     group 'com.github.shynixn.mccoroutine'
-    version '2.18.0'
+    version '2.19.0'
 
     sourceCompatibility = 1.8
 
-    apply plugin: 'kotlin-platform-jvm'
+    apply plugin: 'kotlin'
     apply plugin: 'signing'
     apply plugin: 'maven-publish'
     apply plugin: 'java-library'
@@ -77,7 +77,7 @@ subprojects {
 
     task sourcesJar(type: Jar) {
         from sourceSets.main.allSource
-        classifier = 'sources'
+        getArchiveClassifier().set('sources')
     }
 
     tasks.named("dokkaHtml") {
@@ -86,7 +86,7 @@ subprojects {
 
     task javadocJar(type: Jar, dependsOn: dokkaHtml) {
         from dokkaHtml.outputDirectory
-        classifier = 'javadoc'
+        getArchiveClassifier().set('javadoc')
     }
 
     publishing {

diff --git a/docs/wiki/docs/installation.md b/docs/wiki/docs/installation.md
@@ -8,62 +8,62 @@ In order to use the MCCoroutine Kotlin API, you need to include the following li
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.18.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.19.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.19.0")
     }
     ```
 
 === "BungeeCord"
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.18.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-api:2.19.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-bungeecord-core:2.19.0")
     }
     ```
 
 === "Fabric"
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.18.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.19.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.19.0")
     }
     ```
 
 === "Folia"
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.18.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.19.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.19.0")
     }
     ```
 
 === "Minestom"
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.18.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-api:2.19.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-minestom-core:2.19.0")
     }
     ```
 
 === "Sponge"
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.18.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-api:2.19.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-sponge-core:2.19.0")
     }
     ```
 
 === "Velocity"
 
     ```groovy
     dependencies {
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.18.0")
-        implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.18.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-api:2.19.0")
+        implementation("com.github.shynixn.mccoroutine:mccoroutine-velocity-core:2.19.0")
     }
     ```
 
@@ -87,17 +87,17 @@ dependencies {
     **plugin.yml**
     ```yaml
     libraries:
-      - com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.18.0
-      - com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.18.0
+      - com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.19.0
+      - com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.19.0
     ```
 
 === "Folia"
 
     **plugin.yml**
     ```yaml
     libraries:
-      - com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.18.0
-      - com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.18.0
+      - com.github.shynixn.mccoroutine:mccoroutine-folia-api:2.19.0
+      - com.github.shynixn.mccoroutine:mccoroutine-folia-core:2.19.0
     ```
 
 

diff --git a/docs/wiki/docs/unittests.md b/docs/wiki/docs/unittests.md
@@ -18,7 +18,7 @@ feedback to the real environment.
 
 ```kotlin
 dependencies {
-    testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.18.0")
+    testImplementation("com.github.shynixn.mccoroutine:mccoroutine-bukkit-test:2.19.0")
 }
 ```
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style=official
 javaVersion=1.8
-kotlinVersion=1.3.20
+kotlinVersion=1.9.25
 org.gradle.jvmargs=-Xms4g
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/mccoroutine-bukkit-api/build.gradle.kts b/mccoroutine-bukkit-api/build.gradle.kts
@@ -4,6 +4,12 @@ repositories {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
+}
+
 dependencies {
     compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
     compileOnly("org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT")

diff --git a/mccoroutine-bukkit-core/build.gradle.kts b/mccoroutine-bukkit-core/build.gradle.kts
@@ -4,6 +4,12 @@ repositories {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
+}
+
 dependencies {
     implementation(project(":mccoroutine-bukkit-api"))
 

diff --git a/mccoroutine-bukkit-sample/build.gradle.kts b/mccoroutine-bukkit-sample/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-    id("com.github.johnrengelman.shadow") version ("2.0.4")
+    id("com.github.johnrengelman.shadow") version ("8.1.1")
 }
 
 publishing {
@@ -12,8 +12,8 @@ publishing {
 
 tasks.withType<ShadowJar> {
     dependsOn("jar")
-    classifier = "shadowJar"
-    archiveName = "$baseName-$version.$extension"
+    archiveClassifier.set("shadowJar")
+    archiveFileName.set("${archiveBaseName.get()}-${archiveVersion.get()}.${archiveExtension.get()}")
 
     // Change the output folder of the plugin.
     // destinationDir = File("C:\\temp\\plugins\\")
@@ -25,6 +25,12 @@ repositories {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
+}
+
 dependencies {
     implementation(project(":mccoroutine-bukkit-api"))
     implementation(project(":mccoroutine-bukkit-core"))

diff --git a/mccoroutine-bukkit-sample/src/main/resources/plugin.yml b/mccoroutine-bukkit-sample/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MCCoroutine-Sample
-version: 2.18.0
+version: 2.19.0
 author: Shynixn
 main: com.github.shynixn.mccoroutine.bukkit.sample.MCCoroutineSamplePlugin
 commands:

diff --git a/mccoroutine-bukkit-test/build.gradle.kts b/mccoroutine-bukkit-test/build.gradle.kts
@@ -4,6 +4,12 @@ repositories {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
+}
+
 dependencies {
     implementation(project(":mccoroutine-bukkit-api"))
 

diff --git a/mccoroutine-bungeecord-api/build.gradle.kts b/mccoroutine-bungeecord-api/build.gradle.kts
@@ -4,6 +4,12 @@ repositories {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
+}
+
 dependencies {
     compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
     compileOnly("net.md-5:bungeecord-api:1.16-R0.5-SNAPSHOT")

diff --git a/mccoroutine-bungeecord-core/build.gradle.kts b/mccoroutine-bungeecord-core/build.gradle.kts
@@ -4,6 +4,12 @@ repositories {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
+}
+
 dependencies {
     implementation(project(":mccoroutine-bungeecord-api"))
 

diff --git a/mccoroutine-bungeecord-sample/build.gradle.kts b/mccoroutine-bungeecord-sample/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-    id("com.github.johnrengelman.shadow") version ("2.0.4")
+    id("com.github.johnrengelman.shadow") version ("8.1.1")
 }
 
 publishing {
@@ -10,10 +10,16 @@ publishing {
     }
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
+}
+
 tasks.withType<ShadowJar> {
     dependsOn("jar")
-    classifier = "shadowJar"
-    archiveName = "$baseName-$version.$extension"
+    archiveClassifier.set("shadowJar")
+    archiveFileName.set("${archiveBaseName.get()}-${archiveVersion.get()}.${archiveExtension.get()}")
 
     // Change the output folder of the plugin.
     // destinationDir = File("C:\\temp\\BungeeCord\\plugins")

diff --git a/mccoroutine-bungeecord-sample/src/main/resources/plugin.yml b/mccoroutine-bungeecord-sample/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MCCoroutine-Sample
-version: 2.18.0
+version: 2.19.0
 author: Shynixn
 main: com.github.shynixn.mccoroutine.bungeecord.sample.MCCoroutineSamplePlugin
 commands:

diff --git a/mccoroutine-fabric-api/build.gradle.kts b/mccoroutine-fabric-api/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 repositories {
     maven {
         url = uri("https://maven.fabricmc.net")
@@ -13,6 +15,12 @@ java {
     }
 }
 
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
 dependencies {
     compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
     compileOnly("net.fabricmc:fabric-loader:0.14.13")

diff --git a/...bric-api/src/main/java/com/github/shynixn/mccoroutine/fabric/MCCoroutineExceptionEvent.kt b/...bric-api/src/main/java/com/github/shynixn/mccoroutine/fabric/MCCoroutineExceptionEvent.kt
@@ -8,7 +8,7 @@ import net.fabricmc.fabric.api.event.EventFactory
  * Cancelling this exception causes the error to not get logged and offers to possibility for custom logging.
  */
 @FunctionalInterface
-interface MCCoroutineExceptionEvent {
+fun interface MCCoroutineExceptionEvent {
     companion object {
         val EVENT: Event<MCCoroutineExceptionEvent> =
             EventFactory.createArrayBacked(MCCoroutineExceptionEvent::class.java) { listeners ->

diff --git a/mccoroutine-fabric-core/build.gradle.kts b/mccoroutine-fabric-core/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 repositories {
     maven {
         url = uri("https://maven.fabricmc.net")
@@ -13,6 +15,12 @@ java {
     }
 }
 
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
 dependencies {
     implementation(project(":mccoroutine-fabric-api"))
     compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")

diff --git a/mccoroutine-fabric-sample/build.gradle.kts b/mccoroutine-fabric-sample/build.gradle.kts
@@ -9,8 +9,8 @@ repositories {
     mavenLocal()
 }
 dependencies {
-    implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.18.0")
-    implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.18.0")
+    implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-api:2.19.0")
+    implementation("com.github.shynixn.mccoroutine:mccoroutine-fabric-core:2.19.0")
 
     minecraft("com.mojang", "minecraft", project.extra["minecraft_version"] as String)
     mappings("net.fabricmc", "yarn", project.extra["yarn_mappings"] as String, null, "v2")

diff --git a/mccoroutine-folia-api/build.gradle.kts b/mccoroutine-folia-api/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 repositories {
     maven {
         url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
@@ -10,6 +12,12 @@ java {
     }
 }
 
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT")
     compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")