From cd67be1390775c690d3f544e84fd555d3c29002a Mon Sep 17 00:00:00 2001
From: ice1000 <ice1000kotlin@foxmail.com>
Date: Wed, 24 Feb 2021 11:38:47 +0800
Subject: [PATCH] [ gradle ] Misc

---
 build.gradle.kts                         | 32 ++++++++++++------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c1a29e93..4efe3293 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -85,7 +85,7 @@ java {
 	targetCompatibility = JavaVersion.VERSION_11
 }
 
-tasks.withType<PatchPluginXmlTask> {
+tasks.withType<PatchPluginXmlTask>().configureEach {
 	changeNotes(file("docs/change-notes.html").readText())
 	pluginDescription(file("docs/description.html").readText())
 	version(pluginVersion)
@@ -123,13 +123,13 @@ dependencies {
 	testCompile(group = "junit", name = "junit", version = "4.12")
 }
 
-task("displayCommitHash") {
+tasks.register("displayCommitHash") {
 	group = "help"
 	description = "Display the newest commit hash"
 	doFirst { println("Commit hash: $commitHash") }
 }
 
-task("isCI") {
+tasks.register("isCI") {
 	group = "help"
 	description = "Check if it's running in a continuous-integration"
 	doFirst { println(if (isCI) "Yes, I'm on a CI." else "No, I'm not on CI.") }
@@ -142,8 +142,8 @@ fun path(more: Iterable<*>) = more.joinToString(File.separator)
 fun bnf(name: String) = Paths.get("grammar", "$name-grammar.bnf").toString()
 fun flex(name: String) = Paths.get("grammar", "$name-lexer.flex").toString()
 
-val genParser = task<GenerateParser>("genParser") {
-	group = tasks["init"].group!!
+val genParser = tasks.register<GenerateParser>("genParser") {
+	group = "code generation"
 	description = "Generate the Parser and PsiElement classes"
 	source = bnf("julia")
 	targetRoot = "gen/"
@@ -152,8 +152,8 @@ val genParser = task<GenerateParser>("genParser") {
 	purgeOldFiles = true
 }
 
-val genLexer = task<GenerateLexer>("genLexer") {
-	group = genParser.group
+val genLexer = tasks.register<GenerateLexer>("genLexer") {
+	group = "code generation"
 	description = "Generate the Lexer"
 	source = flex("julia")
 	targetDir = path(lexerRoot)
@@ -162,8 +162,8 @@ val genLexer = task<GenerateLexer>("genLexer") {
 	dependsOn(genParser)
 }
 
-val genDocfmtParser = task<GenerateParser>("genDocfmtParser") {
-	group = genParser.group
+val genDocfmtParser = tasks.register<GenerateParser>("genDocfmtParser") {
+	group = "code generation"
 	description = "Generate the Parser for DocumentFormat.jl"
 	source = bnf("docfmt")
 	targetRoot = "gen/"
@@ -173,8 +173,8 @@ val genDocfmtParser = task<GenerateParser>("genDocfmtParser") {
 	purgeOldFiles = true
 }
 
-val genDocfmtLexer = task<GenerateLexer>("genDocfmtLexer") {
-	group = genParser.group
+val genDocfmtLexer = tasks.register<GenerateLexer>("genDocfmtLexer") {
+	group = "code generation"
 	description = "Generate the Lexer for DocumentFormat.jl"
 	source = flex("docfmt")
 	targetDir = path(lexerRoot + "docfmt")
@@ -183,13 +183,13 @@ val genDocfmtLexer = task<GenerateLexer>("genDocfmtLexer") {
 	dependsOn(genDocfmtParser)
 }
 
-val cleanGenerated = task("cleanGenerated") {
-	group = tasks["clean"].group
+val cleanGenerated = tasks.register("cleanGenerated") {
+	group = "clean"
 	description = "Remove all generated codes"
 	doFirst { delete("gen") }
 }
 
-val sortSpelling = task("sortSpellingFile") {
+val sortSpelling = tasks.register("sortSpellingFile") {
 	val fileName = "spelling.txt"
 	val isWindows = "windows" in System.getProperty("os.name").toLowerCase()
 	project.exec {
@@ -201,7 +201,7 @@ val sortSpelling = task("sortSpellingFile") {
 	}
 }
 
-tasks.withType<KotlinCompile> {
+tasks.withType<KotlinCompile>().configureEach {
 	dependsOn(
 		genParser,
 		genLexer,
@@ -217,4 +217,4 @@ tasks.withType<KotlinCompile> {
 	}
 }
 
-tasks.withType<Delete> { dependsOn(cleanGenerated) }
+tasks.withType<Delete>().configureEach { dependsOn(cleanGenerated) }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 838e6bc8..28ff446a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists