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

build: update intellijGradlePlugin to 0.7.2 and allow using property flatten.sourceset to disable flatten sourceSets

Browse Source
This commit is contained in:
Him188 2021-04-06 12:10:29 +08:00
parent ece455f79e
commit e5f0adfd7e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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