fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-18 23:49:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to Kotlin 1.9.0 (#1719)

Browse Source
This commit is contained in:
Zac Sweers
2023-08-03 13:33:12 -04:00
committed by GitHub
parent 7732295aa8
commit f6f80a40dd
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -23,7 +23,7 @@ jobs:
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
distribution: 'zulu' distribution: 'zulu'
java-version: '19' java-version: '20'
cache: 'gradle' cache: 'gradle'
- name: Test - name: Test

6
build.gradle.kts
View File

@@ -5,7 +5,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.net.URL import java.net.URI
buildscript { buildscript {
dependencies { dependencies {
@@ -73,7 +73,7 @@ subprojects {
pluginManager.withPlugin("java") { pluginManager.withPlugin("java") {
configure<JavaPluginExtension> { configure<JavaPluginExtension> {
toolchain { toolchain {
languageVersion.set(JavaLanguageVersion.of(19)) languageVersion.set(JavaLanguageVersion.of(20))
} }
} }
if (project.name != "records-tests") { if (project.name != "records-tests") {
@@ -115,7 +115,7 @@ allprojects {
dokkaSourceSets.configureEach { dokkaSourceSets.configureEach {
skipDeprecated.set(true) skipDeprecated.set(true)
externalDocumentationLink { externalDocumentationLink {
url.set(URL("https://square.github.io/okio/2.x/okio/")) url.set(URI("https://square.github.io/okio/2.x/okio/").toURL())
} }
} }
} }

6
gradle/libs.versions.toml
View File

@@ -2,10 +2,10 @@
autoService = "1.1.1" autoService = "1.1.1"
gjf = "1.15.0" gjf = "1.15.0"
jvmTarget = "1.8" jvmTarget = "1.8"
kotlin = "1.8.22" kotlin = "1.9.0"
kotlinCompileTesting = "0.2.1" kotlinCompileTesting = "0.3.1"
kotlinpoet = "1.14.2" kotlinpoet = "1.14.2"
ksp = "1.8.22-1.0.11" ksp = "1.9.0-1.0.13"
ktlint = "0.48.2" ktlint = "0.48.2"
[plugins] [plugins]

3
moshi-kotlin-codegen/src/test/java/com/squareup/moshi/kotlin/codegen/apt/JsonClassCodegenProcessorTest.kt
View File

@@ -20,6 +20,7 @@ import com.squareup.moshi.JsonAdapter
import com.squareup.moshi.JsonReader import com.squareup.moshi.JsonReader
import com.squareup.moshi.kotlin.codegen.api.Options.OPTION_GENERATED import com.squareup.moshi.kotlin.codegen.api.Options.OPTION_GENERATED
import com.squareup.moshi.kotlin.codegen.api.Options.OPTION_GENERATE_PROGUARD_RULES 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.KotlinCompilation
import com.tschuchort.compiletesting.SourceFile import com.tschuchort.compiletesting.SourceFile
import com.tschuchort.compiletesting.SourceFile.Companion.kotlin 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() return prepareCompilation(*sourceFiles).compile()
} }

3
moshi-kotlin-codegen/src/test/java/com/squareup/moshi/kotlin/codegen/ksp/JsonClassSymbolProcessorTest.kt
View File

@@ -18,6 +18,7 @@ package com.squareup.moshi.kotlin.codegen.ksp
import com.google.common.truth.Truth.assertThat 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_GENERATED
import com.squareup.moshi.kotlin.codegen.api.Options.OPTION_GENERATE_PROGUARD_RULES 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.KotlinCompilation
import com.tschuchort.compiletesting.SourceFile import com.tschuchort.compiletesting.SourceFile
import com.tschuchort.compiletesting.SourceFile.Companion.java 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() return prepareCompilation(*sourceFiles).compile()
} }
} }