breaking: Move from multiplatform to jvm only

99,9999% unlikely that I will every finish the JS implementation
Griefed · Feb 25, 2024 · 0e91321 · 0e91321
1 parent 168b666
commit 0e91321
Show file tree

Hide file tree

Showing 1,166 changed files with 1,850 additions and 4,936 deletions.
diff --git a/.github/workflows/github-prerelease.yml b/.github/workflows/github-prerelease.yml
@@ -65,7 +65,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" generateLicenseReport --info --full-stacktrace
-          ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" build media --info --full-stacktrace -x :serverpackcreator-api:jvmTest -x :serverpackcreator-web:test
+          ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" build media --info --full-stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-web:test
 
       # UPLOAD ARTIFACTS
       - uses: actions/upload-artifact@v4

diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml
@@ -63,7 +63,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" generateLicenseReport --info --full-stacktrace
-          ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" build media --info --full-stacktrace -x :serverpackcreator-api:jvmTest -x :serverpackcreator-web:test
+          ./gradlew -Pversion="${{ needs.preparations.outputs.version }}" build media --info --full-stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-web:test
 
       # UPLOAD ARTIFACTS
       - uses: actions/upload-artifact@v4

diff --git a/.gitignore b/.gitignore
@@ -377,12 +377,12 @@ serverpackcreator-app/src/main/resources/static
 serverpackcreator-api/main/resources/VERSION.txt
 serverpackcreator-api/tests/*
 !serverpackcreator-api/tests/.gitkeep
-serverpackcreator-api/src/jvmTest/resources/forge_tests_copy/
-serverpackcreator-api/src/jvmTest/resources/fabric_tests_copy/
-serverpackcreator-api/src/jvmTest/resources/legacyfabric_tests_copy/
-serverpackcreator-api/src/jvmTest/resources/quilt_tests_copy/
-serverpackcreator-api/src/jvmTest/resources/fabric_tests_server_pack.zip
-serverpackcreator-api/src/jvmTest/resources/forge_tests_server_pack.zip
-serverpackcreator-api/src/jvmTest/resources/quilt_tests_server_pack.zip
+serverpackcreator-api/src/test/resources/forge_tests_copy/
+serverpackcreator-api/src/test/resources/fabric_tests_copy/
+serverpackcreator-api/src/test/resources/legacyfabric_tests_copy/
+serverpackcreator-api/src/test/resources/quilt_tests_copy/
+serverpackcreator-api/src/test/resources/fabric_tests_server_pack.zip
+serverpackcreator-api/src/test/resources/forge_tests_server_pack.zip
+serverpackcreator-api/src/test/resources/quilt_tests_server_pack.zip
 
 /media/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -64,7 +64,7 @@ Build Test:
     expire_in: 1 week
     reports:
       junit:
-        - serverpackcreator-api/build/test-results/jvmTest/TEST-*.xml
+        - serverpackcreator-api/build/test-results/test/TEST-*.xml
   cache:
     - key: $CACHE_KEY
       policy: $POLICY
@@ -135,7 +135,7 @@ Build Release:
   script:
     - echo "**** Building ServerPackCreator ****"
     - "./gradlew generateLicenseReport -Pversion=${CI_COMMIT_TAG} --info --full-stacktrace"
-    - "./gradlew build -Pversion=${CI_COMMIT_TAG} --info --full-stacktrace -x :serverpackcreator-api:jvmTest -x :serverpackcreator-web:test"
+    - "./gradlew build -Pversion=${CI_COMMIT_TAG} --info --full-stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-web:test"
     - echo "**** Listing build directory ****"
     - LC_COLLATE=C ls -ahl --group-directories-first --color=auto */build
     - LC_COLLATE=C ls -ahl --group-directories-first --color=auto */build/*
@@ -180,7 +180,7 @@ Sign Java Publication:
     - chmod +x gradlew
   script:
     - echo "**** Publishing Maven Artifacts ****"
-    - "./gradlew dokkaJavadocJar signJvmPublication -Pversion=${CI_COMMIT_TAG} --info --stacktrace -x :serverpackcreator-api:jvmTest -x :serverpackcreator-web:test"
+    - "./gradlew dokkaJavadocJar signJvmPublication -Pversion=${CI_COMMIT_TAG} --info --stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-web:test"
   rules:
     - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+-beta\.\d+$/ && $CI_SERVER_HOST == "git.griefed.de"'
     - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+$/ && $CI_SERVER_HOST == "git.griefed.de"'
@@ -212,7 +212,7 @@ Publish GitHub:
       artifacts: true
   script:
     - echo "**** Publishing Maven Artifacts to GitHub ****"
-    - "./gradlew publishAllPublicationsToGitHubPackagesRepository -Pversion=${CI_COMMIT_TAG} --info --stacktrace -x :serverpackcreator-api:jvmTest -x :serverpackcreator-web:test"
+    - "./gradlew publishAllPublicationsToGitHubPackagesRepository -Pversion=${CI_COMMIT_TAG} --info --stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-web:test"
   rules:
     - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+-beta\.\d+$/ && $CI_SERVER_HOST == "git.griefed.de"'
     - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+$/ && $CI_SERVER_HOST == "git.griefed.de"'
@@ -244,7 +244,7 @@ Publish GitLab:
       artifacts: true
   script:
     - echo "**** Publishing Maven Artifacts to GitLab ****"
-    - "./gradlew publishAllPublicationsToGitLabRepository -Pversion=${CI_COMMIT_TAG} --info --stacktrace -x :serverpackcreator-api:jvmTest -x :serverpackcreator-web:test"
+    - "./gradlew publishAllPublicationsToGitLabRepository -Pversion=${CI_COMMIT_TAG} --info --stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-web:test"
   rules:
     - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+-beta\.\d+$/ && $CI_SERVER_HOST == "git.griefed.de"'
     - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+$/ && $CI_SERVER_HOST == "git.griefed.de"'
@@ -276,7 +276,7 @@ Publish GitGriefed:
       artifacts: true
   script:
     - echo "**** Publishing Maven Artifacts GitGriefed ****"
-    - "./gradlew publishAllPublicationsToGitGriefedRepository -Pversion=${CI_COMMIT_TAG} --info --stacktrace -x :serverpackcreator-api:jvmTest -x :serverpackcreator-web:test"
+    - "./gradlew publishAllPublicationsToGitGriefedRepository -Pversion=${CI_COMMIT_TAG} --info --stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-web:test"
   rules:
     - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+-beta\.\d+$/ && $CI_SERVER_HOST == "git.griefed.de"'
     - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+$/ && $CI_SERVER_HOST == "git.griefed.de"'
@@ -308,7 +308,7 @@ Publish OSSRH:
       artifacts: true
   script:
     - echo "**** Publishing Maven Artifacts to OSSRH ****"
-    - "./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -Pversion=${CI_COMMIT_TAG} --info --stacktrace -x :serverpackcreator-api:jvmTest -x :serverpackcreator-web:test"
+    - "./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -Pversion=${CI_COMMIT_TAG} --info --stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-web:test"
   rules:
     - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+-beta\.\d+$/ && $CI_SERVER_HOST == "git.griefed.de"'
     - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+$/ && $CI_SERVER_HOST == "git.griefed.de"'

diff --git a/.runConfigurations/Build All.run.xml b/.runConfigurations/Build All.run.xml
@@ -11,7 +11,6 @@
       <option name="taskNames">
         <list>
           <option value="clean" />
-          <option value="cleanAllTests" />
           <option value="build" />
         </list>
       </option>

diff --git a/.runConfigurations/Build without tests with version.run.xml b/.runConfigurations/Build without tests with version.run.xml
@@ -4,7 +4,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-Pversion=5.0.1 --info --full-stacktrace -x :serverpackcreator-api:jvmTest -x :serverpackcreator-web:test" />
+      <option name="scriptParameters" value="-Pversion=5.0.1 --info --full-stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-web:test" />
       <option name="taskDescriptions">
         <list />
       </option>

diff --git a/.runConfigurations/Build without tests.run.xml b/.runConfigurations/Build without tests.run.xml
@@ -4,14 +4,13 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="--info --full-stacktrace -x :serverpackcreator-api:jvmTest -x :serverpackcreator-web:test" />
+      <option name="scriptParameters" value="--info --full-stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-web:test" />
       <option name="taskDescriptions">
         <list />
       </option>
       <option name="taskNames">
         <list>
           <option value="clean" />
-          <option value="cleanAllTests" />
           <option value="build" />
         </list>
       </option>
@@ -20,6 +19,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
diff --git a/.runConfigurations/Clean.run.xml b/.runConfigurations/Clean.run.xml
@@ -11,7 +11,6 @@
       <option name="taskNames">
         <list>
           <option value="clean" />
-          <option value="cleanAllTests" />
         </list>
       </option>
       <option name="vmOptions" />

diff --git a/.runConfigurations/Debug Fat Jar.run.xml b/.runConfigurations/Debug Fat Jar.run.xml
@@ -5,7 +5,7 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$\serverpackcreator-app\tests" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <method v="2">
-      <option name="Gradle.BeforeRunTask" enabled="false" tasks="clean cleanAllTests build" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters=" --info --full-stacktrace -x :serverpackcreator-api:jvmTest -x :serverpackcreator-web:test" />
+      <option name="Gradle.BeforeRunTask" enabled="false" tasks="clean build" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters=" --info --full-stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-web:test" />
     </method>
   </configuration>
 </component>
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ RUN \
   dos2unix gradlew && chmod +x gradlew && \
   sh gradlew -Pversion="$VERSION" \
     build --info --full-stacktrace \
-    -x :serverpackcreator-api:jvmTest -x :serverpackcreator-web:test && \
+    -x :serverpackcreator-api:test -x :serverpackcreator-web:test && \
   wget -O zulu21.tar.gz https://cdn.azul.com/zulu/bin/zulu21.30.15-ca-jdk21.0.1-linux_x64.tar.gz && \
   tar -xvf zulu21.tar.gz -C /tmp/serverpackcreator/java --strip-components=1
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -73,7 +73,7 @@ licenseReport {
 }
 
 val appPlugins = File("serverpackcreator-app/tests/plugins")
-val apiPlugins = File("serverpackcreator-api/src/jvmTest/resources/testresources/plugins")
+val apiPlugins = File("serverpackcreator-api/src/test/resources/testresources/plugins")
 val kotlinPlugin =
     project.childProjects["serverpackcreator-plugin-example"]?.tasks?.jar?.get()?.archiveFile?.get()?.asFile?.toPath()
 val licenseReports = File("licenses")

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -21,10 +21,10 @@ FileInputStream(file("../gradle.properties")).use {
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${props.getProperty("kotlinVersion")}")
-    implementation("org.springframework.boot:spring-boot-gradle-plugin:3.2.0")
+    implementation("org.springframework.boot:spring-boot-gradle-plugin:3.2.1")
     implementation("io.spring.gradle:dependency-management-plugin:1.1.4")
-    implementation("org.jetbrains.kotlin:kotlin-allopen:1.9.10")
-    implementation("org.jetbrains.kotlin.plugin.jpa:org.jetbrains.kotlin.plugin.jpa.gradle.plugin:1.9.21")
+    implementation("org.jetbrains.kotlin:kotlin-allopen:1.9.22")
+    implementation("org.jetbrains.kotlin.plugin.jpa:org.jetbrains.kotlin.plugin.jpa.gradle.plugin:1.9.22")
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
     implementation("org.panteleyev:jpackage-gradle-plugin:1.5.2")
     implementation("com.github.jk1:gradle-license-report:2.5")

diff --git a/buildSrc/src/main/kotlin/serverpackcreator.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/serverpackcreator.java-conventions.gradle.kts
@@ -106,8 +106,6 @@ tasks.jar {
     manifest {
         attributes(
             mapOf(
-                "Implementation-Title" to project.name,
-                "Implementation-Version" to project.version,
                 "Built-By" to System.getProperty("user.name"),
                 "Build-Timestamp" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(Date()),
                 "Created-By" to "Gradle ${gradle.gradleVersion}",

diff --git a/buildSrc/src/main/kotlin/serverpackcreator.kotlin-multiplatform-conventions.gradle.kts b/buildSrc/src/main/kotlin/serverpackcreator.kotlin-multiplatform-conventions.gradle.kts
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -36,7 +36,7 @@ services:
       - SPC_CONFIGURATION_AIKAR=-Xms4G -Xmx4G -XX\:+UseG1GC -XX\:+ParallelRefProcEnabled -XX\:MaxGCPauseMillis\=200 -XX\:+UnlockExperimentalVMOptions -XX\:+DisableExplicitGC -XX\:+AlwaysPreTouch -XX\:G1NewSizePercent\=30 -XX\:G1MaxNewSizePercent\=40 -XX\:G1HeapRegionSize\=8M -XX\:G1ReservePercent\=20 -XX\:G1HeapWastePercent\=5 -XX\:G1MixedGCCountTarget\=4 -XX\:InitiatingHeapOccupancyPercent\=15 -XX\:G1MixedGCLiveThresholdPercent\=90 -XX\:G1RSetUpdatingPauseTimePercent\=5 -XX\:SurvivorRatio\=32 -XX\:+PerfDisableSharedMem -XX\:MaxTenuringThreshold\=1 -Dusing.aikars.flags\=https\://mcflags.emc.gs -Daikars.new.flags\=true
       - SPC_CONFIGURATION_DIRECTORIES_MUSTINCLUDE=addonpacks,blueprints,config,configs,customnpcs,defaultconfigs,global_data_packs,global_packs,kubejs,maps,mods,openloader,scripts,shrines-saves,structures,structurize,worldshape,Zoestria
       - SPC_CONFIGURATION_DIRECTORIES_SHOULDEXCLUDE=animation,asm,cache,changelogs,craftpresence,crash-reports,downloads,icons,libraries,local,logs,overrides,packmenu,profileImage,profileImage,resourcepacks,screenshots,server_pack,shaderpacks,simple-rpc,tv-cache
-      - SPC_CONFIGURATION_FALLBACK_UPDATEURL=https\://raw.githubusercontent.com/Griefed/ServerPackCreator/main/serverpackcreator-api/src/jvmMain/resources/serverpackcreator.properties
+      - SPC_CONFIGURATION_FALLBACK_UPDATEURL=https\://raw.githubusercontent.com/Griefed/ServerPackCreator/main/serverpackcreator-api/src/main/resources/serverpackcreator.properties
       - SPC_SERVERPACK_AUTODISCOVERY_ENABLED=true
       - SPC_SERVERPACK_AUTODISCOVERY_FILTER=START
       - SPC_SERVERPACK_ZIP_EXCLUDE=minecraft_server.MINECRAFT_VERSION.jar,server.jar,libraries/net/minecraft/server/MINECRAFT_VERSION/server-MINECRAFT_VERSION.jar

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       - SPC_CONFIGURATION_AIKAR=-Xms4G -Xmx4G -XX\:+UseG1GC -XX\:+ParallelRefProcEnabled -XX\:MaxGCPauseMillis\=200 -XX\:+UnlockExperimentalVMOptions -XX\:+DisableExplicitGC -XX\:+AlwaysPreTouch -XX\:G1NewSizePercent\=30 -XX\:G1MaxNewSizePercent\=40 -XX\:G1HeapRegionSize\=8M -XX\:G1ReservePercent\=20 -XX\:G1HeapWastePercent\=5 -XX\:G1MixedGCCountTarget\=4 -XX\:InitiatingHeapOccupancyPercent\=15 -XX\:G1MixedGCLiveThresholdPercent\=90 -XX\:G1RSetUpdatingPauseTimePercent\=5 -XX\:SurvivorRatio\=32 -XX\:+PerfDisableSharedMem -XX\:MaxTenuringThreshold\=1 -Dusing.aikars.flags\=https\://mcflags.emc.gs -Daikars.new.flags\=true #Keep an eye out for proper escaping!
       - SPC_CONFIGURATION_DIRECTORIES_MUSTINCLUDE=addonpacks,blueprints,config,configs,customnpcs,defaultconfigs,global_data_packs,global_packs,kubejs,maps,mods,openloader,scripts,shrines-saves,structures,structurize,worldshape,Zoestria
       - SPC_CONFIGURATION_DIRECTORIES_SHOULDEXCLUDE=animation,asm,cache,changelogs,craftpresence,crash-reports,downloads,icons,libraries,local,logs,overrides,packmenu,profileImage,profileImage,resourcepacks,screenshots,server_pack,shaderpacks,simple-rpc,tv-cache
-      - SPC_CONFIGURATION_FALLBACK_UPDATEURL=https\://raw.githubusercontent.com/Griefed/ServerPackCreator/main/serverpackcreator-api/src/jvmMain/resources/serverpackcreator.properties
+      - SPC_CONFIGURATION_FALLBACK_UPDATEURL=https\://raw.githubusercontent.com/Griefed/ServerPackCreator/main/serverpackcreator-api/src/main/resources/serverpackcreator.properties
       - SPC_SERVERPACK_AUTODISCOVERY_ENABLED=true
       - SPC_SERVERPACK_AUTODISCOVERY_FILTER=START
       - SPC_SERVERPACK_ZIP_EXCLUDE=minecraft_server.MINECRAFT_VERSION.jar,server.jar,libraries/net/minecraft/server/MINECRAFT_VERSION/server-MINECRAFT_VERSION.jar

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.caching=true
 kotlin.code.style=official
 kotlin.js.generate.executable.default=false
 kotlin.build.report.enable=true
-kotlinVersion=1.9.21
+kotlinVersion=1.9.22
 kotlinMajor=1.9
 jdkVersion=21