Updated to Kotlin 2.1.0

Auxilor · Dec 5, 2024 · 1e2d87c · 1e2d87c
1 parent fa6753c
commit 1e2d87c
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,10 +1,12 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 buildscript {
     repositories {
         mavenCentral()
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
     }
 }
 
@@ -13,7 +15,7 @@ plugins {
     id("com.gradleup.shadow") version "8.3.5"
     id("maven-publish")
     id("java")
-    kotlin("jvm") version "1.9.21"
+    kotlin("jvm") version "2.1.0"
 }
 
 dependencies {
@@ -108,12 +110,12 @@ allprojects {
 
     dependencies {
         // Kotlin
-        implementation(kotlin("stdlib", version = "1.9.21"))
+        implementation(kotlin("stdlib", version = "2.1.0"))
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
 
         // Included in spigot jar, no need to move to implementation
         compileOnly("org.jetbrains:annotations:23.0.0")
-        compileOnly("com.google.guava:guava:31.1-jre")
+        compileOnly("com.google.guava:guava:32.0.0-jre")
 
         // Test
         testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
@@ -157,8 +159,8 @@ allprojects {
         }
 
         compileKotlin {
-            kotlinOptions {
-                jvmTarget = "17"
+            compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_17)
             }
         }
 

diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/events/EcoEventManager.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/events/EcoEventManager.kt
@@ -80,9 +80,11 @@ class EcoEventManager(private val plugin: EcoPlugin) : EventManager {
     }
 
     override fun registerPacketListener(listener: PacketListener) {
-        listeners[listener.priority] += RegisteredPacketListener(
-            plugin,
-            listener
+        listeners[listener.priority].add(
+            RegisteredPacketListener(
+                plugin,
+                listener
+            )
         )
     }
 }
diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/slot/EcoSlotBuilder.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/slot/EcoSlotBuilder.kt
@@ -23,7 +23,7 @@ class EcoSlotBuilder(private val provider: SlotProvider) : SlotBuilder {
     private var notCaptiveFor: (Player) -> Boolean = { _ -> false}
 
     override fun onClick(type: ClickType, action: SlotHandler): SlotBuilder {
-        handlers[type] += action
+        handlers[type].add(action)
         return this
     }
 

diff --git a/...otlin/com/willfp/eco/internal/spigot/proxy/common/ai/entity/RangedBowAttackGoalFactory.kt b/...otlin/com/willfp/eco/internal/spigot/proxy/common/ai/entity/RangedBowAttackGoalFactory.kt
@@ -10,7 +10,7 @@ import net.minecraft.world.entity.monster.RangedAttackMob
 
 object RangedBowAttackGoalFactory : EntityGoalFactory<EntityGoalRangedBowAttack> {
     override fun create(apiGoal: EntityGoalRangedBowAttack, entity: PathfinderMob): Goal? {
-        (if (entity !is Monster) return null)
+        if (entity !is Monster) return null
         if (entity !is RangedAttackMob) return null
 
         return RangedBowAttackGoal(

diff --git a/.../com/willfp/eco/internal/spigot/proxy/common/ai/entity/RangedCrossbowAttackGoalFactory.kt b/.../com/willfp/eco/internal/spigot/proxy/common/ai/entity/RangedCrossbowAttackGoalFactory.kt
@@ -11,7 +11,7 @@ import net.minecraft.world.entity.monster.RangedAttackMob
 
 object RangedCrossbowAttackGoalFactory : EntityGoalFactory<EntityGoalRangedCrossbowAttack> {
     override fun create(apiGoal: EntityGoalRangedCrossbowAttack, entity: PathfinderMob): Goal? {
-        (if (entity !is Monster) return null)
+        if (entity !is Monster) return null
         if (entity !is RangedAttackMob) return null
         if (entity !is CrossbowAttackMob) return null
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1 @@
 version = 6.74.4
-kotlin.incremental.useClasspathSnapshot=false
diff --git a/lib/FabledSkyblock-3.3.0.jar b/lib/FabledSkyblock-3.3.0.jar
diff --git a/lib/FabledSkyblock-3.jar b/lib/FabledSkyblock-3.jar
diff --git a/lib/fabledskyblock3.jar b/lib/fabledskyblock3.jar
diff --git a/lib/oraxen-1.164.1.jar b/lib/oraxen-1.164.1.jar
diff --git a/lib/oraxen-1.185.0.jar b/lib/oraxen-1.185.0.jar
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		version = 6.74.4
		kotlin.incremental.useClasspathSnapshot=false