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
This commit is contained in:
Zac Sweers
2020-08-28 07:28:58 -04:00
committed by GitHub
parent 538890e8c0
commit 42f1d18f64
5 changed files with 11 additions and 35 deletions

View File

@@ -14,7 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
import com.vanniktech.maven.publish.MavenPublishPluginExtension
import org.gradle.jvm.tasks.Jar import org.gradle.jvm.tasks.Jar
buildscript { buildscript {
@@ -24,7 +23,7 @@ buildscript {
} }
plugins { 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("org.jetbrains.dokka") version "0.10.1" apply false
id("com.diffplug.spotless") version "5.2.0" id("com.diffplug.spotless") version "5.2.0"
} }
@@ -88,13 +87,6 @@ subprojects {
// Configure publishing // Configure publishing
pluginManager.withPlugin("com.vanniktech.maven.publish") { pluginManager.withPlugin("com.vanniktech.maven.publish") {
configure<MavenPublishPluginExtension> {
useLegacyMode = false
nexus {
groupId = "com.squareup"
}
}
// Configure automatic-module-name, but only for published modules // Configure automatic-module-name, but only for published modules
@Suppress("UnstableApiUsage") @Suppress("UnstableApiUsage")
val automaticModuleName = providers.gradleProperty("AUTOMATIC_MODULE_NAME") val automaticModuleName = providers.gradleProperty("AUTOMATIC_MODULE_NAME")

View File

@@ -18,6 +18,10 @@ plugins {
`kotlin-dsl` `kotlin-dsl`
} }
kotlinDslPluginOptions {
experimentalWarning.set(false)
}
repositories { repositories {
mavenCentral() mavenCentral()
} }

View File

@@ -18,9 +18,9 @@ object Dependencies {
const val asm = "org.ow2.asm:asm:7.1" const val asm = "org.ow2.asm:asm:7.1"
const val jsr305 = "com.google.code.findbugs:jsr305:3.0.2" const val jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
const val ktlintVersion = "0.38.0" const val ktlintVersion = "0.38.1"
const val okio = "com.squareup.okio:okio:1.16.0" const val okio = "com.squareup.okio:okio:1.17.5"
const val okio2 = "com.squareup.okio:okio:2.1.0" const val okio2 = "com.squareup.okio:okio:2.8.0"
object AutoService { object AutoService {
private const val version = "1.0-rc7" private const val version = "1.0-rc7"
@@ -49,7 +49,7 @@ object Dependencies {
object Testing { object Testing {
const val assertj = "org.assertj:assertj-core:3.11.1" 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 junit = "junit:junit:4.12"
const val truth = "com.google.truth:truth:1.0" const val truth = "com.google.truth:truth:1.0"
} }

View File

@@ -29,3 +29,5 @@ POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=square POM_DEVELOPER_ID=square
POM_DEVELOPER_NAME=Square, Inc. POM_DEVELOPER_NAME=Square, Inc.
POM_DEVELOPER_URL=https://github.com/square/ POM_DEVELOPER_URL=https://github.com/square/
POM_INCEPTION_YEAR=2015
SONATYPE_STAGING_PROFILE=com.squareup

View File

@@ -38,7 +38,6 @@ import kotlin.reflect.full.declaredMemberProperties
class JsonClassCodegenProcessorTest { class JsonClassCodegenProcessorTest {
@Rule @JvmField var temporaryFolder: TemporaryFolder = TemporaryFolder() @Rule @JvmField var temporaryFolder: TemporaryFolder = TemporaryFolder()
@Ignore("Temporarily ignored pending a new KCT release https://github.com/tschuchortdev/kotlin-compile-testing/issues/51")
@Test @Test
fun privateConstructor() { fun privateConstructor() {
val result = compile( val result = compile(
@@ -62,7 +61,6 @@ class JsonClassCodegenProcessorTest {
assertThat(result.messages).contains("constructor is not internal or public") 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 @Test
fun privateConstructorParameter() { fun privateConstructorParameter() {
val result = compile( val result = compile(
@@ -80,7 +78,6 @@ class JsonClassCodegenProcessorTest {
assertThat(result.messages).contains("property a is not visible") 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 @Test
fun privateProperties() { fun privateProperties() {
val result = compile( val result = compile(
@@ -101,7 +98,6 @@ class JsonClassCodegenProcessorTest {
assertThat(result.messages).contains("property a is not visible") 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 @Test
fun interfacesNotSupported() { fun interfacesNotSupported() {
val result = compile( 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 @Test
fun interfacesDoNotErrorWhenGeneratorNotSet() { fun interfacesDoNotErrorWhenGeneratorNotSet() {
val result = compile( val result = compile(
@@ -138,7 +133,6 @@ class JsonClassCodegenProcessorTest {
assertThat(result.exitCode).isEqualTo(KotlinCompilation.ExitCode.OK) 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 @Test
fun abstractClassesNotSupported() { fun abstractClassesNotSupported() {
val result = compile( 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 @Test
fun sealedClassesNotSupported() { fun sealedClassesNotSupported() {
val result = compile( 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 @Test
fun innerClassesNotSupported() { fun innerClassesNotSupported() {
val result = compile( 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 @Test
fun enumClassesNotSupported() { fun enumClassesNotSupported() {
val result = compile( 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 @Test
fun privateClassesNotSupported() { fun privateClassesNotSupported() {
val result = compile( 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 @Test
fun objectDeclarationsNotSupported() { fun objectDeclarationsNotSupported() {
val result = compile( 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 @Test
fun objectExpressionsNotSupported() { fun objectExpressionsNotSupported() {
val result = compile( 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 @Test
fun requiredTransientConstructorParameterFails() { fun requiredTransientConstructorParameterFails() {
val result = compile( 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 @Test
fun nonPropertyConstructorParameter() { fun nonPropertyConstructorParameter() {
val result = compile( 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 @Test
fun badGeneratedAnnotation() { fun badGeneratedAnnotation() {
val result = prepareCompilation( 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 @Test
fun multipleErrors() { fun multipleErrors() {
val result = compile( val result = compile(
@@ -393,7 +377,6 @@ class JsonClassCodegenProcessorTest {
assertThat(result.messages).contains("property c is not visible") 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 @Test
fun extendPlatformType() { fun extendPlatformType() {
val result = compile( val result = compile(
@@ -411,7 +394,6 @@ class JsonClassCodegenProcessorTest {
assertThat(result.messages).contains("supertype java.util.Date is not a Kotlin type") 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 @Test
fun extendJavaType() { fun extendJavaType() {
val result = compile( val result = compile(
@@ -431,7 +413,6 @@ class JsonClassCodegenProcessorTest {
.contains("supertype com.squareup.moshi.kotlin.codegen.JavaSuperclass is not a Kotlin type") .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 @Test
fun nonFieldApplicableQualifier() { fun nonFieldApplicableQualifier() {
val result = compile( val result = compile(
@@ -459,7 +440,6 @@ class JsonClassCodegenProcessorTest {
assertThat(result.messages).contains("JsonQualifier @UpperCase must support FIELD target") 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 @Test
fun nonRuntimeQualifier() { fun nonRuntimeQualifier() {
val result = compile( val result = compile(
@@ -488,7 +468,6 @@ class JsonClassCodegenProcessorTest {
assertThat(result.messages).contains("JsonQualifier @UpperCase must have RUNTIME retention") 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 @Test
fun `TypeAliases with the same backing type should share the same adapter`() { fun `TypeAliases with the same backing type should share the same adapter`() {
val result = compile( 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 @Test
fun `Processor should generate comprehensive proguard rules`() { fun `Processor should generate comprehensive proguard rules`() {
val result = compile( val result = compile(