Fix jvm

Signed-off-by: shedaniel <[email protected]>
linkie · May 18, 2021 · e0eb979 · e0eb979
1 parent 86de415
commit e0eb979
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id("org.jetbrains.kotlin.jvm") version("1.5.0")
     id("org.jetbrains.kotlin.plugin.serialization") version("1.5.0")
     id("java")
-    id("com.github.johnrengelman.shadow") version("5.2.0")
+    id("com.github.johnrengelman.shadow") version("7.0.0")
     id("net.minecrell.licenser") version("0.4.1")
 }
 
@@ -20,7 +20,7 @@ license {
 
 configurations {
     shadow {
-        extendsFrom(runtime)
+        extendsFrom(runtimeClasspath)
     }
 }
 
@@ -38,18 +38,32 @@ repositories {
 }
 
 dependencies {
-    compile("me.shedaniel:linkie-core:1.0.74")
-    compile("com.discord4j:discord4j-core:3.1.3") {
+    implementation("me.shedaniel:linkie-core:1.0.74") {
+        exclude module: "korio"
+    }
+    implementation("com.discord4j:discord4j-core:3.1.3") {
         force = true
     }
 //    compile("com.github.shadorc.discord4j:discord4j-core:217336e") {
 //        force = true
 //    }
-    compile "org.graalvm.js:js-scriptengine:20.2.0"
-    compile "org.graalvm.js:js:20.2.0"
-    compile "io.ktor:ktor-server-core:$ktor_version"
-    compile "io.ktor:ktor-server-netty:$ktor_version"
-    compile "com.github.shedaniel:CurseMetaApi:0.2"
+    implementation("com.soywiz.korlibs.korio:korio-jvm:2.1.1") {
+        exclude module: "kds"
+        exclude module: "klock"
+        exclude module: "klogger"
+        exclude module: "krypto"
+        exclude module: "kmem"
+    }
+    implementation("com.soywiz.korlibs.kds:kds-jvm:2.1.1")
+    implementation("com.soywiz.korlibs.klock:klock-jvm:2.1.1")
+    implementation("com.soywiz.korlibs.klogger:klogger-jvm:2.1.1")
+    implementation("com.soywiz.korlibs.krypto:krypto-jvm:2.1.1")
+    implementation("com.soywiz.korlibs.kmem:kmem-jvm:2.1.1")
+    implementation "org.graalvm.js:js-scriptengine:20.2.0"
+    implementation "org.graalvm.js:js:20.2.0"
+    implementation "io.ktor:ktor-server-core:$ktor_version"
+    implementation "io.ktor:ktor-server-netty:$ktor_version"
+    implementation "com.github.shedaniel:CurseMetaApi:0.2"
 //        exclude(module: "truffle-api")
 //    compile("org.graalvm.sdk:graal-sdk:20.2.0")
 //    compile("org.graalvm.truffle:truffle-api:20.2.0")

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip