chore: upgrade dependencies (#777)

Author: lauzadis

.changes/6aec9cfa-ed4d-4b74-8e85-17cf76d7e0f2.json

@@ -0,0 +1,5 @@
+{
+    "id": "6aec9cfa-ed4d-4b74-8e85-17cf76d7e0f2",
+    "type": "misc",
+    "description": "Upgrade dependencies"
+}

.editorconfig

@@ -1,6 +1,7 @@
 [*.{kt,kts}]
 # ktlint rules to disable
-disabled_rules=no-wildcard-imports,filename
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_filename = disabled
 
 # enable trailing commas per JetBrains recommendation
 # (https://kotlinlang.org/docs/coding-conventions.html#trailing-commas)

gradle.properties

@@ -13,35 +13,35 @@ kotlinVersion=1.7.10
 dokkaVersion=1.7.10
 
 # kotlin libraries
-coroutinesVersion=1.6.3
-ktorVersion=2.0.2
-atomicFuVersion=0.18.3
-kotlinxSerializationVersion=1.3.3
-jsoupVersion=1.14.3
-okHttpVersion=5.0.0-alpha.10
-okioVersion=3.2.0
+coroutinesVersion=1.6.4
+ktorVersion=2.2.2
+atomicFuVersion=0.19.0
+kotlinxSerializationVersion=1.4.1
+jsoupVersion=1.15.3
+okHttpVersion=5.0.0-alpha.11
+okioVersion=3.3.0
 
 # codegen
 smithyVersion=1.26.1
 smithyGradleVersion=0.6.0
 
 # testing/utility
-junitVersion=5.8.2
-ktlintVersion=0.46.1
-kotestVersion=5.4.1
-kotlinCompileTestingVersion=1.4.8
+junitVersion=5.9.2
+ktlintVersion=0.48.1
+kotestVersion=5.5.4
+kotlinCompileTestingVersion=1.4.9
 jacocoVersion=0.8.8
-kotlinxBenchmarkVersion=0.4.2
-testContainersVersion=1.17.2
+kotlinxBenchmarkVersion=0.4.6
+testContainersVersion=1.17.6
 
 # serialization
-kamlVersion=0.36.0
+kamlVersion=0.49.0
 
 # logging
-kotlinLoggingVersion=2.1.21
+kotlinLoggingVersion=3.0.0
 
 # logging - JVM
-slf4jVersion=1.7.36
+slf4jVersion=2.0.6
 
 # crt
 crtKotlinVersion=0.6.7

ktlint-rules/src/main/kotlin/software/aws/ktlint/rules/CopyrightHeaderRule.kt

@@ -3,12 +3,7 @@ package software.aws.ktlint.rules
 import com.pinterest.ktlint.core.Rule
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 
-class CopyrightHeaderRule : Rule(
-    "copyright-header",
-    visitorModifiers = setOf(
-        VisitorModifier.RunOnRootNodeOnly
-    )
-) {
+class CopyrightHeaderRule : Rule("copyright-header") {
     companion object {
         private val header = """
             /*
@@ -17,13 +12,14 @@ class CopyrightHeaderRule : Rule(
              */
         """.trimIndent()
     }
-    override fun visit(
+    override fun beforeVisitChildNodes(
         node: ASTNode,
         autoCorrect: Boolean,
         emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
     ) {
         if (!node.text.startsWith(header)) {
             emit(node.startOffset, "Missing or incorrect file header", false)
         }
+        stopTraversalOfAST() // traverse the root node only
     }
 }

ktlint-rules/src/main/kotlin/software/aws/ktlint/rules/CustomRuleSetProvider.kt

@@ -1,13 +1,12 @@
 package software.aws.ktlint.rules
 
-import com.pinterest.ktlint.core.RuleSet
-import com.pinterest.ktlint.core.RuleSetProvider
+import com.pinterest.ktlint.core.RuleProvider
+import com.pinterest.ktlint.core.RuleSetProviderV2
 
-class CustomRuleSetProvider : RuleSetProvider {
-    override fun get() = RuleSet(
-        "custom-ktlint-rules",
-        CopyrightHeaderRule(),
-        ExpressionBodyRule(),
-        MultilineIfElseBlockRule(),
+class CustomRuleSetProvider : RuleSetProviderV2("custom-ktlint-rules", NO_ABOUT) {
+    override fun getRuleProviders() = setOf(
+        RuleProvider { CopyrightHeaderRule() },
+        RuleProvider { ExpressionBodyRule() },
+        RuleProvider { MultilineIfElseBlockRule() },
     )
 }

ktlint-rules/src/main/kotlin/software/aws/ktlint/rules/ExpressionBodyRule.kt

@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtReturnExpression
 
 class ExpressionBodyRule : Rule("expression-body") {
-    override fun visit(
+    override fun beforeVisitChildNodes(
         node: ASTNode,
         autoCorrect: Boolean,
         emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,

ktlint-rules/src/main/kotlin/software/aws/ktlint/rules/MultilineIfElseBlockRule.kt

@@ -2,11 +2,10 @@ package software.aws.ktlint.rules
 
 import com.pinterest.ktlint.core.Rule
 import com.pinterest.ktlint.core.ast.ElementType
-import com.pinterest.ktlint.core.ast.lineNumber
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 
 class MultilineIfElseBlockRule : Rule("multiline-if-else-block") {
-    override fun visit(
+    override fun beforeVisitChildNodes(
         node: ASTNode,
         autoCorrect: Boolean,
         emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit,
@@ -35,6 +34,8 @@ class MultilineIfElseBlockRule : Rule("multiline-if-else-block") {
      */
     private fun ASTNode.isOnParentLine() = lineNumber() == treeParent?.lineNumber()
 
+    private fun ASTNode.lineNumber() = psi.containingFile?.viewProvider?.document?.getLineNumber(this.startOffset)
+
     /**
      * Determines if this node starts with a left brace (i.e., `{`).
      */

ktlint-rules/src/main/resources/META-INF/services/com.pinterest.ktlint.core.RuleSetProvider renamed to ktlint-rules/src/main/resources/META-INF/services/com.pinterest.ktlint.core.RuleSetProviderV2

@@ -14,6 +14,6 @@ public class MapRequest<R1, R2, Response, H>(
     private val inner: H,
     private val fn: suspend (R1) -> R2,
 ) : Handler<R1, Response>
-        where H : Handler<R2, Response> {
+    where H : Handler<R2, Response> {
     override suspend fun call(request: R1): Response = inner.call(fn(request))
 }

runtime/io/common/src/aws/smithy/kotlin/runtime/io/middleware/MapRequest.kt

@@ -14,7 +14,7 @@ public class MapResponse<Request, R1, R2, H>(
     private val inner: H,
     private val fn: suspend (R1) -> R2,
 ) : Handler<Request, R2>
-        where H : Handler<Request, R1> {
+    where H : Handler<Request, R1> {
     override suspend fun call(request: Request): R2 {
         val res = inner.call(request)
         return fn(res)