Merge pull request #50 from Weave-MC/merge

Merge projects

Author: Monmcgt

.github/workflows/build.yml

@@ -53,12 +53,14 @@ jobs:
           path: |
             api/build/libs/
             loader/build/libs/
+            internals/build/libs/
+            gradle-plugin/build/libs/
 
       - name: Create release
         if: github.event_name == 'release'
         working-directory: loader/build/libs
         run: |
-          agent=Weave-Loader-Agent-${{github.event.release.name}}.jar
+          agent=weave-loader-${{github.event.release.name}}-all.jar
           sha256sum $agent > $agent.sha256
           gh release upload ${{github.ref_name}} $agent $agent.sha256
         env:

.gitmodules

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+
 plugins {
     `kotlin-dsl`
 }
@@ -14,7 +16,7 @@ dependencies {
 
 kotlin {
     compilerOptions {
-        languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
+        languageVersion = KotlinVersion.KOTLIN_2_0
+        apiVersion = KotlinVersion.KOTLIN_2_0
     }
 }

api/.gitignore

@@ -5,3 +5,5 @@ dependencyResolutionManagement {
         }
     }
 }
+
+rootProject.name = "build-logic"

api/build.gradle.kts

@@ -2,28 +2,21 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
     `java-library`
-    kotlin("jvm")
-    kotlin("plugin.serialization")
-}
-
-val toolchainTarget = JavaLanguageVersion.of(8)
-
-repositories {
-    mavenCentral()
-    mavenLocal()
+    id("org.jetbrains.kotlin.jvm")
+    id("org.jetbrains.kotlin.plugin.serialization")
 }
 
 base {
-    archivesName.set("weave-${project.name}")
+    archivesName = "weave-${project.name}"
 }
 
 java.withSourcesJar()
 
 kotlin {
     compilerOptions {
         freeCompilerArgs.add("-Xjvm-default=all")
-        languageVersion.set(KotlinVersion.KOTLIN_1_9)
-        apiVersion.set(KotlinVersion.KOTLIN_1_9)
+        languageVersion = KotlinVersion.KOTLIN_2_0
+        apiVersion = KotlinVersion.KOTLIN_2_0
     }
 
     jvmToolchain(8)