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

Fix build

Browse Source
This commit is contained in:
Him188 2021-07-02 02:06:53 +08:00
parent 823193f1bb
commit 67565cb34b
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/kotlin/Versions.kt
View File

@ -20,8 +20,8 @@ object Versions {
const val kotlinCompiler = "1.5.10"
const val kotlinStdlib = "1.5.10"
const val kotlinIntellijPlugin = "211-1.4.32-release-IJ6693.72" // keep to newest as kotlinCompiler
const val intellij = "2021.1" // don't update easily unless you want your disk space -= 500MB
const val kotlinIntellijPlugin = "211-1.5.20-release-284-IJ7442.40" // keep to newest as kotlinCompiler
const val intellij = "2021.1.1" // don't update easily unless you want your disk space -= 500MB
const val coroutines = "1.5.0"
@ -38,7 +38,7 @@ object Versions {
@Suppress("SpellCheckingInspection")
const val yamlkt = "0.9.0"
const val intellijGradlePlugin = "0.7.2"
const val intellijGradlePlugin = "1.1"
}
const val `kotlin-compiler` = "org.jetbrains.kotlin:kotlin-compiler:${Versions.kotlinCompiler}"

8
tools/intellij-plugin/build.gradle.kts
View File

@ -104,12 +104,12 @@ dependencies {
api(project(":mirai-console-compiler-common"))
compileOnly(`kotlin-stdlib-jdk8`)
compileOnly("com.jetbrains:ideaIC:${Versions.intellij}")
// compileOnly("com.jetbrains:ideaIC:${Versions.intellij}")
// compileOnly(`kotlin-compiler`)
compileOnly(files("libs/ide-common.jar"))
compileOnly(fileTree("build/idea-sandbox/plugins/Kotlin/lib").filter {
!it.name.contains("stdlib")
// compileOnly(files("libs/ide-common.jar"))
compileOnly(fileTree("run/idea-sandbox/plugins/Kotlin/lib").filter {
!it.name.contains("stdlib") && !it.name.contains("coroutines")
})
compileOnly(`kotlin-reflect`)
}

1
tools/intellij-plugin/src/IDEContainerContributor.kt
View File

@ -9,6 +9,7 @@
package net.mamoe.mirai.console.intellij
import net.mamoe.mirai.console.compiler.common.castOrNull
import net.mamoe.mirai.console.intellij.diagnostics.CommandDeclarationChecker
import net.mamoe.mirai.console.intellij.diagnostics.ContextualParametersChecker
import net.mamoe.mirai.console.intellij.diagnostics.PluginDataValuesChecker