From bea54c1acd78fd6f1b25cdc93c3817727a703ba0 Mon Sep 17 00:00:00 2001 From: Awakened-Redstone Date: Thu, 14 Jul 2022 01:25:12 -0300 Subject: [PATCH] ## Fixes - Fixed issue with okhttp3 --- build.gradle | 17 +++++++++-------- gradle.properties | 2 +- src/main/resources/fabric.mod.json | 3 ++- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 69e1085..d4e96f7 100644 --- a/build.gradle +++ b/build.gradle @@ -38,19 +38,20 @@ dependencies { include modImplementation(fabricApi.module("fabric-lifecycle-events-v1", project.fabric_version)) include modImplementation(fabricApi.module("fabric-api-base", project.fabric_version)) - includeTransitive implementation('net.dv8tion:JDA:4.4.0_352') { + include implementation('net.dv8tion:JDA:4.4.0_352') { exclude module: 'opus-java' - exclude group: 'okhttp3', module: "okhttp" } - include implementation('com.squareup.okhttp3:okhttp:4.9.0') + include 'com.fasterxml.jackson.core:jackson-annotations:2.10.1' + include 'com.fasterxml.jackson.core:jackson-databind:2.10.1' + include 'com.fasterxml.jackson.core:jackson-core:2.10.1' + include 'com.neovisionaries:nv-websocket-client:2.14' + include 'org.apache.commons:commons-collections4:4.1' + include 'com.squareup.okhttp3:okhttp:3.13.0' + include 'com.squareup.okio:okio:1.17.2' + include 'net.sf.trove4j:trove4j:3.0.3' } -configurations.getByName("includeTransitive").resolvedConfiguration.resolvedArtifacts.forEach(dep -> { - if (!dep.id.componentIdentifier.displayName.contains("slf4j-api")) - dependencies.add("include", dep.id.componentIdentifier.displayName) -}) - compileJava { sourceCompatibility = 17 targetCompatibility = 17 diff --git a/gradle.properties b/gradle.properties index b87de2c..57b3f87 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2G minecraft_version=1.19.1-pre2 yarn_mappings=1.19.1-pre2+build.2 loader_version=0.14.8 -mod_version=1.1.1 +mod_version=1.1.2 maven_group=com.awakenedredstone archives_base_name=autowhitelist diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9dfa230..cb2fdb8 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,6 +23,7 @@ ], "depends": { "fabricloader": ">=0.13.2", - "minecraft": ">1.18.1" + "fabric-language-kotlin": "*", + "minecraft": ">=1.19" } }