Merge pull request #52 from EraTiem-Network/next

Next

Author: Motzkiste

build.gradle.kts

@@ -32,6 +32,10 @@ subprojects {
     named<ShadowJar>("shadowJar") {
       archiveBaseName = rootProject.name
       archiveClassifier = this@subprojects.name.takeIf { it != "util" } ?: ""
+
+      dependencies {
+        exclude(dependency(rootProject.libs.kotlin.stdlib.get()))
+      }
     }
   }
 }

gradle/templates/velocity/build.gradle.kts

@@ -47,12 +47,12 @@ tasks {
       ?.let { pluginFile ->
 
         val fileContent = pluginFile.readLines().joinToString("\n")
-        val pluginAnnotationRegex = Regex("@Plugin\\((.|\\s)*\\)", RegexOption.MULTILINE)
+        val pluginAnnotationRegex = Regex("@Plugin\\((.|\\s)*\\)\\s*class", RegexOption.MULTILINE)
 
         pluginFile.writeText(
-          fileContent.replace(
+          fileContent.replaceFirst(
             pluginAnnotationRegex,
-            "@Plugin(\n${pluginAnnotationContent()}\n)".trimMargin()
+            "@Plugin(\n${pluginAnnotationContent()}\n)\nclass".trimMargin()
           )
         )
       }