diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dad093b..980e36c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: verify-gradle-wrapper: runs-on: ubuntu-latest steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 build: @@ -22,8 +22,8 @@ jobs: matrix: jdk: [11, 15] steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 with: path: | ~/.gradle/caches @@ -32,7 +32,7 @@ jobs: restore-keys: | ${{ runner.os }}-jdk-${{ matrix.jdk }}-gradlewrapper-${{ hashFiles('**/gradle-wrapper.properties') }}-gradlescripts- - name: Set up JDK - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2 + uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0 with: distribution: adopt java-version: ${{ matrix.jdk }} diff --git a/MappingTest/build.gradle b/MappingTest/build.gradle index c73bbbf..b2a990d 100644 --- a/MappingTest/build.gradle +++ b/MappingTest/build.gradle @@ -16,7 +16,7 @@ plugins { id 'maven-publish' //id 'org.minimallycorrect.mixin.gradle-plugin' version '0.0.6-SNAPSHOT' id 'dev.minco.mapping' version '0.0.1-SNAPSHOT' - id("dev.minco.gradle.defaults-plugin") version "0.2.67" + id("dev.minco.gradle.defaults-plugin") version "0.2.80" } import dev.minco.mapping.GradleExtensions @@ -58,7 +58,7 @@ repositories { } def mcMappedAttribute = mapping.getMappingArtifactForTarget("net.minecraft") -ext.aValidAttrValueWhichCanBeTransformedToRequired = "net.fabricmc:intermediary:1.21.1:intermediary" +ext.aValidAttrValueWhichCanBeTransformedToRequired = "net.fabricmc:intermediary:1.21.2-pre3:intermediary" ext.moduleMetadataAttrValue = ext.aValidAttrValueWhichCanBeTransformedToRequired ext.setComponentMetadataRule = false ext.attrDefaultValue = null @@ -96,12 +96,12 @@ System.err.println("default attr value overridden: " + ext.attrDefaultValue) System.err.println("This build is expected to fail with the error \"TODO: Actually transform.\". If build succeeds, transforms weren't ran as expected.\n") mapping { - def yarn115 = "net.fabricmc:yarn:1.21.1+build.3:v2" + def yarn115 = "net.fabricmc:yarn:1.21.2-pre3+build.4:v2" registerMapping(project, "net.minecraft", "net.fabricmc:intermediary:1.15.2") registerMapping(project, "net.minecraft", yarn115) registerNamespaceTranslator { if (it == "$yarn115:intermediary") { - return "net.fabricmc:intermediary:1.21.1:intermediary" + return "net.fabricmc:intermediary:1.21.2-pre3:intermediary" } } registerDefaultMappedConfiguration(project, "net.minecraft", "$yarn115:named") diff --git a/build.gradle b/build.gradle index cc89020..e0af55a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ plugins { id 'java-library' id 'maven-publish' - id "com.gradle.plugin-publish" version "1.2.2" + id "com.gradle.plugin-publish" version "1.3.0" id 'java-gradle-plugin' - id("dev.minco.gradle.defaults-plugin") version "0.2.67" + id("dev.minco.gradle.defaults-plugin") version "0.2.80" } sourceSets.main.java.srcDirs = files('src') @@ -32,13 +32,13 @@ repositories { dependencies { compileOnly "org.jetbrains:annotations:24.1.0" - compileOnly "org.checkerframework:checker-qual:3.47.0" + compileOnly "org.checkerframework:checker-qual:3.48.1" testImplementation "junit:junit:4.13.2" // TODO: actually test Mixin at the same time //api 'org.minimallycorrect.mixin:Mixin:0.0.6' implementation 'net.fabricmc:tiny-remapper:0.10.4' implementation 'net.fabricmc:tiny-mappings-parser:0.3.0+build.17' - implementation 'com.google.guava:guava:33.3.0-jre' + implementation 'com.google.guava:guava:33.3.1-jre' compileOnly 'org.projectlombok:lombok:1.18.34' annotationProcessor 'org.projectlombok:lombok:1.18.34' @@ -46,8 +46,8 @@ dependencies { testAnnotationProcessor 'org.projectlombok:lombok:1.18.34' // https://junit.org/junit5/docs/current/user-guide/#running-tests-build - testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.0") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.2") } test { @@ -64,10 +64,10 @@ allprojects { resolutionStrategy { failOnVersionConflict() - force('org.checkerframework:checker-qual:3.47.0') - force('com.google.guava:guava:33.3.0-jre') + force('org.checkerframework:checker-qual:3.48.1') + force('com.google.guava:guava:33.3.1-jre') force('com.google.code.findbugs:jsr305:3.0.2') - def asmVer = '9.7' + def asmVer = '9.7.1' force("org.ow2.asm:asm:$asmVer") force("org.ow2.asm:asm-tree:$asmVer") force("org.ow2.asm:asm-analysis:$asmVer")