github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-25 04:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix gradle dependency

Browse Source
This commit is contained in:
Him188 2020-02-18 13:03:51 +08:00
parent 96ace8f0f8
commit 29091e817f
5 changed files with 17 additions and 5 deletions
mirai-core-qqandroid
build.gradle.kts
mirai-core
build.gradle.kts
mirai-demos
mirai-demo-1
build.gradle
mirai-demo-java
build.gradle
mirai-japt
build.gradle.kts

4
mirai-core-qqandroid/build.gradle.kts
View File

@ -119,4 +119,8 @@ kotlin {
}
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}
apply(from = rootProject.file("gradle/publish.gradle"))

4
mirai-core/build.gradle.kts
View File

@ -151,4 +151,8 @@ kotlin {
}
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}
apply(from = rootProject.file("gradle/publish.gradle"))

4
mirai-demos/mirai-demo-1/build.gradle
View File

@ -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

4
mirai-demos/mirai-demo-java/build.gradle
View File

@ -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")
}

6
mirai-japt/build.gradle.kts
View File

@ -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")