From 29091e817f821dc0c99eb2ba8dffb9132ebffc02 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Tue, 18 Feb 2020 13:03:51 +0800
Subject: [PATCH] Fix gradle dependency

---
 mirai-core-qqandroid/build.gradle.kts    | 4 ++++
 mirai-core/build.gradle.kts              | 4 ++++
 mirai-demos/mirai-demo-1/build.gradle    | 4 ++--
 mirai-demos/mirai-demo-java/build.gradle | 4 ++--
 mirai-japt/build.gradle.kts              | 6 +++++-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/mirai-core-qqandroid/build.gradle.kts b/mirai-core-qqandroid/build.gradle.kts
index eb5a1af42..191b6c0a8 100644
--- a/mirai-core-qqandroid/build.gradle.kts
+++ b/mirai-core-qqandroid/build.gradle.kts
@@ -119,4 +119,8 @@ kotlin {
     }
 }
 
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
 apply(from = rootProject.file("gradle/publish.gradle"))
diff --git a/mirai-core/build.gradle.kts b/mirai-core/build.gradle.kts
index 882ecf7cc..fe37c48d9 100644
--- a/mirai-core/build.gradle.kts
+++ b/mirai-core/build.gradle.kts
@@ -151,4 +151,8 @@ kotlin {
     }
 }
 
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
 apply(from = rootProject.file("gradle/publish.gradle"))
diff --git a/mirai-demos/mirai-demo-1/build.gradle b/mirai-demos/mirai-demo-1/build.gradle
index 0afcdc380..0d0c910f1 100644
--- a/mirai-demos/mirai-demo-1/build.gradle
+++ b/mirai-demos/mirai-demo-1/build.gradle
@@ -2,9 +2,9 @@ apply plugin: "kotlin"
 apply plugin: "java"
 
 dependencies {
-    implementation files("../../mirai-core/build/classes/kotlin/jvm/main") // IDE bug
+    runtimeOnly files("../../mirai-core/build/classes/kotlin/jvm/main") // IDE bug
 
-    implementation files("../../mirai-core-qqandroid/build/classes/kotlin/jvm/main") // IDE bug
+    runtimeOnly files("../../mirai-core-qqandroid/build/classes/kotlin/jvm/main") // IDE bug
     implementation project(":mirai-core-qqandroid")
 
     api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlinVersion
diff --git a/mirai-demos/mirai-demo-java/build.gradle b/mirai-demos/mirai-demo-java/build.gradle
index e5e8fc5a1..77270e807 100644
--- a/mirai-demos/mirai-demo-java/build.gradle
+++ b/mirai-demos/mirai-demo-java/build.gradle
@@ -2,9 +2,9 @@ apply plugin: "java"
 apply plugin: "kotlin"
 
 dependencies {
-    implementation files("../../mirai-core/build/classes/kotlin/jvm/main") // IDE bug
+    runtimeOnly files("../../mirai-core/build/classes/kotlin/jvm/main") // IDE bug
 
-    implementation files("../../mirai-core-qqandroid/build/classes/kotlin/jvm/main") // IDE bug
+    runtimeOnly files("../../mirai-core-qqandroid/build/classes/kotlin/jvm/main") // IDE bug
     implementation project(":mirai-core-qqandroid")
     implementation project(":mirai-japt")
 }
diff --git a/mirai-japt/build.gradle.kts b/mirai-japt/build.gradle.kts
index 1c4be4095..3bd7d20a5 100644
--- a/mirai-japt/build.gradle.kts
+++ b/mirai-japt/build.gradle.kts
@@ -18,9 +18,9 @@ buildscript {
 plugins {
     kotlin("jvm")
     java
+    id("com.jfrog.bintray") version "1.8.0"
     `maven-publish`
     // maven
-    id("com.jfrog.bintray") version "1.8.0"
 }
 
 val kotlinVersion: String by rootProject.ext
@@ -77,6 +77,10 @@ tasks.withType<JavaCompile>() {
     options.encoding = "UTF-8"
 }
 
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
 bintray {
     val keyProps = Properties()
     val keyFile = file("../keys.properties")