From f6f80a40ddf7be31d01dd7a8582c21f1b5a08003 Mon Sep 17 00:00:00 2001
From: Zac Sweers <zac.sweers@gmail.com>
Date: Thu, 3 Aug 2023 13:33:12 -0400
Subject: [PATCH] Update to Kotlin 1.9.0 (#1719)

---
 .github/workflows/build.yml                                 | 2 +-
 build.gradle.kts                                            | 6 +++---
 gradle/libs.versions.toml                                   | 6 +++---
 .../kotlin/codegen/apt/JsonClassCodegenProcessorTest.kt     | 3 ++-
 .../kotlin/codegen/ksp/JsonClassSymbolProcessorTest.kt      | 3 ++-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cd2d626..3cc5caa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '19'
+          java-version: '20'
           cache: 'gradle'
 
       - name: Test
diff --git a/build.gradle.kts b/build.gradle.kts
index d431fb8..94c97f5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.net.URL
+import java.net.URI
 
 buildscript {
   dependencies {
@@ -73,7 +73,7 @@ subprojects {
   pluginManager.withPlugin("java") {
     configure<JavaPluginExtension> {
       toolchain {
-        languageVersion.set(JavaLanguageVersion.of(19))
+        languageVersion.set(JavaLanguageVersion.of(20))
       }
     }
     if (project.name != "records-tests") {
@@ -115,7 +115,7 @@ allprojects {
       dokkaSourceSets.configureEach {
         skipDeprecated.set(true)
         externalDocumentationLink {
-          url.set(URL("https://square.github.io/okio/2.x/okio/"))
+          url.set(URI("https://square.github.io/okio/2.x/okio/").toURL())
         }
       }
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2a5f02c..321963d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,10 +2,10 @@
 autoService = "1.1.1"
 gjf = "1.15.0"
 jvmTarget = "1.8"
-kotlin = "1.8.22"
-kotlinCompileTesting = "0.2.1"
+kotlin = "1.9.0"
+kotlinCompileTesting = "0.3.1"
 kotlinpoet = "1.14.2"
-ksp = "1.8.22-1.0.11"
+ksp = "1.9.0-1.0.13"
 ktlint = "0.48.2"
 
 [plugins]
diff --git a/moshi-kotlin-codegen/src/test/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessorTest.kt b/moshi-kotlin-codegen/src/test/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessorTest.kt
index 28f86b6..b39b29d 100644
--- a/moshi-kotlin-codegen/src/test/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessorTest.kt
+++ b/moshi-kotlin-codegen/src/test/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessorTest.kt
@@ -20,6 +20,7 @@ import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.kotlin.codegen.api.Options.OPTION_GENERATED
 import com.squareup.moshi.kotlin.codegen.api.Options.OPTION_GENERATE_PROGUARD_RULES
+import com.tschuchort.compiletesting.JvmCompilationResult
 import com.tschuchort.compiletesting.KotlinCompilation
 import com.tschuchort.compiletesting.SourceFile
 import com.tschuchort.compiletesting.SourceFile.Companion.kotlin
@@ -787,7 +788,7 @@ class JsonClassCodegenProcessorTest {
       }
   }
 
-  private fun compile(vararg sourceFiles: SourceFile): KotlinCompilation.Result {
+  private fun compile(vararg sourceFiles: SourceFile): JvmCompilationResult {
     return prepareCompilation(*sourceFiles).compile()
   }
 
diff --git a/moshi-kotlin-codegen/src/test/java/com/squareup/moshi/kotlin/codegen/ksp/JsonClassSymbolProcessorTest.kt b/moshi-kotlin-codegen/src/test/java/com/squareup/moshi/kotlin/codegen/ksp/JsonClassSymbolProcessorTest.kt
index ef3d298..37966a8 100644
--- a/moshi-kotlin-codegen/src/test/java/com/squareup/moshi/kotlin/codegen/ksp/JsonClassSymbolProcessorTest.kt
+++ b/moshi-kotlin-codegen/src/test/java/com/squareup/moshi/kotlin/codegen/ksp/JsonClassSymbolProcessorTest.kt
@@ -18,6 +18,7 @@ package com.squareup.moshi.kotlin.codegen.ksp
 import com.google.common.truth.Truth.assertThat
 import com.squareup.moshi.kotlin.codegen.api.Options.OPTION_GENERATED
 import com.squareup.moshi.kotlin.codegen.api.Options.OPTION_GENERATE_PROGUARD_RULES
+import com.tschuchort.compiletesting.JvmCompilationResult
 import com.tschuchort.compiletesting.KotlinCompilation
 import com.tschuchort.compiletesting.SourceFile
 import com.tschuchort.compiletesting.SourceFile.Companion.java
@@ -838,7 +839,7 @@ class JsonClassSymbolProcessorTest {
       }
   }
 
-  private fun compile(vararg sourceFiles: SourceFile): KotlinCompilation.Result {
+  private fun compile(vararg sourceFiles: SourceFile): JvmCompilationResult {
     return prepareCompilation(*sourceFiles).compile()
   }
 }