Skip to content
Merged
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
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 23 for x64
uses: actions/setup-java@v4
- uses: actions/checkout@v6
- name: Set up JDK 25 for x64
uses: actions/setup-java@v5
with:
java-version: '23'
java-version: '25'
distribution: 'temurin'
architecture: x64
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v6
with:
gradle-version: 9.3.1
gradle-version: 9.5.1
- name: Build TASmod with Gradle
run: gradle build
- name: Upload Test Report
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
if: ${{ !cancelled() }}
with:
name: TestResult
path: build/test-results/test/*.xml
- name: Upload TASmod-Dev-Build
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: TASmod-Dev-Build
path: build/libs
14 changes: 7 additions & 7 deletions .github/workflows/buildandupload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'MinecraftTAS/TASmod'
steps:
- uses: actions/checkout@v4
- name: Set up JDK 23 for x64
uses: actions/setup-java@v4
- uses: actions/checkout@v6
- name: Set up JDK 25 for x64
uses: actions/setup-java@v5
with:
java-version: '23'
java-version: '25'
distribution: 'temurin'
architecture: x64
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v6
with:
gradle-version: 9.3.1
gradle-version: 9.5.1
- name: Build TASmod with Gradle
run: gradle build
- name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: TASmod-Dev-Build
path: build/libs
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/check_formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 23 for x64
uses: actions/setup-java@v4
- uses: actions/checkout@v6
- name: Set up JDK 25 for x64
uses: actions/setup-java@v5
with:
java-version: '23'
java-version: '25'
distribution: 'temurin'
architecture: x64
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v6
with:
gradle-version: 9.3.1
gradle-version: 9.5.1
- name: Spotless Check
run: gradle spotlessCheck
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'MinecraftTAS/TASmod'
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Setup Java
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: '23'
java-version: '25'
distribution: 'temurin'
architecture: x64
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v6
with:
gradle-version: 9.3.1
gradle-version: 9.5.1
- name: Setup workspace
run: gradle build -Prelease=true
- name: Upload assets
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
with:
files: 'build/libs/!(-@(dev|sources|javadoc|all)).jar'
- name: Publish 1.12.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
report:
runs-on: ubuntu-latest
steps:
- uses: dorny/test-reporter@v2
- uses: dorny/test-reporter@v3
with:
artifact: TestResult
name: TASmod Tests
Expand Down
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ loom {
repositories {
mavenCentral()
maven { url = "https://maven.minecrafttas.com/main" }
maven { url = "https://maven.legacyfabric.net/" }
//maven { url = "https://maven.minecrafttas.com/snapshots" }
maven { url = "https://jitpack.io" }
maven { url = "https://repo.spongepowered.org/maven" }
Expand All @@ -46,7 +45,7 @@ configurations {
}

ploceus {
setIntermediaryGeneration(2)
setIntermediaryGeneration(1)
}

// dependencies
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx3G

# Fabric properties
minecraft_version=1.12.2
loader_version=0.18.4
loom_version=1.15-SNAPSHOT
loader_version=0.19.3
loom_version=1.17-SNAPSHOT
mcp_channel=stable
mcp_build=39
mcp_mcversion=1.12
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 10 additions & 21 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.