utopia-rise · CedNaru · Apr 8, 2025 · Apr 6, 2025
diff --git a/.github/workflows/assemble_linux.yml b/.github/workflows/assemble_linux.yml
@@ -35,12 +35,6 @@ jobs:
           name: editor_${{ matrix.target }}_linux_${{ matrix.arch }}
           path: godot-kotlin-jvm_editor_linuxbsd_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}
 
-      - name: Download ${{ matrix.target }} bootstrap jar
-        uses: actions/download-artifact@v4
-        with:
-          name: jvm_godot-bootstrap_${{ matrix.target }}
-          path: godot-kotlin-jvm_editor_linuxbsd_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}
-
       - name: Create linux editor zip
         run: |
           cd godot-kotlin-jvm_editor_linuxbsd_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}

diff --git a/.github/workflows/assemble_macos.yml b/.github/workflows/assemble_macos.yml
@@ -89,20 +89,12 @@ jobs:
           name: editor_${{ matrix.target }}_macos_universal
           path: .
 
-      - name: Download ${{ matrix.target }} bootstrap jar
-        uses: actions/download-artifact@v4
-        with:
-          name: jvm_godot-bootstrap_${{ matrix.target }}
-          path: .
-
       - name: Create MacOs editor app
         run: |
           cp -r misc/dist/macos_tools.app ./Godot.app
           mkdir -p Godot.app/Contents/MacOS
           cp godot.macos.editor.${{ matrix.target }}.universal Godot.app/Contents/MacOS/Godot
           chmod +x Godot.app/Contents/MacOS/Godot
-          cp godot-bootstrap.jar Godot.app/Contents/MacOS/
-          chmod +x Godot.app/Contents/MacOS/godot-bootstrap.jar
           zip -q -9 -r godot-kotlin-jvm_editor_macos_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}.zip Godot.app
         shell: bash
 

diff --git a/.github/workflows/assemble_windows.yml b/.github/workflows/assemble_windows.yml
@@ -36,12 +36,6 @@ jobs:
           name: editor_${{ matrix.target }}_windows_${{ matrix.arch }}
           path: godot-kotlin-jvm_editor_windows_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}
 
-      - name: Download ${{ matrix.target }} bootstrap jar
-        uses: actions/download-artifact@v4
-        with:
-          name: jvm_godot-bootstrap_${{ matrix.target }}
-          path: godot-kotlin-jvm_editor_windows_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}
-
       - name: Create windows editor zip
         run: |
           cd godot-kotlin-jvm_editor_windows_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}

diff --git a/.github/workflows/build_jvm.yml b/.github/workflows/build_jvm.yml
@@ -40,7 +40,6 @@ jobs:
           cache-cleanup: always
 
       - name: Compilation
-        # we build the release bootstrap jar here. Debug gets its own trigger later
         run: |
           kt/gradlew -p kt/ build -Prelease buildPlugin
 
@@ -50,12 +49,6 @@ jobs:
           name: jvm_api-generator
           path: kt/api-generator/build/libs/api-generator.jar
 
-      - name: Upload release bootstrap artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: jvm_godot-bootstrap_release
-          path: kt/godot-library/build/libs/godot-bootstrap.jar
-
       - name: Upload entry-generator artifact
         uses: actions/upload-artifact@v4
         with:
@@ -92,16 +85,6 @@ jobs:
           name: jvm_tools-common
           path: kt/tools-common/build/libs/tools-common-*.jar
 
-      - name: Bootstrap debug compilation
-        run: |
-          kt/gradlew -p kt/ build -Pdebug
-
-      - name: Upload debug bootstrap artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: jvm_godot-bootstrap_debug
-          path: kt/godot-library/build/libs/godot-bootstrap.jar
-
       - name: Verify ide plugin
         run: |
           kt/gradlew -p kt/ verifyPlugin
diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml
@@ -22,10 +22,10 @@ jobs:
         include:
           - name: dev tests
             target: dev
-            bootstrap-target: debug
+            jvm-target: debug
           - name: release tests
             target: release
-            bootstrap-target: release
+            jvm-target: release
 
     steps:
       - name: Clone Godot JVM module.
@@ -47,15 +47,9 @@ jobs:
           name: editor_${{ matrix.target }}_linux_x86_64
           path: './harness/tests/bin'
 
-      - name: Download godot-bootstrap ${{ matrix.bootstrap-target }}
-        uses: actions/download-artifact@v4
-        with:
-          name: jvm_godot-bootstrap_${{ matrix.bootstrap-target }}
-          path: './harness/tests/bin'
-
       - name: Build tests project
         run: |
-          harness/tests/gradlew -p harness/tests/ build -P${{ matrix.bootstrap-target }}
+          harness/tests/gradlew -p harness/tests/ build -P${{ matrix.jvm-target }}
 
       - name: Run Tests
         run: |

diff --git a/.github/workflows/test_linux_exports.yml b/.github/workflows/test_linux_exports.yml
@@ -22,10 +22,10 @@ jobs:
         include:
           - name: dev tests
             target: dev
-            bootstrap-target: debug
+            jvm-target: debug
           - name: release tests
             target: release
-            bootstrap-target: release
+            jvm-target: release
 
     steps:
       - name: Clone Godot JVM module.
@@ -47,42 +47,36 @@ jobs:
           name: editor_${{ matrix.target }}_linux_x86_64
           path: './harness/tests/bin'
 
-      - name: Download godot-bootstrap ${{ matrix.bootstrap-target }}
+      - name: Download linux x86_64 ${{ matrix.jvm-target }} export template
         uses: actions/download-artifact@v4
         with:
-          name: jvm_godot-bootstrap_${{ matrix.bootstrap-target }}
-          path: './harness/tests/bin'
-
-      - name: Download linux x86_64 ${{ matrix.bootstrap-target }} export template
-        uses: actions/download-artifact@v4
-        with:
-          name: export_template_${{ matrix.bootstrap-target }}_linux_x86_64
+          name: export_template_${{ matrix.jvm-target }}_linux_x86_64
           path: "./"
 
       - name: Prepare export
         run: |
           chmod +x harness/tests/bin/godot.*
           mkdir -p harness/tests/export
-          mv godot.linuxbsd.template_${{ matrix.bootstrap-target }}.x86_64.jvm.${{ inputs.build-version }} harness/tests/godot.linuxbsd.template_${{ matrix.bootstrap-target }}.x86_64
+          mv godot.linuxbsd.template_${{ matrix.jvm-target }}.x86_64.jvm.${{ inputs.build-version }} harness/tests/godot.linuxbsd.template_${{ matrix.jvm-target }}.x86_64
 
       - name: Build tests project
         run: |
-          harness/tests/gradlew -p harness/tests/ build -P${{ matrix.bootstrap-target }}
+          harness/tests/gradlew -p harness/tests/ build -P${{ matrix.jvm-target }}
 
       - name: Create JRE
         run: |
           cd harness/tests/
           jlink --add-modules java.base,java.logging --output jvm/jre-amd64-linux
 
       - name: Export tests debug
-        if: ${{ matrix.bootstrap-target == 'debug' }}
+        if: ${{ matrix.jvm-target == 'debug' }}
         run: |
           cd harness/tests/
           ./gradlew exportDebug
         timeout-minutes: 30
 
       - name: Export tests release
-        if: ${{ matrix.bootstrap-target == 'release' }}
+        if: ${{ matrix.jvm-target == 'release' }}
         run: |
           cd harness/tests/
           ./gradlew exportRelease

diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml
@@ -22,10 +22,10 @@ jobs:
         include:
           - name: dev tests
             target: dev
-            bootstrap-target: debug
+            jvm-target: debug
           - name: release tests
             target: release
-            bootstrap-target: release
+            jvm-target: release
 
     steps:
       - name: Clone Godot JVM module.
@@ -47,15 +47,9 @@ jobs:
           name: editor_${{ matrix.target }}_macos_universal
           path: './harness/tests/bin'
 
-      - name: Download godot-bootstrap ${{ matrix.bootstrap-target }}
-        uses: actions/download-artifact@v4
-        with:
-          name: jvm_godot-bootstrap_${{ matrix.bootstrap-target }}
-          path: './harness/tests/bin'
-
       - name: Build tests project
         run: |
-          harness/tests/gradlew -p harness/tests/ build -P${{ matrix.bootstrap-target }}
+          harness/tests/gradlew -p harness/tests/ build -P${{ matrix.jvm-target }}
 
       - name: Run Tests
         run: |

diff --git a/.github/workflows/test_macos_exports.yml b/.github/workflows/test_macos_exports.yml
@@ -22,10 +22,10 @@ jobs:
         include:
           - name: dev tests
             target: dev
-            bootstrap-target: debug
+            jvm-target: debug
           - name: release tests
             target: release
-            bootstrap-target: release
+            jvm-target: release
 
     steps:
       - name: Clone Godot JVM module.
@@ -47,12 +47,6 @@ jobs:
           name: editor_${{ matrix.target }}_macos_universal
           path: './harness/tests/bin'
 
-      - name: Download godot-bootstrap ${{ matrix.bootstrap-target }}
-        uses: actions/download-artifact@v4
-        with:
-          name: jvm_godot-bootstrap_${{ matrix.bootstrap-target }}
-          path: './harness/tests/bin'
-
       - name: Download macos export template
         uses: actions/download-artifact@v4
         with:
@@ -67,7 +61,7 @@ jobs:
 
       - name: Build tests project
         run: |
-          harness/tests/gradlew -p harness/tests/ build -P${{ matrix.bootstrap-target }}
+          harness/tests/gradlew -p harness/tests/ build -P${{ matrix.jvm-target }}
 
       - name: Create JRE
         run: |
@@ -76,14 +70,14 @@ jobs:
           mkdir jvm/jre-amd64-macos #create a fake jre dir for amd64 so the export is happy. The test will run on arm anyways
 
       - name: Export tests debug
-        if: ${{ matrix.bootstrap-target == 'debug' }}
+        if: ${{ matrix.jvm-target == 'debug' }}
         run: |
           cd harness/tests/
           ./gradlew exportDebug
         timeout-minutes: 30
 
       - name: Export tests release
-        if: ${{ matrix.bootstrap-target == 'release' }}
+        if: ${{ matrix.jvm-target == 'release' }}
         run: |
           cd harness/tests/
           ./gradlew exportRelease

diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml
@@ -22,10 +22,10 @@ jobs:
         include:
           - name: dev tests
             target: dev
-            bootstrap-target: debug
+            jvm-target: debug
           - name: release tests
             target: release
-            bootstrap-target: release
+            jvm-target: release
 
     steps:
       - name: Clone Godot JVM module.
@@ -47,15 +47,9 @@ jobs:
           name: editor_${{ matrix.target }}_windows_x86_64
           path: './harness/tests/bin'
 
-      - name: Download godot-bootstrap ${{ matrix.bootstrap-target }}
-        uses: actions/download-artifact@v4
-        with:
-          name: jvm_godot-bootstrap_${{ matrix.bootstrap-target }}
-          path: './harness/tests/bin'
-
       - name: Build tests project
         run: |
-          harness/tests/gradlew -p harness/tests/ build -P${{ matrix.bootstrap-target }}
+          harness/tests/gradlew -p harness/tests/ build -P${{ matrix.jvm-target }}
 
       - name: Run Tests
         run: |

diff --git a/.github/workflows/test_windows_exports.yml b/.github/workflows/test_windows_exports.yml
@@ -22,10 +22,10 @@ jobs:
         include:
           - name: dev tests
             target: dev
-            bootstrap-target: debug
+            jvm-target: debug
           - name: release tests
             target: release
-            bootstrap-target: release
+            jvm-target: release
 
     steps:
       - name: Clone Godot JVM module.
@@ -47,41 +47,35 @@ jobs:
           name: editor_${{ matrix.target }}_windows_x86_64
           path: './harness/tests/bin'
 
-      - name: Download godot-bootstrap ${{ matrix.bootstrap-target }}
+      - name: Download windows x86_64 ${{ matrix.jvm-target }} export template
         uses: actions/download-artifact@v4
         with:
-          name: jvm_godot-bootstrap_${{ matrix.bootstrap-target }}
-          path: './harness/tests/bin'
-
-      - name: Download windows x86_64 ${{ matrix.bootstrap-target }} export template
-        uses: actions/download-artifact@v4
-        with:
-          name: export_template_${{ matrix.bootstrap-target }}_windows_x86_64
+          name: export_template_${{ matrix.jvm-target }}_windows_x86_64
           path: "./"
 
       - name: Prepare export
         run: |
           mkdir -p harness/tests/export
-          mv godot.windows.template_${{ matrix.bootstrap-target }}.x86_64.jvm.${{ inputs.build-version }}.exe harness/tests/godot.windows.template_${{ matrix.bootstrap-target }}.x86_64.exe
+          mv godot.windows.template_${{ matrix.jvm-target }}.x86_64.jvm.${{ inputs.build-version }}.exe harness/tests/godot.windows.template_${{ matrix.jvm-target }}.x86_64.exe
 
       - name: Build tests project
         run: |
-          harness/tests/gradlew -p harness/tests/ build -P${{ matrix.bootstrap-target }}
+          harness/tests/gradlew -p harness/tests/ build -P${{ matrix.jvm-target }}
 
       - name: Create JRE
         run: |
           cd harness/tests/
           jlink --add-modules java.base,java.logging --output jvm/jre-amd64-windows
 
       - name: Export tests debug
-        if: ${{ matrix.bootstrap-target == 'debug' }}
+        if: ${{ matrix.jvm-target == 'debug' }}
         run: |
           cd harness/tests/
           ./gradlew exportDebug
         timeout-minutes: 30
 
       - name: Export tests release
-        if: ${{ matrix.bootstrap-target == 'release' }}
+        if: ${{ matrix.jvm-target == 'release' }}
         run: |
           cd harness/tests/
           ./gradlew exportRelease

diff --git a/kt/build.gradle.kts b/kt/build.gradle.kts
@@ -135,13 +135,13 @@ tasks {
     @Suppress("UNUSED_VARIABLE")
     val buildAndRunEngineDebug by registering {
         group = "godot-kotlin-jvm"
-        dependsOn(buildEngineDebug, getTasksByName("copyBootstrapJar", true).first())
+        dependsOn(buildEngineDebug)
         finalizedBy(runEngineDebug)
     }
     @Suppress("UNUSED_VARIABLE")
     val buildAndRunEngineReleaseDebug by registering {
         group = "godot-kotlin-jvm"
-        dependsOn(buildEngineReleaseDebug, getTasksByName("copyBootstrapJar", true).first())
+        dependsOn(buildEngineReleaseDebug)
         finalizedBy(runEngineReleaseDebug)
     }
 }
diff --git a/kt/godot-library/build.gradle.kts b/kt/godot-library/build.gradle.kts
@@ -56,32 +56,6 @@ tasks {
     withType<Jar> {
         dependsOn(generateAPI)
     }
-
-    @Suppress("UNUSED_VARIABLE")
-    val jar by getting {
-        outputs.upToDateWhen {
-            // force this to always run. So we ensure that the bootstrap jar in the godot bin dir is always up to date
-            // only relevant for local testing
-            false
-        }
-        finalizedBy(shadowJar)
-    }
-    build.get().finalizedBy(shadowJar)
-
-    val copyBootstrapJar by registering(Copy::class) {
-        group = "godot-jvm"
-        from(shadowJar)
-        destinationDir = File("${projectDir.absolutePath}/../../../../bin/")
-        dependsOn(shadowJar)
-    }
-
-    withType<ShadowJar> {
-        archiveBaseName.set("godot-bootstrap")
-        archiveVersion.set("")
-        archiveClassifier.set("")
-        exclude("**/module-info.class") //for android support: excludes java 9+ module info which cannot be parsed by the dx tool
-        finalizedBy(copyBootstrapJar)
-    }
 }
 
 val targetSuffix = if (isRelease) "release" else "debug"