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 a few misc build deps (#1500)

Browse Source
This commit is contained in:
Zac Sweers
2022-01-12 13:50:48 -05:00
committed by GitHub
parent 9ac2ddf2db
commit 1fdc61dc31
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gradle/libs.versions.toml
View File

@@ -3,9 +3,9 @@ autoService = "1.0"
gjf = "1.11.0" gjf = "1.11.0"
jvmTarget = "1.8" jvmTarget = "1.8"
kotlin = "1.6.10" kotlin = "1.6.10"
kotlinCompileTesting = "1.4.6" kotlinCompileTesting = "1.4.7"
kotlinpoet = "1.10.2" kotlinpoet = "1.10.2"
ksp = "1.6.0-1.0.1" ksp = "1.6.10-1.0.2"
ktlint = "0.41.0" ktlint = "0.41.0"
[plugins] [plugins]
@@ -14,7 +14,7 @@ japicmp = { id = "me.champeau.gradle.japicmp", version = "0.2.9" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.18.0" } mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.18.0" }
mavenShadow = { id = "com.github.johnrengelman.shadow", version = "7.0.0" } mavenShadow = { id = "com.github.johnrengelman.shadow", version = "7.0.0" }
spotless = { id = "com.diffplug.spotless", version = "5.14.2" } spotless = { id = "com.diffplug.spotless", version = "6.1.0" }
[libraries] [libraries]
asm = "org.ow2.asm:asm:9.2" asm = "org.ow2.asm:asm:9.2"
@@ -31,7 +31,7 @@ kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlin
kotlinxMetadata = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.4.0" kotlinxMetadata = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.4.0"
ksp = { module = "com.google.devtools.ksp:symbol-processing", version.ref = "ksp" } ksp = { module = "com.google.devtools.ksp:symbol-processing", version.ref = "ksp" }
ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" } ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
okio = "com.squareup.okio:okio:2.10.0" okio = "com.squareup.okio:okio:3.0.0"
# Test libs # Test libs
assertj = "org.assertj:assertj-core:3.11.1" assertj = "org.assertj:assertj-core:3.11.1"

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

@@ -39,7 +39,7 @@ import kotlin.reflect.full.declaredMemberProperties
/** Execute kotlinc to confirm that either files are generated or errors are printed. */ /** Execute kotlinc to confirm that either files are generated or errors are printed. */
class JsonClassCodegenProcessorTest { class JsonClassCodegenProcessorTest {
@Rule @JvmField var temporaryFolder: TemporaryFolder = TemporaryFolder() @Rule @JvmField val temporaryFolder: TemporaryFolder = TemporaryFolder()
@Test @Test
fun privateConstructor() { fun privateConstructor() {

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

@@ -34,7 +34,7 @@ import org.junit.rules.TemporaryFolder
/** Execute kotlinc to confirm that either files are generated or errors are printed. */ /** Execute kotlinc to confirm that either files are generated or errors are printed. */
class JsonClassSymbolProcessorTest { class JsonClassSymbolProcessorTest {
@Rule @JvmField var temporaryFolder: TemporaryFolder = TemporaryFolder() @Rule @JvmField val temporaryFolder: TemporaryFolder = TemporaryFolder()
@Test @Test
fun privateConstructor() { fun privateConstructor() {

0
moshi-kotlin/src/main/java/com/squareup/moshi/KotlinJsonAdapter.kt → moshi-kotlin/src/main/java/com/squareup/moshi/KotlinJsonAdapterFactory.kt
View File

0
moshi-kotlin/src/main/java/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapter.kt → moshi-kotlin/src/main/java/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapterFactory.kt
View File

6
moshi/build.gradle.kts
View File

@@ -60,7 +60,11 @@ tasks.withType<Test>().configureEach {
tasks.withType<KotlinCompile>() tasks.withType<KotlinCompile>()
.configureEach { .configureEach {
kotlinOptions { kotlinOptions {
val toAdd = mutableListOf("-Xopt-in=kotlin.RequiresOptIn", "-Xopt-in=kotlin.contracts.ExperimentalContracts") val toAdd = mutableListOf(
"-Xopt-in=kotlin.RequiresOptIn",
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
"-Xjvm-default=enable"
)
if (name.contains("test", true)) { if (name.contains("test", true)) {
toAdd += "-Xopt-in=kotlin.ExperimentalStdlibApi" toAdd += "-Xopt-in=kotlin.ExperimentalStdlibApi"
} }