From 801ff170a03a19a63c7da2d4d1be570e15eefd3e Mon Sep 17 00:00:00 2001 From: Nacho Lopez Date: Mon, 21 Nov 2022 16:44:03 +0100 Subject: [PATCH] Update versions for kotlin and detekt --- gradle/libs.versions.toml | 4 ++-- .../detekt/ComposeCompositionLocalAllowlistCheckTest.kt | 2 +- .../rules/detekt/ComposeCompositionLocalNamingCheckTest.kt | 2 +- .../detekt/ComposeContentEmitterReturningValuesCheckTest.kt | 2 +- .../compose/rules/detekt/ComposeModifierReusedCheckTest.kt | 6 +++--- .../rules/detekt/ComposeModifierWithoutDefaultCheckTest.kt | 2 +- .../rules/detekt/ComposeMultipleContentEmittersCheckTest.kt | 6 +++--- .../rules/detekt/ComposeMutableParametersCheckTest.kt | 2 +- .../twitter/compose/rules/detekt/ComposeNamingCheckTest.kt | 4 ++-- .../compose/rules/detekt/ComposeParameterOrderCheckTest.kt | 2 +- .../compose/rules/detekt/ComposePreviewNamingCheckTest.kt | 4 ++-- .../compose/rules/detekt/ComposePreviewPublicCheckTest.kt | 4 ++-- .../compose/rules/detekt/ComposeRememberMissingCheckTest.kt | 4 ++-- .../rules/detekt/ComposeUnstableCollectionsCheckTest.kt | 2 +- .../rules/detekt/ComposeViewModelForwardingCheckTest.kt | 2 +- .../rules/detekt/ComposeViewModelInjectionCheckTest.kt | 4 ++-- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 087c7be8..4953c7b6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -kotlin = "1.7.20" +kotlin = "1.7.21" ktlint = "0.47.1" -detekt = "1.21.0" +detekt = "1.22.0" junit = "5.9.1" [libraries] diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeCompositionLocalAllowlistCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeCompositionLocalAllowlistCheckTest.kt index 43fb6b14..2434ff7b 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeCompositionLocalAllowlistCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeCompositionLocalAllowlistCheckTest.kt @@ -29,7 +29,7 @@ class ComposeCompositionLocalAllowlistCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(1, 13), SourceLocation(2, 14), SourceLocation(3, 5), diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeCompositionLocalNamingCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeCompositionLocalNamingCheckTest.kt index 2fd8ed85..fd4fe0b7 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeCompositionLocalNamingCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeCompositionLocalNamingCheckTest.kt @@ -24,7 +24,7 @@ class ComposeCompositionLocalNamingCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(1, 5), SourceLocation(2, 5) ) diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeContentEmitterReturningValuesCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeContentEmitterReturningValuesCheckTest.kt index e24beaa6..f1698c7e 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeContentEmitterReturningValuesCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeContentEmitterReturningValuesCheckTest.kt @@ -43,7 +43,7 @@ class ComposeContentEmitterReturningValuesCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(2, 5), SourceLocation(7, 5), SourceLocation(16, 5) diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeModifierReusedCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeModifierReusedCheckTest.kt index 7ab84a31..30be49ae 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeModifierReusedCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeModifierReusedCheckTest.kt @@ -64,7 +64,7 @@ class ComposeModifierReusedCheckTest { val errors = rule.lint(code) assertThat(errors) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(3, 5), SourceLocation(4, 9), SourceLocation(9, 5), @@ -110,7 +110,7 @@ class ComposeModifierReusedCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors).hasSize(6) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(3, 5), SourceLocation(4, 9), SourceLocation(9, 5), @@ -154,7 +154,7 @@ class ComposeModifierReusedCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors).hasSize(7) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(6, 5), SourceLocation(8, 9), SourceLocation(9, 9), diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeModifierWithoutDefaultCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeModifierWithoutDefaultCheckTest.kt index a20e0f06..cd27532b 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeModifierWithoutDefaultCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeModifierWithoutDefaultCheckTest.kt @@ -25,7 +25,7 @@ class ComposeModifierWithoutDefaultCheckTest { """.trimIndent() val errors = rule.lint(composableCode) - assertThat(errors).hasSourceLocations( + assertThat(errors).hasStartSourceLocations( SourceLocation(2, 15), SourceLocation(4, 46) ) diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeMultipleContentEmittersCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeMultipleContentEmittersCheckTest.kt index 60a2872a..043291df 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeMultipleContentEmittersCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeMultipleContentEmittersCheckTest.kt @@ -75,7 +75,7 @@ class ComposeMultipleContentEmittersCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors).hasSize(2) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(2, 5), SourceLocation(7, 5) ) @@ -114,7 +114,7 @@ class ComposeMultipleContentEmittersCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors).hasSize(2) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(6, 5), SourceLocation(19, 5) ) @@ -141,7 +141,7 @@ class ComposeMultipleContentEmittersCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors).hasSize(1) - .hasSourceLocation(2, 5) + .hasStartSourceLocation(2, 5) assertThat(errors.first()).hasMessage(ComposeMultipleContentEmitters.MultipleContentEmittersDetected) } } diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeMutableParametersCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeMutableParametersCheckTest.kt index 8d06052d..ca95229c 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeMutableParametersCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeMutableParametersCheckTest.kt @@ -30,7 +30,7 @@ class ComposeMutableParametersCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors).hasSize(4) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(2, 15), SourceLocation(4, 15), SourceLocation(6, 15), diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeNamingCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeNamingCheckTest.kt index 3a5b43b4..3e7ab136 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeNamingCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeNamingCheckTest.kt @@ -81,7 +81,7 @@ class ComposeNamingCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors).hasSize(1) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(2, 5) ) assertThat(errors.first()).hasMessage(ComposeNaming.ComposablesThatReturnResultsShouldBeLowercase) @@ -101,7 +101,7 @@ class ComposeNamingCheckTest { val errors = rule.lint(code) assertThat(errors).hasSize(2) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(2, 5), SourceLocation(5, 5) ) diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeParameterOrderCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeParameterOrderCheckTest.kt index c620bbf2..a415426e 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeParameterOrderCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeParameterOrderCheckTest.kt @@ -53,7 +53,7 @@ class ComposeParameterOrderCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors).hasSize(5) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(2, 5), SourceLocation(5, 5), SourceLocation(8, 5), diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposePreviewNamingCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposePreviewNamingCheckTest.kt index 75c4da92..9fe10244 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposePreviewNamingCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposePreviewNamingCheckTest.kt @@ -61,7 +61,7 @@ class ComposePreviewNamingCheckTest { annotation class WithBananaPreviews """.trimIndent() val errors = rule.lint(code) - assertThat(errors).hasSourceLocations( + assertThat(errors).hasStartSourceLocations( SourceLocation(2, 18), SourceLocation(4, 18), SourceLocation(6, 18) @@ -84,7 +84,7 @@ class ComposePreviewNamingCheckTest { annotation class BananaPreview """.trimIndent() val errors = rule.lint(code) - assertThat(errors).hasSourceLocations( + assertThat(errors).hasStartSourceLocations( SourceLocation(3, 18), SourceLocation(6, 18) ) diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposePreviewPublicCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposePreviewPublicCheckTest.kt index 482bc005..0ea304e2 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposePreviewPublicCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposePreviewPublicCheckTest.kt @@ -59,7 +59,7 @@ class ComposePreviewPublicCheckTest { fun MyComposable() { } """.trimIndent() val errors = ruleWithParams.lint(code) - assertThat(errors).hasSourceLocations( + assertThat(errors).hasStartSourceLocations( SourceLocation(3, 5), SourceLocation(6, 5) ) @@ -83,7 +83,7 @@ class ComposePreviewPublicCheckTest { } """.trimIndent() val errors = rule.lint(code) - assertThat(errors).hasSourceLocations( + assertThat(errors).hasStartSourceLocations( SourceLocation(3, 5), SourceLocation(7, 5) ) diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeRememberMissingCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeRememberMissingCheckTest.kt index 16e2f050..c491d19e 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeRememberMissingCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeRememberMissingCheckTest.kt @@ -40,7 +40,7 @@ class ComposeRememberMissingCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors).hasSize(2) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(3, 21), SourceLocation(6, 45) ) @@ -109,7 +109,7 @@ class ComposeRememberMissingCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors).hasSize(2) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(3, 21), SourceLocation(6, 45) ) diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeUnstableCollectionsCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeUnstableCollectionsCheckTest.kt index 1c77572e..726bb9a5 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeUnstableCollectionsCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeUnstableCollectionsCheckTest.kt @@ -28,7 +28,7 @@ class ComposeUnstableCollectionsCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(2, 18), SourceLocation(4, 18), SourceLocation(6, 18) diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeViewModelForwardingCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeViewModelForwardingCheckTest.kt index 7888bd89..7b373296 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeViewModelForwardingCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeViewModelForwardingCheckTest.kt @@ -71,7 +71,7 @@ class ComposeViewModelForwardingCheckTest { } """.trimIndent() val errors = rule.lint(code) - assertThat(errors).hasSize(1).hasSourceLocation(3, 5) + assertThat(errors).hasSize(1).hasStartSourceLocation(3, 5) assertThat(errors.first()).hasMessage(ComposeViewModelForwarding.AvoidViewModelForwarding) } diff --git a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeViewModelInjectionCheckTest.kt b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeViewModelInjectionCheckTest.kt index e0d5eb0b..b29b981a 100644 --- a/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeViewModelInjectionCheckTest.kt +++ b/rules/detekt/src/test/kotlin/com/twitter/compose/rules/detekt/ComposeViewModelInjectionCheckTest.kt @@ -68,7 +68,7 @@ class ComposeViewModelInjectionCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors).hasSize(3) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(3, 9), SourceLocation(7, 9), SourceLocation(11, 9) @@ -95,7 +95,7 @@ class ComposeViewModelInjectionCheckTest { """.trimIndent() val errors = rule.lint(code) assertThat(errors).hasSize(2) - .hasSourceLocations( + .hasStartSourceLocations( SourceLocation(4, 13), SourceLocation(6, 13) )