Skip to content

Commit

Permalink
(gradle) remove unused kotlin deps
Browse files Browse the repository at this point in the history
  • Loading branch information
lilgallon committed Oct 1, 2024
1 parent 814bc0c commit 4ae58b9
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 19 deletions.
7 changes: 0 additions & 7 deletions common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
plugins {
id 'org.jetbrains.kotlin.jvm'
}
architectury {
common rootProject.enabled_platforms.split(',')
}
Expand All @@ -10,11 +7,7 @@ dependencies {
// which get remapped to the correct annotations on each platform.
// Do NOT use other classes from Fabric Loader.
modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
}
repositories {
mavenCentral()
}
kotlin {
jvmToolchain(21)
}
2 changes: 1 addition & 1 deletion common/src/main/resources/horsestatsmod.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
],
"injectors": {
"defaultRequire": 1
}${refmap_fix}
}
}
10 changes: 9 additions & 1 deletion fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,15 @@ processResources {
// in mixins.json. AND forge won't work if refmap is specified. So in fabric
// we specify the refmap, and in forge we don't
filesMatching("horsestatsmod.mixins.json") {
expand refmap_fix: ",\n \"refmap\": \"horsestatsmod-common-common-refmap.json\""
filter { String line ->
line.find(" }").each {
line = it.replace(
"}",
" },\n \"refmap\": \"horsestatsmod-common-common-refmap.json\""
)
}
line
}
}

filesMatching('fabric.mod.json') {
Expand Down
7 changes: 0 additions & 7 deletions neoforge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,6 @@ processResources {

from(project(":common").sourceSets["main"].resources)

// For some reason fabric mixins won't work because refmap is not specified
// in mixins.json. AND forge won't work if refmap is specified. So in fabric
// we specify the refmap, and in forge we don't
filesMatching("horsestatsmod.mixins.json") {
expand refmap_fix: ""
}

filesMatching(['META-INF/neoforge.mods.toml', 'pack.mcmeta']) {
expand replaceProperties + [project: project]
}
Expand Down
4 changes: 1 addition & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ pluginManagement {
maven { url "https://files.minecraftforge.net/maven/" }
gradlePluginPortal()
}
plugins {
id 'org.jetbrains.kotlin.jvm' version '2.0.20'
}
}

plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
}
Expand Down

0 comments on commit 4ae58b9

Please sign in to comment.