Skip to content

Update to 26.1 #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DrexHD wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to 26.1 #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66c746a
Update to 26.1 [skip ci]
DrexHD Mar 22, 2026
6395993
Update dependencies
DrexHD Mar 25, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
java-version: 21
java-version: 25
distribution: 'temurin'
- name: Build artifacts
run: ./gradlew build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up JDK 21
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
java-version: 21
java-version: 25
distribution: 'temurin'

- name: Build release
Expand Down
24 changes: 11 additions & 13 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ loom {
}
}

fun DependencyHandlerScope.modImplementationAndInclude(dep: Any) {
modImplementation(dep)
fun DependencyHandlerScope.implementationAndInclude(dep: Any) {
implementation(dep)
include(dep)
}

Expand All @@ -48,7 +48,6 @@ repositories {
maven("https://jitpack.io")
maven("https://oss.sonatype.org/content/repositories/snapshots")
mavenCentral()
mavenLocal()
}

val includeImplementation: Configuration by configurations.creating {
Expand All @@ -60,20 +59,19 @@ dependencies {

// Fabric
minecraft(libs.minecraft)
mappings(loom.officialMojangMappings())
modImplementation(libs.fabric.loader)
implementation(libs.fabric.loader)

// Fabric API
modImplementation(libs.fabric.api)
implementation(libs.fabric.api)

// Permissions
modImplementationAndInclude(libs.fabric.permissions)
implementationAndInclude(libs.fabric.permissions)

// Translations
modImplementationAndInclude(libs.translations)
implementationAndInclude(libs.translations)

// Kotlin
modImplementation(libs.fabric.kotlin)
implementation(libs.fabric.kotlin)

// Database
includeImplementation(libs.exposed.core)
Expand Down Expand Up @@ -116,14 +114,14 @@ tasks {
}

java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
sourceCompatibility = JavaVersion.VERSION_25
targetCompatibility = JavaVersion.VERSION_25
withSourcesJar()
}

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
jvmTarget.set(JvmTarget.JVM_25)
}
}

Expand Down Expand Up @@ -204,7 +202,7 @@ fun DependencyHandlerScope.handleIncludes(configuration: Configuration) {
includeTransitive(
configuration.resolvedConfiguration.firstLevelModuleDependencies,
configurations.minecraftLibraries.get().resolvedConfiguration.firstLevelModuleDependencies,
configurations.modImplementation.get().resolvedConfiguration.firstLevelModuleDependencies
configurations.runtimeClasspath.get().resolvedConfiguration.firstLevelModuleDependencies
.first { it.moduleGroup == "net.fabricmc" && it.moduleName == "fabric-language-kotlin" },
)
}
Loading
Loading