Merge remote-tracking branch 'origin/master'

zxj5470 · zxj5470 · commit 48bdc62e59a7 · 2019-04-16T23:59:04.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -31,7 +31,7 @@ plugins {
 	java
 	id("org.jetbrains.intellij") version "0.4.6"
 	id("org.jetbrains.grammarkit") version "2018.3.1"
-	kotlin("jvm") version "1.3.20"
+	kotlin("jvm") version "1.3.30"
 }
 
 fun fromToolbox(path: String) = file(path).listFiles().orEmpty().filter { it.isDirectory }.maxBy {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ plugins {`
`31`	`31`	`java`
`32`	`32`	`id("org.jetbrains.intellij") version "0.4.6"`
`33`	`33`	`id("org.jetbrains.grammarkit") version "2018.3.1"`
`34`		`- kotlin("jvm") version "1.3.20"`
	`34`	`+ kotlin("jvm") version "1.3.30"`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`fun fromToolbox(path: String) = file(path).listFiles().orEmpty().filter { it.isDirectory }.maxBy {`