Skip to content

Commit 13cc836

Browse files
authored
Bump dependencies, downgrade to ornithe-gen1 (#297)
2 parents ff0b172 + 82396fc commit 13cc836

11 files changed

Lines changed: 45 additions & 55 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ jobs:
99
build:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
13-
- name: Set up JDK 23 for x64
14-
uses: actions/setup-java@v4
12+
- uses: actions/checkout@v6
13+
- name: Set up JDK 25 for x64
14+
uses: actions/setup-java@v5
1515
with:
16-
java-version: '23'
16+
java-version: '25'
1717
distribution: 'temurin'
1818
architecture: x64
1919
- name: Setup Gradle
20-
uses: gradle/actions/setup-gradle@v4
20+
uses: gradle/actions/setup-gradle@v6
2121
with:
22-
gradle-version: 9.3.1
22+
gradle-version: 9.5.1
2323
- name: Build TASmod with Gradle
2424
run: gradle build
2525
- name: Upload Test Report
26-
uses: actions/upload-artifact@v4
26+
uses: actions/upload-artifact@v7
2727
if: ${{ !cancelled() }}
2828
with:
2929
name: TestResult
3030
path: build/test-results/test/*.xml
3131
- name: Upload TASmod-Dev-Build
32-
uses: actions/upload-artifact@v4
32+
uses: actions/upload-artifact@v7
3333
with:
3434
name: TASmod-Dev-Build
3535
path: build/libs

.github/workflows/buildandupload.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ jobs:
1515
runs-on: ubuntu-latest
1616
if: github.repository == 'MinecraftTAS/TASmod'
1717
steps:
18-
- uses: actions/checkout@v4
19-
- name: Set up JDK 23 for x64
20-
uses: actions/setup-java@v4
18+
- uses: actions/checkout@v6
19+
- name: Set up JDK 25 for x64
20+
uses: actions/setup-java@v5
2121
with:
22-
java-version: '23'
22+
java-version: '25'
2323
distribution: 'temurin'
2424
architecture: x64
2525
- name: Setup Gradle
26-
uses: gradle/actions/setup-gradle@v4
26+
uses: gradle/actions/setup-gradle@v6
2727
with:
28-
gradle-version: 9.3.1
28+
gradle-version: 9.5.1
2929
- name: Build TASmod with Gradle
3030
run: gradle build
3131
- name: Upload artifact
32-
uses: actions/upload-artifact@v4
32+
uses: actions/upload-artifact@v7
3333
with:
3434
name: TASmod-Dev-Build
3535
path: build/libs

.github/workflows/check_formatting.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ jobs:
99
check:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
13-
- name: Set up JDK 23 for x64
14-
uses: actions/setup-java@v4
12+
- uses: actions/checkout@v6
13+
- name: Set up JDK 25 for x64
14+
uses: actions/setup-java@v5
1515
with:
16-
java-version: '23'
16+
java-version: '25'
1717
distribution: 'temurin'
1818
architecture: x64
1919
- name: Setup Gradle
20-
uses: gradle/actions/setup-gradle@v4
20+
uses: gradle/actions/setup-gradle@v6
2121
with:
22-
gradle-version: 9.3.1
22+
gradle-version: 9.5.1
2323
- name: Spotless Check
2424
run: gradle spotlessCheck

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ jobs:
77
runs-on: ubuntu-latest
88
if: github.repository == 'MinecraftTAS/TASmod'
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v6
1111
- name: Setup Java
12-
uses: actions/setup-java@v4
12+
uses: actions/setup-java@v5
1313
with:
14-
java-version: '23'
14+
java-version: '25'
1515
distribution: 'temurin'
1616
architecture: x64
1717
- name: Setup Gradle
18-
uses: gradle/actions/setup-gradle@v4
18+
uses: gradle/actions/setup-gradle@v6
1919
with:
20-
gradle-version: 9.3.1
20+
gradle-version: 9.5.1
2121
- name: Setup workspace
2222
run: gradle build -Prelease=true
2323
- name: Upload assets
24-
uses: softprops/action-gh-release@v2
24+
uses: softprops/action-gh-release@v3
2525
with:
2626
files: 'build/libs/!(-@(dev|sources|javadoc|all)).jar'
2727
- name: Publish 1.12.2

.github/workflows/test_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
report:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: dorny/test-reporter@v2
15+
- uses: dorny/test-reporter@v3
1616
with:
1717
artifact: TestResult
1818
name: TASmod Tests

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ loom {
3333
repositories {
3434
mavenCentral()
3535
maven { url = "https://maven.minecrafttas.com/main" }
36-
maven { url = "https://maven.legacyfabric.net/" }
3736
//maven { url = "https://maven.minecrafttas.com/snapshots" }
3837
maven { url = "https://jitpack.io" }
3938
maven { url = "https://repo.spongepowered.org/maven" }
@@ -46,7 +45,7 @@ configurations {
4645
}
4746

4847
ploceus {
49-
setIntermediaryGeneration(2)
48+
setIntermediaryGeneration(1)
5049
}
5150

5251
// dependencies

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx3G
33

44
# Fabric properties
55
minecraft_version=1.12.2
6-
loader_version=0.18.4
7-
loom_version=1.15-SNAPSHOT
6+
loader_version=0.19.3
7+
loom_version=1.17-SNAPSHOT
88
mcp_channel=stable
99
mcp_build=39
1010
mcp_mcversion=1.12

gradle/wrapper/gradle-wrapper.jar

2.23 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
44
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
57
validateDistributionUrl=true
68
zipStoreBase=GRADLE_USER_HOME
79
zipStorePath=wrapper/dists

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)