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

Fix jvmTarget; fix #1795; fix #1765

Browse Source
This commit is contained in:
Karlatemp 2022-01-04 23:59:13 +08:00
parent 6d16d77dad
commit 6b571e163d
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle.kts
View File

@ -83,6 +83,7 @@ allprojects {
google()
}
preConfigureJvmTarget()
afterEvaluate {
configureJvmTarget()
configureMppShadow()

25
buildSrc/src/main/kotlin/ProjectConfigure.kt
View File

@ -28,8 +28,16 @@ fun Project.useIr() {
}
}
fun Project.configureJvmTarget() {
val defaultVer = JavaVersion.VERSION_1_8
private fun Project.jvmVersion(): JavaVersion {
return if (project.path.endsWith("mirai-console-intellij")) {
JavaVersion.VERSION_11
} else {
JavaVersion.VERSION_1_8
}
}
fun Project.preConfigureJvmTarget() {
val defaultVer = jvmVersion()
tasks.withType(KotlinJvmCompile::class.java) {
kotlinOptions.languageVersion = "1.6"
@ -37,6 +45,14 @@ fun Project.configureJvmTarget() {
kotlinOptions.freeCompilerArgs += "-Xjvm-default=all"
}
tasks.withType(JavaCompile::class.java) {
sourceCompatibility = defaultVer.toString()
targetCompatibility = defaultVer.toString()
}
}
fun Project.configureJvmTarget() {
val defaultVer = jvmVersion()
tasks.withType(KotlinJvmCompile::class)
.filter { it.name.startsWith("compileTestKotlin") }
.forEach { task ->
@ -46,11 +62,6 @@ fun Project.configureJvmTarget() {
extensions.findByType(JavaPluginExtension::class.java)?.run {
sourceCompatibility = defaultVer
targetCompatibility = defaultVer
if (project.path.endsWith("mirai-console-intellij")) {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}
kotlinTargets.orEmpty().filterIsInstance<KotlinJvmTarget>().forEach { target ->