From b33a94dfc171489125a2faa34e91f62194a34df2 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Mon, 29 Mar 2021 21:37:54 -0400 Subject: [PATCH] Update more dependencies (#1319) --- adapters/japicmp/build.gradle.kts | 8 ++++---- build.gradle.kts | 10 +++++----- buildSrc/src/main/kotlin/Dependencies.kt | 6 +++--- moshi/japicmp/build.gradle.kts | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/adapters/japicmp/build.gradle.kts b/adapters/japicmp/build.gradle.kts index d20d748..27ac67e 100644 --- a/adapters/japicmp/build.gradle.kts +++ b/adapters/japicmp/build.gradle.kts @@ -36,11 +36,11 @@ val japicmp = tasks.register("japicmp") { dependsOn("jar") oldClasspath = baseline newClasspath = latest - onlyBinaryIncompatibleModified = true - failOnModification = true + isOnlyBinaryIncompatibleModified = true + isFailOnModification = true txtOutputFile = file("$buildDir/reports/japi.txt") - ignoreMissingClasses = true - includeSynthetic = true + isIgnoreMissingClasses = true + isIncludeSynthetic = true } tasks.named("check").configure { diff --git a/build.gradle.kts b/build.gradle.kts index 85c96f6..413d0ad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,11 +30,11 @@ buildscript { } plugins { - id("com.vanniktech.maven.publish") version "0.13.0" apply false - id("org.jetbrains.dokka") version "1.4.10" apply false - id("com.diffplug.spotless") version "5.6.0" - id("ru.vyarus.animalsniffer") version "1.5.1" apply false - id("me.champeau.gradle.japicmp") version "0.2.8" apply false + id("com.vanniktech.maven.publish") version "0.14.2" apply false + id("org.jetbrains.dokka") version "1.4.30" apply false + id("com.diffplug.spotless") version "5.11.0" + id("ru.vyarus.animalsniffer") version "1.5.3" apply false + id("me.champeau.gradle.japicmp") version "0.2.9" apply false } spotless { diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index c5a8563..ac6f79c 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -39,12 +39,12 @@ object Dependencies { } object Kotlin { - const val version = "1.4.30" + const val version = "1.4.31" const val metadata = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.2.0" } object KotlinPoet { - private const val version = "1.7.2" + private const val version = "1.8.0" const val kotlinPoet = "com.squareup:kotlinpoet:$version" const val metadata = "com.squareup:kotlinpoet-metadata-specs:$version" const val metadataSpecs = "com.squareup:kotlinpoet-metadata-specs:$version" @@ -54,7 +54,7 @@ object Dependencies { object Testing { const val assertj = "org.assertj:assertj-core:3.11.1" const val compileTesting = "com.github.tschuchortdev:kotlin-compile-testing:1.3.6" - const val junit = "junit:junit:4.13.1" + const val junit = "junit:junit:4.13.2" const val truth = "com.google.truth:truth:1.0.1" } } diff --git a/moshi/japicmp/build.gradle.kts b/moshi/japicmp/build.gradle.kts index 2332afc..032aa69 100644 --- a/moshi/japicmp/build.gradle.kts +++ b/moshi/japicmp/build.gradle.kts @@ -36,11 +36,11 @@ val japicmp = tasks.register("japicmp") { dependsOn("jar") oldClasspath = baseline newClasspath = latest - onlyBinaryIncompatibleModified = true - failOnModification = true + isOnlyBinaryIncompatibleModified = true + isFailOnModification = true txtOutputFile = file("$buildDir/reports/japi.txt") - ignoreMissingClasses = true - includeSynthetic = true + isIgnoreMissingClasses = true + isIncludeSynthetic = true classExcludes = listOf( "com.squareup.moshi.internal.NonNullJsonAdapter", // Internal. "com.squareup.moshi.internal.NullSafeJsonAdapter", // Internal.