Skip to content

Commit 45a1f9e

Browse files
Merge branch 'main' into kotlin
2 parents 7f70e60 + 26c6723 commit 45a1f9e

5 files changed

Lines changed: 11 additions & 7 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
distribution: 'temurin'
2121
- uses: gradle/actions/setup-gradle@v6
2222
with:
23-
gradle-version: 9.5.1
23+
gradle-version: 9.6.1
2424
name: Set up Gradle
2525
- name: Add permission
2626
run: chmod +x ./gradlew

.github/workflows/release-to-cf-mr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- uses: gradle/actions/setup-gradle@v6
2424
with:
25-
gradle-version: 9.5.1
25+
gradle-version: 9.6.1
2626
name: Set up Gradle
2727

2828
- name: Add permission

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
distribution: 'temurin'
2020
- uses: gradle/actions/setup-gradle@v6
2121
with:
22-
gradle-version: 9.5.1
22+
gradle-version: 9.6.1
2323
name: Set up Gradle
2424
- name: Add permission
2525
run: chmod +x ./gradlew

build.gradle.kts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
import org.jetbrains.gradle.ext.Gradle
22
import org.jetbrains.gradle.ext.compiler
33
import org.jetbrains.gradle.ext.runConfigurations
4+
import org.jetbrains.gradle.ext.taskTriggers
45
import org.jetbrains.gradle.ext.settings
56

67
plugins {
78
java
89
`java-library`
910
`maven-publish`
1011
kotlin("jvm") version "2.4.0"
11-
id("com.gradleup.shadow") version "9.4.1"
12+
id("com.gradleup.shadow") version "9.5.1"
1213
id("org.jetbrains.gradle.plugin.idea-ext") version "1.4.1"
13-
id("xyz.wagyourtail.unimined") version "1.4.23-kappa"
14+
id("xyz.wagyourtail.unimined") version "1.4.26-kappa"
1415
id("net.kyori.blossom") version "2.2.0"
1516
}
1617

@@ -112,7 +113,7 @@ unimined.minecraft {
112113
if (useAccessTransformer) {
113114
accessTransformer("${rootProject.projectDir}/src/main/resources/$access_transformer_locations")
114115
}
115-
loader("0.5.14-alpha")
116+
loader("0.5.17-alpha")
116117
runs.all {
117118
args.addAll(listOf("--username", minecraft_username))
118119
if (extra_jvm_args.isNotEmpty()) {
@@ -218,6 +219,9 @@ idea {
218219
javacAdditionalOptions = "-encoding utf8"
219220
}
220221
}
222+
taskTriggers {
223+
afterSync(tasks.named("genSources"))
224+
}
221225
}
222226
}
223227
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)