Skip to content

Commit 77f54ee

Browse files
authored
Merge branch 'master' into sb-ht-fixes
2 parents 705ceca + 32d2c2d commit 77f54ee

File tree

820 files changed

+18613
-26974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

820 files changed

+18613
-26974
lines changed

.github/actions/build_setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
java-version: 17
1919

2020
- name: Setup Gradle
21-
uses: gradle/gradle-build-action@v2
21+
uses: gradle/actions/setup-gradle@v3
2222
with:
2323
cache-write-only: ${{ inputs.update-cache }}
2424
generate-job-summary: false

.github/workflows/format_java.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ on:
55
push:
66
branches:
77
- master
8-
paths: ['src/main/java/**', 'src/test/**']
98
pull_request:
10-
paths: ['src/main/java/**', 'src/test/**']
119

1210
concurrency:
1311
group: formatting-${{ github.head_ref || github.ref }}

.github/workflows/publish_project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: ./gradlew build --warning-mode all --build-cache
3636

3737
- name: Publish to GitHub
38-
uses: softprops/action-gh-release@v1
38+
uses: softprops/action-gh-release@v2
3939
with:
4040
files: "build/libs/*.jar"
4141
generate_release_notes: true

.github/workflows/test_java.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ on:
55
push:
66
branches:
77
- master
8-
paths: ['src/main/java/**', 'src/test/**', 'src/api/java/**', 'gradle/**', '**.gradle', 'gradle.properties',
9-
'gradlew**', 'src/main/resources/*_at.cfg']
108
pull_request:
11-
paths: ['src/main/java/**', 'src/test/**', 'src/api/java/**', 'gradle/**', '**.gradle', 'gradle.properties',
12-
'gradlew**', 'src/main/resources/*_at.cfg']
139

1410
concurrency:
1511
group: tests-${{ github.head_ref || github.ref }}

.github/workflows/update_buildscript.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,11 @@ jobs:
3535
3636
- name: Create Pull Request
3737
id: create-pull-request
38-
uses: peter-evans/create-pull-request@v5
38+
uses: peter-evans/create-pull-request@v6
3939
env:
4040
GITHUB_TOKEN: ${{ secrets.BUILDSCRIPT_UPDATER_TOKEN }}
4141
with:
4242
token: ${{ secrets.BUILDSCRIPT_UPDATER_TOKEN }}
43-
committer: GitHub <noreply@github.com>
44-
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
4543
commit-message: 'update build script version to ${{ steps.version-check.outputs.NEW_VERSION }}'
4644
branch: gha-update-buildscript
4745
title: Update build script version to ${{ steps.version-check.outputs.NEW_VERSION }}

.github/workflows/validate_gradle_wrapper.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ on:
88
paths:
99
- 'gradle/**'
1010
pull_request:
11-
branches:
12-
- '*'
1311
paths:
1412
- 'gradle/**'
1513

@@ -26,4 +24,4 @@ jobs:
2624
uses: actions/checkout@v4
2725

2826
- name: Validate Gradle Wrapper
29-
uses: gradle/wrapper-validation-action@v1
27+
uses: gradle/actions/wrapper-validation@v3

addon.gradle

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
2+
minecraft {
3+
injectedTags.put('DEP_VERSION_STRING', "required-after:gregtech@[${modVersion},);")
4+
}
5+
6+
configurations {
7+
compileOnly {
8+
// exclude GNU trove, FastUtil is superior and still updated
9+
exclude group: "net.sf.trove4j", module: "trove4j"
10+
// exclude javax.annotation from findbugs, jetbrains annotations are superior
11+
exclude group: "com.google.code.findbugs", module: "jsr305"
12+
// exclude scala as we don't use it for anything and causes import confusion
13+
exclude group: "org.scala-lang"
14+
exclude group: "org.scala-lang.modules"
15+
exclude group: "org.scala-lang.plugins"
16+
}
17+
}
18+
19+

0 commit comments

Comments
 (0)