Upgrade Kotlin and other dependencies

To get a list of dependencies that could be updated, I used the versions
plugin.

    gradle dependencyUpdates -Drevision=release

There were a number of libraries that I couldn't get upgraded quickly
(dokka and ktlint among them), but hopefully this helps move thing
forward.

build.gradle.kts

@@ -29,6 +29,7 @@ buildscript {
     classpath(Dependencies.Kotlin.Serialization.gradlePlugin)
     classpath(Dependencies.ktlint)
     classpath(Dependencies.mavenPublish)
+    classpath(Dependencies.versions)
   }
 
   repositories {
@@ -105,7 +106,7 @@ subprojects {
 }
 
 apply(from = rootProject.file(".buildscript/binary-validation.gradle"))
-
+apply(plugin = "com.github.ben-manes.versions")
 // This is intentionally *not* applied to subprojects. When building subprojects' kdoc for maven
 // javadocs artifacts, we want to use the default config. This config is for the
 // statically-generated documentation site.

buildSrc/src/main/java/Dependencies.kt

@@ -89,6 +89,7 @@ object Dependencies {
   }
 
   const val mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:_"
+  const val versions = "com.github.ben-manes:gradle-versions-plugin:_"
   const val ktlint = "org.jlleitschuh.gradle:ktlint-gradle:_"
   const val lanterna = "com.googlecode.lanterna:lanterna:_"
   const val detekt = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:_"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

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

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

samples/dungeon/common/src/main/java/com/squareup/sample/dungeon/board/Parser.kt

@@ -17,9 +17,7 @@ package com.squareup.sample.dungeon.board
 
 import com.squareup.sample.dungeon.board.BoardCell.Companion.EMPTY_FLOOR
 import kotlinx.serialization.SerializationException
-import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
 import okio.BufferedSource
 
 private const val YAML_DELIMITER = "---"
@@ -41,11 +39,10 @@ fun BufferedSource.parseBoardMetadata(): BoardMetadata =
  * @return The [BoardMetadata], or null if the source does not start with "`---\n`".
  * @see parseBoardMetadata
  */
-@OptIn(UnstableDefault::class)
 fun BufferedSource.parseBoardMetadataOrNull(): BoardMetadata? = readHeader()?.let { header ->
   try {
-    Json(JsonConfiguration(isLenient = true))
-        .parse(BoardMetadata.serializer(), header)
+    Json { isLenient = true }
+        .decodeFromString(BoardMetadata.serializer(), header)
   } catch (e: SerializationException) {
     throw IllegalArgumentException("Error parsing board metadata.", e)
   }
@@ -70,7 +67,7 @@ fun BufferedSource.parseBoard(metadata: BoardMetadata = parseBoardMetadata()): B
   val height = rows.size
   val width = rows.asSequence()
       .map { it.size }
-      .max()!!
+      .maxOrNull()!!
 
   // Pad short rows.
   rows = rows.map { row ->
@@ -106,7 +103,7 @@ private fun BufferedSource.readHeader(): String? = buildString {
   while (true) {
     val line = readUtf8Line() ?: throw IllegalArgumentException("Expected --- but found EOF.")
     if (line == YAML_DELIMITER) return@buildString
-    appendln(line)
+    appendLine(line)
   }
 }
 

samples/hello-terminal/todo-terminal-app/src/main/java/com/squareup/sample/hellotodo/TodoWorkflow.kt

@@ -82,10 +82,9 @@ class TodoWorkflow : TerminalWorkflow,
     context.runningWorker(props.keyStrokes) { onKeystroke(it) }
 
     return TerminalRendering(buildString {
-      @Suppress("UNCHECKED_CAST")
-      appendln(state.renderTitle(props, context))
-      appendln(renderSelection(state.titleSeparator, false))
-      appendln(state.renderItems(props, context))
+      appendLine(state.renderTitle(props, context))
+      appendLine(renderSelection(state.titleSeparator, false))
+      appendLine(state.renderItems(props, context))
     })
   }
 

versions.properties

@@ -3,46 +3,47 @@
 ## Dependencies and Plugin versions with their available updates
 ## Generated by $ ./gradlew refreshVersions
 ## Please, don't put extra comments in that file yet, keeping them is not supported yet.
-plugin.android=4.0.0
+plugin.android=4.0.1
 version.androidx.activity=1.1.0
 version.androidx.appcompat=1.1.0
-version.androidx.constraintlayout=1.1.3
+version.androidx.constraintlayout=2.0.1
 version.androidx.databinding=4.0.0
 version.androidx.fragment=1.2.5
 version.androidx.gridlayout=1.0.0
 version.androidx.lifecycle=2.2.0
 version.androidx.recyclerview=1.1.0
 version.androidx.savedstate=1.0.0
-version.androidx.test.espresso=3.2.0
-version.androidx.test.ext.junit=1.1.1
+version.androidx.test.espresso=3.3.0
+version.androidx.test.ext.junit=1.1.2
 version.androidx.test.uiautomator=2.2.0
-version.androidx.test=1.2.0
+version.androidx.test=1.3.0
 version.androidx.transition=1.3.1
 version.com.android.tools..desugar_jdk_libs=1.0.9
+version.com.github.ben-manes..gradle-versions-plugin=0.33.0
 version.com.google.truth..truth=1.0.1
 version.com.googlecode.lanterna..lanterna=3.0.3
 version.com.jakewharton.timber..timber=4.7.1
 version.com.nhaarman..mockito-kotlin-kt1.1=1.6.0
 version.com.squareup..seismic=1.0.2
-version.com.vanniktech..gradle-maven-publish-plugin=0.12.0
+version.com.vanniktech..gradle-maven-publish-plugin=0.13.0
 version.cycler=0.1.4
 version.google.android.material=1.1.0
 version.io.gitlab.arturbosch.detekt..detekt-gradle-plugin=1.0.1
 version.io.mockk..mockk=1.10.0
 version.io.reactivex.rxjava2..rxandroid=2.1.1
 version.io.reactivex.rxjava2..rxjava=2.2.19
 version.junit.junit=4.13
-version.kotlin=1.3.72
-version.kotlinx.coroutines=1.3.7
-version.kotlinx.serialization=0.20.0
-version.me.champeau.gradle..jmh-gradle-plugin=0.5.0
-version.moshi=1.9.3
+version.kotlin=1.4.10
+version.kotlinx.coroutines=1.3.9
+version.kotlinx.serialization=1.0-M1-1.4.0-rc
+version.me.champeau.gradle..jmh-gradle-plugin=0.5.1
+version.moshi=1.10.0
 version.okio=2.7.0
 version.org.hamcrest..hamcrest-core=2.2
 version.org.jetbrains..annotations=19.0.0
 version.org.jetbrains.dokka..dokka-gradle-plugin=0.10.1
-version.org.jetbrains.kotlin..kotlin-reflect=1.3.72
+version.org.jetbrains.kotlin..kotlin-reflect=1.4.10
 version.org.jetbrains.kotlinx..binary-compatibility-validator=0.2.3
 version.org.jlleitschuh.gradle..ktlint-gradle=9.2.1
-version.org.openjdk.jmh..jmh-core=1.23
-version.org.openjdk.jmh..jmh-generator-annprocess=1.23
+version.org.openjdk.jmh..jmh-core=1.25.2
+version.org.openjdk.jmh..jmh-generator-annprocess=1.25.2

workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkflowTestRuntime.kt

@@ -435,9 +435,9 @@ private fun <T> unwrapCancellationCause(block: () -> T): T {
   } catch (e: CancellationException) {
     throw generateSequence(e as Throwable) { e.cause }
         // Stop the sequence if an exception's cause is itself.
-        .scanReduce { error, cause ->
+        .runningReduce { error, cause ->
           if (cause !is CancellationException || cause === error) throw cause
-          return@scanReduce cause
+          return@runningReduce cause
         }
         .firstOrNull { it !is CancellationException }
         ?: e