Skip to content

Commit bbc9e39

Browse files
committed
Merge remote-tracking branch 'origin/7.3' into 7.3
2 parents b5b0fa6 + 90ed44c commit bbc9e39

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: ./gradlew build
3636
- name: capture build artifacts
3737
if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
38-
uses: actions/upload-artifact@v5
38+
uses: actions/upload-artifact@v6
3939
with:
4040
name: Artifacts
4141
path: build/libs/

build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ plugins {
88
java
99
`maven-publish`
1010
}
11-
val modVersion = providers.gradleProperty("mod_version")
12-
val modGroup = providers.gradleProperty("mod_group")
13-
val modName = providers.gradleProperty("mod_name")
11+
val modVersion: Provider<String> = providers.gradleProperty("mod_version")
12+
val modGroup: Provider<String> = providers.gradleProperty("mod_group")
13+
val modName: Provider<String> = providers.gradleProperty("mod_name")
1414

15-
val javaVersion = libs.versions.java.map { it.toInt() }
15+
val javaVersion: Provider<Int> = libs.versions.java.map { it.toInt() }
1616

1717
base.archivesName = modName
1818
group = modGroup.get()
@@ -148,7 +148,7 @@ publishing {
148148
}
149149
}
150150

151-
val modrinthToken = providers.gradleProperty("modrinthToken")
151+
val modrinthToken: Provider<String> = providers.gradleProperty("modrinthToken")
152152

153153
if (modrinthToken.isPresent) {
154154
modrinth {

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
##########################################################################
33
# Plugins
44
# Check this on https://github.com/FabricMC/fabric-loom/releases/latest/
5-
loom = "1.14-SNAPSHOT"
5+
loom = "1.15-SNAPSHOT"
66
# Check this on https://plugins.gradle.org/plugin/com.smushytaco.lwjgl3/
7-
lwjglPlugin = "1.0.0"
7+
lwjglPlugin = "1.0.2"
88
# Check this on https://plugins.gradle.org/plugin/com.modrinth.minotaur/
99
minotaur = "2.8.10"
1010
##########################################################################
@@ -20,7 +20,7 @@ bta = "7.3_04"
2020
# Options are release, prerelease, nightly, and misc.
2121
btaChannel = "release"
2222
# Check this on https://maven.thesignalumproject.net/#/infrastructure/net/fabricmc/fabric-loader/
23-
loader = "0.18.1-bta.9"
23+
loader = "0.18.4-bta.10"
2424
# Check this on https://github.com/Turnip-Labs/ModMenu/releases/latest/
2525
modMenu = "4.0.0"
2626
# Check this on https://github.com/Better-than-Adventure/legacy-lwjgl3/releases/latest/

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Check this on https://gradle.org/releases/
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
val modName = providers.gradleProperty("mod_name")
1+
val modName: Provider<String> = providers.gradleProperty("mod_name")
22
rootProject.name = modName.get()
33
pluginManagement {
44
fun isRepoHealthy(url: String): Boolean {

0 commit comments

Comments
 (0)