Skip to content

Commit

Permalink
chore(deps): update all non-major dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] committed May 1, 2024
1 parent 1082dcc commit b69e1ab
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]')"
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions MappingTest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.66"
}

import dev.minco.mapping.GradleExtensions
Expand Down Expand Up @@ -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.20.6:intermediary"
ext.moduleMetadataAttrValue = ext.aValidAttrValueWhichCanBeTransformedToRequired
ext.setComponentMetadataRule = false
ext.attrDefaultValue = null
Expand Down Expand Up @@ -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.20.6+build.1: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.20.6:intermediary"
}
}
registerDefaultMappedConfiguration(project, "net.minecraft", "$yarn115:named")
Expand Down
26 changes: 13 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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.1"
id 'java-gradle-plugin'
id("dev.minco.gradle.defaults-plugin") version "0.2.62"
id("dev.minco.gradle.defaults-plugin") version "0.2.66"
}

sourceSets.main.java.srcDirs = files('src')
Expand Down Expand Up @@ -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.43.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.2'
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.32'
annotationProcessor 'org.projectlombok:lombok:1.18.32'
testCompileOnly 'org.projectlombok:lombok:1.18.32'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.32'

// 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.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
}

test {
Expand All @@ -64,10 +64,10 @@ allprojects {
resolutionStrategy {
failOnVersionConflict()

force('org.checkerframework:checker-qual:3.26.0')
force('org.checkerframework:checker-qual:3.43.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")
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit b69e1ab

Please sign in to comment.