From e5f0adfd7ef6d24b83ca03de700443772562b364 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Tue, 6 Apr 2021 12:10:29 +0800
Subject: [PATCH] build: update intellijGradlePlugin to 0.7.2 and allow using
 property `flatten.sourceset` to disable flatten sourceSets

---
 buildSrc/src/main/kotlin/ProjectConfigure.kt | 2 ++
 buildSrc/src/main/kotlin/Versions.kt         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/ProjectConfigure.kt b/buildSrc/src/main/kotlin/ProjectConfigure.kt
index e53a2a21b..7dd3d4d6e 100644
--- a/buildSrc/src/main/kotlin/ProjectConfigure.kt
+++ b/buildSrc/src/main/kotlin/ProjectConfigure.kt
@@ -138,6 +138,8 @@ fun KotlinSourceSet.configureKotlinExperimentalUsages() {
 }
 
 fun Project.configureFlattenSourceSets() {
+    val flatten = extra.runCatching { get("flatten.sourceset") }.getOrNull()?.toString()?.toBoolean() ?: true
+    if (!flatten) return
     sourceSets {
         findByName("main")?.apply {
             resources.setSrcDirs(listOf(projectDir.resolve("resources")))
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 137aad75d..74cff64f3 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -50,7 +50,7 @@ object Versions {
     // 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 intellijGradlePlugin = "0.7.2"
     const val kotlinIntellijPlugin = "203-1.4.30-release-IJ7148.5" // keep to newest as kotlinCompiler
     const val intellij = "2020.3.2" // don't update easily unless you want your disk space -= 500MB