diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index be24bfc9..62008dbf 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,48 +1,47 @@ -name: build +# Build Workflow + +name: Build with Gradle on: - push: - branches: '*' - paths-ignore: - - 'README.md' - - 'LICENSE' - - '.gitignore' pull_request: - branches: '*' - paths-ignore: - - 'README.md' - - 'LICENSE' - - '.gitignore' workflow_dispatch: + push: concurrency: - # Maximum of one running workflow per pull request source branch - # or branch and run number combination (cancels old run if action is rerun) group: ${{ github.head_ref || format('{0}-{1}', github.ref, github.run_number) }} cancel-in-progress: true jobs: build: - name: "Build" - runs-on: "ubuntu-latest" + name: Build - steps: - - uses: actions/checkout@v2 + runs-on: ubuntu-latest - - uses: gradle/wrapper-validation-action@v1 + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 10 - - uses: actions/setup-java@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - distribution: "temurin" - java-version: "17" + java-version: 21 + distribution: temurin - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-v2-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + **/loom-cache + **/prebundled-jars + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: | - ${{ runner.os }}-gradle-v2- - - run: chmod +x ./gradlew - - run: ./gradlew --no-daemon build + ${{ runner.os }}-gradle- + + - name: Chmod Gradle + run: chmod +x ./gradlew + + - name: Build + run: ./gradlew build --no-daemon \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 0499e591..686c96ad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,8 +18,8 @@ plugins { toolkitLoomHelper { useOneConfig { - version = "1.0.0-alpha.47" - loaderVersion = "1.1.0-alpha.34" + version = "1.0.0-alpha.49" + loaderVersion = "1.1.0-alpha.35" usePolyMixin = true polyMixinVersion = "0.8.4+build.2" diff --git a/root.gradle.kts b/root.gradle.kts index 974377c4..c5481690 100644 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -13,4 +13,6 @@ preprocess { "1.8.9-forge"(10809, "srg") { "1.8.9-fabric"(10809, "yarn") } + + strictExtraMappings.set(true) }