chore: upgrade kotlin 1.6.20; gradle 7.4.2; bump deps (#622)

Author: aajtodd

.changes/.gitkeep

@@ -0,0 +1,5 @@
+{
+    "id": "84133345-9651-4fdd-87ff-bbd6a331fe60",
+    "type": "misc",
+    "description": "upgrade kotlin to 1.6.21 and other deps to latest"
+}

.changes/84133345-9651-4fdd-87ff-bbd6a331fe60.json

@@ -4,40 +4,43 @@ kotlin.incremental.multiplatform=true
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
 
+# FIXME - see https://youtrack.jetbrains.com/issue/KTIJ-21583/HMPP-1-6-20-breaks-autocomplete-in-multiplatform-composite-build
+kotlin.mpp.hierarchicalStructureSupport=false
+
 # SDK
 sdkVersion=0.9.3-SNAPSHOT
 
 # kotlin
-kotlinVersion=1.6.10
-dokkaVersion=1.6.10
+kotlinVersion=1.6.21
+dokkaVersion=1.6.21
 
 # kotlin libraries
-coroutinesVersion=1.6.0
-ktorVersion=1.6.7
-atomicFuVersion=0.17.0
-kotlinxSerializationVersion=1.3.0
+coroutinesVersion=1.6.1
+ktorVersion=1.6.8
+atomicFuVersion=0.17.2
+kotlinxSerializationVersion=1.3.3
 jsoupVersion=1.14.3
 
 # codegen
 smithyVersion=1.17.0
 smithyGradleVersion=0.5.3
 
 # testing/utility
-junitVersion=5.6.2
-ktlintVersion=0.42.1
-kotestVersion=4.6.0
-kotlinCompileTestingVersion=1.4.6
-jacocoVersion=0.8.7
-kotlinxBenchmarkVersion=0.3.1
+junitVersion=5.8.2
+ktlintVersion=0.45.2
+kotestVersion=5.3.0
+kotlinCompileTestingVersion=1.4.8
+jacocoVersion=0.8.8
+kotlinxBenchmarkVersion=0.4.2
 
 # serialization
 kamlVersion=0.36.0
 
 # logging
-kotlinLoggingVersion=2.0.3
+kotlinLoggingVersion=2.1.21
 
 # logging - JVM
-slf4jVersion=1.7.30
+slf4jVersion=1.7.36
 
 # crt
-crtKotlinVersion=0.5.4
+crtKotlinVersion=0.5.4

gradle.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -3,7 +3,12 @@ package software.aws.ktlint.rules
 import com.pinterest.ktlint.core.Rule
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 
-class CopyrightHeaderRule : Rule("copyright-header"), Rule.Modifier.RestrictToRoot {
+class CopyrightHeaderRule : Rule(
+    "copyright-header",
+    visitorModifiers = setOf(
+        VisitorModifier.RunOnRootNodeOnly
+    )
+) {
     companion object {
         private val header = """
             /*

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

@@ -4,7 +4,7 @@
  */
 
 plugins {
-    kotlin("plugin.serialization") version "1.6.10"
+    kotlin("plugin.serialization") version "1.6.21"
 }
 
 description = "Client runtime for Smithy services generated by smithy-kotlin"

runtime/runtime-core/build.gradle.kts

@@ -81,7 +81,7 @@ private class FormUrlStructSerializer(
     }
 
     private fun writeField(descriptor: SdkFieldDescriptor, block: () -> Unit) {
-        if (buffer.writePosition> 0u) {
+        if (buffer.writePosition > 0u) {
             buffer.write("&")
         }
         if (prefix.isNotBlank()) buffer.write(prefix)

runtime/serde/serde-form-url/common/src/aws/smithy/kotlin/runtime/serde/formurl/FormUrlSerializer.kt

@@ -17,7 +17,6 @@ package aws.smithy.kotlin.runtime.util
     level = RequiresOptIn.Level.ERROR,
     message = "This API is internal to smithy-client-rt and should not be used. It could be removed or changed without notice."
 )
-@Experimental(level = Experimental.Level.ERROR)
 @Target(
     AnnotationTarget.CLASS,
     AnnotationTarget.TYPEALIAS,

runtime/utils/common/src/aws/smithy/kotlin/runtime/util/Annotations.kt

@@ -34,7 +34,7 @@ private fun getDefaultRuntimeVersion(): String {
 // publishing info
 const val RUNTIME_GROUP: String = "aws.smithy.kotlin"
 val RUNTIME_VERSION: String = System.getProperty("smithy.kotlin.codegen.clientRuntimeVersion", getDefaultRuntimeVersion())
-val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "1.6.10")
+val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "1.6.21")
 
 enum class SourceSet {
     CommonMain,

smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt

@@ -94,7 +94,7 @@ object OperationNormalizer {
                 """renaming operation inputs or outputs will result in a conflict for:
                 |$formatted
                 |Fix by supplying a manual rename customization for the shapes listed.
-            """.trimMargin()
+                """.trimMargin()
             )
         }
     }