Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gradle and other misc deps #949

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,33 @@ jobs:
strategy:
matrix:
java: [17-jdk, 21-jdk]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
container:
image: eclipse-temurin:${{ matrix.java }}
options: --user root
steps:
- uses: actions/checkout@v4
- run: ./gradlew build publishToMavenLocal --stacktrace --warning-mode fail
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Artifacts
name: Artifacts ${{ matrix.java }}
path: build/libs/

client_test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
with:
distribution: 'microsoft'
java-version: '17'
java-version: '21'
- name: Run Auto test Client
uses: modmuss50/xvfb-action@v1
with:
run: ./gradlew :minecraft:minecraft-test:runProductionAutoTestClient --stacktrace --warning-mode=fail
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: Client Test Screenshots
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manage_issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
labels:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: FabricMC/fabric-action-scripts@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ permissions:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
container:
image: eclipse-temurin:17-jdk
image: eclipse-temurin:21-jdk
options: --user root
steps:
- run: apt update && apt install git -y && git --version
Expand Down
17 changes: 10 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.slf4j.LoggerFactory
buildscript {
dependencies {
classpath 'org.kohsuke:github-api:1.135'
classpath 'com.guardsquare:proguard-gradle:' + (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11) ? '7.4.0-beta02' : '7.1.0')
classpath 'com.guardsquare:proguard-gradle:7.5.0'
}
}

Expand All @@ -15,8 +15,8 @@ plugins {
id 'maven-publish'
id 'checkstyle'
id 'com.diffplug.spotless' version "6.22.0"
id 'fabric-loom' version '1.4-SNAPSHOT' apply false
id 'com.github.johnrengelman.shadow' version '8.1.1'
id 'fabric-loom' version '1.7-SNAPSHOT' apply false
id 'io.github.goooler.shadow' version '8.1.8'
id 'me.modmuss50.remotesign' version "0.4.0"
}

Expand Down Expand Up @@ -113,7 +113,7 @@ dependencies {
include 'org.ow2.sat4j:org.ow2.sat4j.pb:2.3.6'
include "net.fabricmc:tiny-remapper:0.10.1"
include "net.fabricmc:access-widener:2.1.0"
include ('net.fabricmc:mapping-io:0.5.0') {
include ('net.fabricmc:mapping-io:0.6.1') {
// Mapping-io depends on ASM, dont bundle
transitive = false
}
Expand All @@ -123,10 +123,10 @@ dependencies {
testCompileOnly 'org.jetbrains:annotations:23.0.0'

// Unit testing for mod metadata
testImplementation('org.junit.jupiter:junit-jupiter:5.9.2')
testImplementation('org.junit.jupiter:junit-jupiter:5.10.3')
testRuntimeOnly('org.junit.platform:junit-platform-launcher')

testImplementation("org.mockito:mockito-core:5.10.0")
testImplementation("org.mockito:mockito-core:5.12.0")
}

apply from: rootProject.file('gradle/installer-json.gradle')
Expand Down Expand Up @@ -233,7 +233,10 @@ task proguardJar(type: ProGuardTask, dependsOn: fatJar) {
}
}

libraryjars JavaVersion.current().java9Compatible ? "${System.getProperty('java.home')}/jmods" : "${System.getProperty('java.home')}/lib/rt.jar"
def java8 = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(8)
}.get()
libraryjars java8.metadata.installationPath.file("jre/lib/rt.jar")

injars fatJar.archiveFile
outjars proguardFile
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion junit/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repositories {
dependencies {
api project(":")

api platform("org.junit:junit-bom:5.10.0")
api platform("org.junit:junit-bom:5.10.3")
api "org.junit.jupiter:junit-jupiter-engine"
implementation "org.junit.platform:junit-platform-launcher"
}
Expand Down
Loading