fix: mapping-io usages, no bundle

zlataovce · Dec 5, 2023 · a821d56 · a821d56
1 parent 746f66c
commit a821d56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,15 +18,14 @@ jobs:
           java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      - name: Publish web and bundle with Gradle
+      - name: Publish bundle with Gradle
         if: ${{ !contains(github.event.head_commit.message, 'no bundle') }}
-        run: ./gradlew publish buildWeb --no-daemon
+        run: ./gradlew publish
         env:
           REPO_USERNAME: ${{ secrets.REPO_USERNAME }}
           REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }}
       - name: Publish web with Gradle
-        if: ${{ contains(github.event.head_commit.message, 'no bundle') }}
-        run: ./gradlew buildWeb --no-daemon
+        run: ./gradlew buildWeb
         env:
           REPO_USERNAME: ${{ secrets.REPO_USERNAME }}
           REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ import me.kcra.takenaka.generator.web.buildWebConfig
 import me.kcra.takenaka.generator.web.modularClassSearchIndexOf
 import me.kcra.takenaka.generator.web.transformers.CSSInliningTransformer
 import me.kcra.takenaka.generator.web.transformers.MinifyingTransformer
-import net.fabricmc.mappingio.format.Tiny2Writer
+import net.fabricmc.mappingio.format.tiny.Tiny2FileWriter
 import net.fabricmc.mappingio.tree.MappingTree
 import kotlin.io.path.writeText
 import kotlin.io.path.writer
@@ -198,7 +198,7 @@ val resolveMappings by tasks.registering {
         val mappings = this.extra["mappings"] as MappingsMap
 
         mappings.forEach { (version, tree) ->
-            Tiny2Writer(bundleWorkspace["${version.id}.tiny"].writer(), false)
+            Tiny2FileWriter(bundleWorkspace["${version.id}.tiny"].writer(), false)
                 .use { w -> tree.accept(MissingDescriptorFilter(w)) }
         }
     }