From 42f1d18f648f8def4f543e0504a470aa1d37baee Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Fri, 28 Aug 2020 07:28:58 -0400 Subject: [PATCH] Update Okio and kotlin-compile-testing dependencies (#1198) * Update Okio to latest * Update kotlin-compile-testing to 1.2.10 * Update to KtLint 0.38.1 No changes affecting moshi, just support for mixing multiple kotlin versions in a project * Opportunistic disable kotlin-dsl warning This is noisy on every build * Update maven publish to 0.12.0 --- build.gradle.kts | 10 +-------- buildSrc/build.gradle.kts | 4 ++++ buildSrc/src/main/kotlin/Dependencies.kt | 8 +++---- gradle.properties | 2 ++ .../codegen/JsonClassCodegenProcessorTest.kt | 22 ------------------- 5 files changed, 11 insertions(+), 35 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b45ba4f..cf3f5cf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,6 @@ * limitations under the License. */ -import com.vanniktech.maven.publish.MavenPublishPluginExtension import org.gradle.jvm.tasks.Jar buildscript { @@ -24,7 +23,7 @@ buildscript { } plugins { - id("com.vanniktech.maven.publish") version "0.11.1" apply false + id("com.vanniktech.maven.publish") version "0.12.0" apply false id("org.jetbrains.dokka") version "0.10.1" apply false id("com.diffplug.spotless") version "5.2.0" } @@ -88,13 +87,6 @@ subprojects { // Configure publishing pluginManager.withPlugin("com.vanniktech.maven.publish") { - configure { - useLegacyMode = false - nexus { - groupId = "com.squareup" - } - } - // Configure automatic-module-name, but only for published modules @Suppress("UnstableApiUsage") val automaticModuleName = providers.gradleProperty("AUTOMATIC_MODULE_NAME") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 37acc02..c71531e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,6 +18,10 @@ plugins { `kotlin-dsl` } +kotlinDslPluginOptions { + experimentalWarning.set(false) +} + repositories { mavenCentral() } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 60c4d0e..05d67ca 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -18,9 +18,9 @@ object Dependencies { const val asm = "org.ow2.asm:asm:7.1" const val jsr305 = "com.google.code.findbugs:jsr305:3.0.2" - const val ktlintVersion = "0.38.0" - const val okio = "com.squareup.okio:okio:1.16.0" - const val okio2 = "com.squareup.okio:okio:2.1.0" + const val ktlintVersion = "0.38.1" + const val okio = "com.squareup.okio:okio:1.17.5" + const val okio2 = "com.squareup.okio:okio:2.8.0" object AutoService { private const val version = "1.0-rc7" @@ -49,7 +49,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.2.8" + const val compileTesting = "com.github.tschuchortdev:kotlin-compile-testing:1.2.10" const val junit = "junit:junit:4.12" const val truth = "com.google.truth:truth:1.0" } diff --git a/gradle.properties b/gradle.properties index ebd8621..6d0c1c2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,3 +29,5 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=square POM_DEVELOPER_NAME=Square, Inc. POM_DEVELOPER_URL=https://github.com/square/ +POM_INCEPTION_YEAR=2015 +SONATYPE_STAGING_PROFILE=com.squareup diff --git a/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt index 07c0f62..6e05d80 100644 --- a/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt +++ b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt @@ -38,7 +38,6 @@ import kotlin.reflect.full.declaredMemberProperties class JsonClassCodegenProcessorTest { @Rule @JvmField var temporaryFolder: TemporaryFolder = TemporaryFolder() - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun privateConstructor() { val result = compile( @@ -62,7 +61,6 @@ class JsonClassCodegenProcessorTest { assertThat(result.messages).contains("constructor is not internal or public") } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun privateConstructorParameter() { val result = compile( @@ -80,7 +78,6 @@ class JsonClassCodegenProcessorTest { assertThat(result.messages).contains("property a is not visible") } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun privateProperties() { val result = compile( @@ -101,7 +98,6 @@ class JsonClassCodegenProcessorTest { assertThat(result.messages).contains("property a is not visible") } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun interfacesNotSupported() { val result = compile( @@ -121,7 +117,6 @@ class JsonClassCodegenProcessorTest { ) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun interfacesDoNotErrorWhenGeneratorNotSet() { val result = compile( @@ -138,7 +133,6 @@ class JsonClassCodegenProcessorTest { assertThat(result.exitCode).isEqualTo(KotlinCompilation.ExitCode.OK) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun abstractClassesNotSupported() { val result = compile( @@ -158,7 +152,6 @@ class JsonClassCodegenProcessorTest { ) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun sealedClassesNotSupported() { val result = compile( @@ -178,7 +171,6 @@ class JsonClassCodegenProcessorTest { ) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun innerClassesNotSupported() { val result = compile( @@ -200,7 +192,6 @@ class JsonClassCodegenProcessorTest { ) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun enumClassesNotSupported() { val result = compile( @@ -245,7 +236,6 @@ class JsonClassCodegenProcessorTest { ) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun privateClassesNotSupported() { val result = compile( @@ -265,7 +255,6 @@ class JsonClassCodegenProcessorTest { ) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun objectDeclarationsNotSupported() { val result = compile( @@ -287,7 +276,6 @@ class JsonClassCodegenProcessorTest { ) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun objectExpressionsNotSupported() { val result = compile( @@ -309,7 +297,6 @@ class JsonClassCodegenProcessorTest { ) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun requiredTransientConstructorParameterFails() { val result = compile( @@ -329,7 +316,6 @@ class JsonClassCodegenProcessorTest { ) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun nonPropertyConstructorParameter() { val result = compile( @@ -350,7 +336,6 @@ class JsonClassCodegenProcessorTest { ) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun badGeneratedAnnotation() { val result = prepareCompilation( @@ -371,7 +356,6 @@ class JsonClassCodegenProcessorTest { ) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun multipleErrors() { val result = compile( @@ -393,7 +377,6 @@ class JsonClassCodegenProcessorTest { assertThat(result.messages).contains("property c is not visible") } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun extendPlatformType() { val result = compile( @@ -411,7 +394,6 @@ class JsonClassCodegenProcessorTest { assertThat(result.messages).contains("supertype java.util.Date is not a Kotlin type") } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun extendJavaType() { val result = compile( @@ -431,7 +413,6 @@ class JsonClassCodegenProcessorTest { .contains("supertype com.squareup.moshi.kotlin.codegen.JavaSuperclass is not a Kotlin type") } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun nonFieldApplicableQualifier() { val result = compile( @@ -459,7 +440,6 @@ class JsonClassCodegenProcessorTest { assertThat(result.messages).contains("JsonQualifier @UpperCase must support FIELD target") } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun nonRuntimeQualifier() { val result = compile( @@ -488,7 +468,6 @@ class JsonClassCodegenProcessorTest { assertThat(result.messages).contains("JsonQualifier @UpperCase must have RUNTIME retention") } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun `TypeAliases with the same backing type should share the same adapter`() { val result = compile( @@ -516,7 +495,6 @@ class JsonClassCodegenProcessorTest { ) } - @Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51") @Test fun `Processor should generate comprehensive proguard rules`() { val result = compile(