diff options
| author | natanfudge <natan.lifsiz@gmail.com> | 2019-08-15 23:16:18 +0300 |
|---|---|---|
| committer | natanfudge <natan.lifsiz@gmail.com> | 2019-08-15 23:16:18 +0300 |
| commit | 6f67f743f4fe3f1177ca859c6bb0f23a28ac87bd (patch) | |
| tree | c5a2933a46f156db450cc8e5641ef4b6a77b0dff | |
| parent | 845ccf0911449c76579925315944b5eb2185c9bb (diff) | |
update to gradle 5.6 and make it work at all
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | settings.gradle | 13 | ||||
| -rw-r--r-- | src/main/resources/fabric.mod.json | 3 |
4 files changed, 7 insertions, 13 deletions
diff --git a/build.gradle b/build.gradle index ac7592e..5d588bf 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" + modApi "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. // You may need to force-disable transitiveness on them. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e123eb1..7e02331 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Sat Jul 27 10:29:07 IDT 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index b2f68cd..2f33060 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,14 +8,9 @@ pluginManagement { gradlePluginPortal() } - resolutionStrategy { - eachPlugin { - if (requested.id.namespace != null && requested.id.namespace.startsWith("org.jetbrains.kotlin")) { - useVersion kotlin_version - } - if(requested.id.toString() == "fabric-loom"){ - useVersion loom_version - } - } + plugins { + id 'fabric-loom' version loom_version + id "org.jetbrains.kotlin.jvm" version kotlin_version } + } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 98c32f5..b6bf2e7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -27,8 +27,7 @@ ], "depends": { "fabricloader": ">=0.4.0", - "fabric": "*", - "fabric-language-kotlin": ">=1.3.30" + "fabric": "*" }, "suggests": { "flamingo": "*" |