User: kyle wood
Date: 29 Jan 23 06:45
Revision: a2cb379f98a46071336f2dd2f5eb986e9b35d50a
Summary:
Update to Kotlin 1.8.0

Also make the build log a bit less noisy


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8267&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision d1252e5dbbd834b9a357f1a275e8ebffbd830528)
+++ build.gradle.kts	(revision a2cb379f98a46071336f2dd2f5eb986e9b35d50a)
@@ -17,7 +17,7 @@
 import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
 
 plugins {
-    kotlin("jvm") version "1.7.20"
+    kotlin("jvm") version "1.8.0"
     java
     mcdev
     groovy
Index: buildSrc/src/main/kotlin/util.kt
===================================================================
--- buildSrc/src/main/kotlin/util.kt	(revision d1252e5dbbd834b9a357f1a275e8ebffbd830528)
+++ buildSrc/src/main/kotlin/util.kt	(revision a2cb379f98a46071336f2dd2f5eb986e9b35d50a)
@@ -8,6 +8,7 @@
  * MIT License
  */
 
+import java.io.ByteArrayOutputStream
 import org.cadixdev.gradle.licenser.LicenseExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
@@ -30,6 +31,7 @@
         val src = layout.projectDirectory.file("src/main/grammars/$flex.flex")
         val dst = layout.buildDirectory.dir("gen/$pack")
         val output = layout.buildDirectory.file("gen/$pack/$flex.java")
+        val logOutout = layout.buildDirectory.file("logs/generate$flex.log")
 
         val jflex by project.configurations
         val jflexSkeleton by project.configurations
@@ -37,7 +39,11 @@
         classpath = jflex
         mainClass.set("jflex.Main")
 
+        val taskOutput = ByteArrayOutputStream()
+        standardOutput = taskOutput
+        errorOutput = taskOutput
+
-        doFirst {
+                        doFirst {
             args(
                 "--skel", jflexSkeleton.singleFile.absolutePath,
                 "-d", dst.get().asFile.absolutePath,
@@ -46,8 +52,13 @@
 
             // Delete current lexer
             project.delete(output)
+            logOutout.get().asFile.parentFile.mkdirs()
         }
 
+        doLast {
+            logOutout.get().asFile.writeBytes(taskOutput.toByteArray())
+        }
+
         inputs.files(src, jflexSkeleton)
         outputs.file(output)
     }
@@ -64,12 +75,13 @@
         val dst = dstRoot.map { it.dir(pack) }
         val psiDir = dst.map { it.dir("psi") }
         val parserDir = dst.map { it.dir("parser") }
+        val logOutout = layout.buildDirectory.file("logs/generate$bnf.log")
 
         val grammarKit by project.configurations
 
-        doFirst {
-            project.delete(psiDir, parserDir)
-        }
+        val taskOutput = ByteArrayOutputStream()
+        standardOutput = taskOutput
+        errorOutput = taskOutput
 
         classpath = grammarKit
         mainClass.set("org.intellij.grammar.Main")
@@ -83,8 +95,13 @@
         }
 
         doFirst {
+            project.delete(psiDir, parserDir)
             args(dstRoot.get().asFile, src.asFile)
+            logOutout.get().asFile.parentFile.mkdirs()
         }
+        doLast {
+            logOutout.get().asFile.writeBytes(taskOutput.toByteArray())
+        }
 
         inputs.file(src)
         outputs.dirs(
Index: gradle.properties
===================================================================
--- gradle.properties	(revision d1252e5dbbd834b9a357f1a275e8ebffbd830528)
+++ gradle.properties	(revision a2cb379f98a46071336f2dd2f5eb986e9b35d50a)
@@ -18,3 +18,5 @@
 downloadIdeaSources = true
 
 pluginTomlVersion = 221.5080.126
+
+kotlin.stdlib.default.dependency = false