Update to the latest Kotlin and Gradle versions

Author: Zordid

build.gradle.kts

@@ -1,10 +1,8 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
+ kotlin("jvm") version "1.7.10"
  application
- kotlin("jvm") version "1.4.20"
-}
-
-application {
- mainClassName = "AdventOfCodeKt"
 }
 
 group = "de.zordid"
@@ -14,22 +12,26 @@ repositories {
  mavenCentral()
 }
 
-tasks.withType<Test> {
- useJUnitPlatform()
-}
-
 dependencies {
  implementation(kotlin("stdlib-jdk8"))
- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1")
+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
  implementation("org.reflections", "reflections", "0.9.12")
- implementation("guru.nidi:graphviz-kotlin:0.17.1")
+ implementation("guru.nidi:graphviz-kotlin:0.18.1")
  //implementation("ch.qos.logback", "logback-classic", "1.2.3")
 
- testImplementation("org.junit.jupiter:junit-jupiter-api:5.4.2")
- testImplementation("org.junit.jupiter:junit-jupiter-params:5.4.2")
- testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.2")
+ testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
+ testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.0")
+ testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
- kotlinOptions.jvmTarget = "1.8"
+tasks.test {
+ useJUnitPlatform()
+}
+
+tasks.withType<KotlinCompile> {
+ kotlinOptions.jvmTarget = "17"
+}
+
+application {
+ mainClass.set("AdventOfCodeKt")
 }

gradle/gng.cfg

@@ -0,0 +1,12 @@
+# Configuration file of gng
+# 1. key/value pair is separated using '='
+# 2. Line starts with '#' will be ignored.
+# 3. Empty line is ignored
+# 4. Variable Substitution based on envsubst. 'envsubst' is from GNU gettext utilities.
+# Please visit https://command-not-found.com/envsubst to find out how to install it
+# 5. 'envsubst' is strongly recommended. But it is not mandatory. You can still configure 'gng' using plain values.
+
+# https://github.com/ddimtirov/gwo-agent
+#gwo_agent_jar=~/.gradle/gwo-agent.jar
+#GRADLE_OPTS=-javaagent:${gwo_agent_jar}=distributionUrl~=@https://services.gradle.org/distributions@https://mymirror/gradle/@
+

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
+#Generated by GNG
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
  APP_HOME=`cygpath --path --mixed "$APP_HOME"`
  CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- 
+
  JAVACMD=`cygpath --unix "$JAVACMD"`
 
  # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -23,7 +23,7 @@ class Day04 : Day(4, title = "Password Processing") {
  }
 
  private fun String.toMap(kvpDelimiter: String, kvDelimiter: String) =
- split(kvpDelimiter).map { it.split(kvDelimiter, limit = 2).let { (k, v) -> k to v } }.toMap()
+ split(kvpDelimiter).associate { it.split(kvDelimiter, limit = 2).let { (k, v) -> k to v } }
 
 }
 

src/main/kotlin/Day04_PassportProcessing.kt

@@ -5,9 +5,9 @@ class Day06 : Day(6, title = "Custom Customs") {
  .map { it.split(" ").map(String::toSet) }
  .show("Customs answers groups")
 
- override fun part1() = customsAnswers.map { it.reduce(Set<Char>::union) }.sumBy { it.size }
+ override fun part1() = customsAnswers.map { it.reduce(Set<Char>::union) }.sumOf { it.size }
 
- override fun part2() = customsAnswers.map { it.reduce(Set<Char>::intersect) }.sumBy { it.size }
+ override fun part2() = customsAnswers.map { it.reduce(Set<Char>::intersect) }.sumOf { it.size }
 
 }
 

src/main/kotlin/Day06_CustomCustoms.kt

@@ -16,7 +16,7 @@ class Day07 : Day(7, title = "Handy Haversacks") {
  override fun part2() = "shiny gold".countContains()
 
  private fun String.countContains(): Int =
- rules[this]?.entries?.sumBy { (color, count) -> count + count * color.countContains() } ?: 0
+ rules[this]?.entries?.sumOf { (color, count) -> count + count * color.countContains() } ?: 0
 
 }
 

src/main/kotlin/Day07_HandyHaversacks.kt

@@ -27,7 +27,7 @@ class Day15 : Day(15, title = "Rambunctious Recitation") {
  val firstSpoken = startNumbers[0]
  var lastSpoken = startNumbers[lastIndex]
  for (index in lastIndex until n - 1) {
- val lastSeen = stats[lastSpoken].also { stats[lastSpoken] = index}
+ val lastSeen = stats[lastSpoken].also { stats[lastSpoken] = index }
  lastSpoken = if (lastSeen > 0 || lastSpoken == firstSpoken) {
  index - lastSeen
  } else {