diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8bbc72c..f60407f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,8 +12,8 @@ jobs: verify-gradle-wrapper: runs-on: ubuntu-latest steps: - - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0 - - uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # tag=v1.0.5 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0 build: if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')" @@ -22,8 +22,8 @@ jobs: matrix: jdk: [11, 15] steps: - - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0 - - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # tag=v3.0.11 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 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@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3.6.0 + uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0 with: distribution: adopt java-version: ${{ matrix.jdk }} diff --git a/MappingTest/build.gradle b/MappingTest/build.gradle index 9a47166..c73bbbf 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.62" + id("dev.minco.gradle.defaults-plugin") version "0.2.67" } import dev.minco.mapping.GradleExtensions @@ -58,7 +58,7 @@ repositories { } def mcMappedAttribute = mapping.getMappingArtifactForTarget("net.minecraft") -ext.aValidAttrValueWhichCanBeTransformedToRequired = "net.fabricmc:intermediary:1.15.2:intermediary" +ext.aValidAttrValueWhichCanBeTransformedToRequired = "net.fabricmc:intermediary:1.21.1: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.15.2+build.9:v2" + def yarn115 = "net.fabricmc:yarn:1.21.1+build.3: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.15.2:intermediary" + return "net.fabricmc:intermediary:1.21.1:intermediary" } } registerDefaultMappedConfiguration(project, "net.minecraft", "$yarn115:named") diff --git a/build.gradle b/build.gradle index 0c0f213..617b276 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.0.0" + id "com.gradle.plugin-publish" version "1.2.2" id 'java-gradle-plugin' - id("dev.minco.gradle.defaults-plugin") version "0.2.62" + id("dev.minco.gradle.defaults-plugin") version "0.2.67" } sourceSets.main.java.srcDirs = files('src') @@ -31,23 +31,23 @@ repositories { } dependencies { - compileOnly "org.jetbrains:annotations:23.0.0" - compileOnly "org.checkerframework:checker-qual:3.26.0" + compileOnly "org.jetbrains:annotations:23.1.0" + compileOnly "org.checkerframework:checker-qual:3.47.0" 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.8.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:31.1-jre' - compileOnly 'org.projectlombok:lombok:1.18.24' - annotationProcessor 'org.projectlombok:lombok:1.18.24' - testCompileOnly 'org.projectlombok:lombok:1.18.24' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.24' + compileOnly 'org.projectlombok:lombok:1.18.34' + annotationProcessor 'org.projectlombok:lombok:1.18.34' + testCompileOnly 'org.projectlombok:lombok:1.18.34' + 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.9.1") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.0") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.0") } test { @@ -64,10 +64,10 @@ allprojects { resolutionStrategy { failOnVersionConflict() - force('org.checkerframework:checker-qual:3.26.0') + force('org.checkerframework:checker-qual:3.47.0') force('com.google.guava:guava:31.1-jre') force('com.google.code.findbugs:jsr305:3.0.2') - def asmVer = '9.4' + def asmVer = '9.7' force("org.ow2.asm:asm:$asmVer") force("org.ow2.asm:asm-tree:$asmVer") force("org.ow2.asm:asm-analysis:$asmVer") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..3994438 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists