From 3704604544c473fb50f59b0f5f297c208d345a92 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Fri, 29 Jan 2021 07:44:22 +0800
Subject: [PATCH] Extract ResolveContext and RestrictedScope to separate
modules
---
buildSrc/src/main/kotlin/Versions.kt | 3 +++
settings.gradle.kts | 1 +
2 files changed, 4 insertions(+)
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 1337eedd4..3bb291c66 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -42,6 +42,9 @@ object Versions {
const val slf4j = "1.7.30"
const val log4j = "2.13.3"
+
+ // If you the versions below, you need to sync changes to mirai-console/buildSrc/src/main/kotlin/Versions.kt
+
const val yamlkt = "0.7.5"
const val intellijGradlePlugin = "0.4.16"
const val kotlinIntellijPlugin = "203-1.4.21-release-IJ5981.133" // keep to newest as kotlinCompiler
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 472854280..cb6728cbf 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -39,6 +39,7 @@ fun includeConsoleProjects() {
if (path != null) project(projectPath).projectDir = file("mirai-console/$path")
}
+ includeConsoleProject(":mirai-console-compiler-annotations", "tools/compiler-annotations")
includeConsoleProject(":mirai-console", "backend/mirai-console")
includeConsoleProject(":mirai-console.codegen", "backend/codegen")
includeConsoleProject(":mirai-console-terminal", "frontend/mirai-console-terminal")