lint

Author: ianbotsf

runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator.kt

@@ -1,19 +1,11 @@
 /*
-<<<<<<< HEAD
-=======
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
->>>>>>> origin/main
-* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-* SPDX-License-Identifier: Apache-2.0
-*/
 package aws.smithy.kotlin.runtime.auth.awssigning
 
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
-import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigningConfig.Companion.invoke
 import aws.smithy.kotlin.runtime.http.Headers
 import aws.smithy.kotlin.runtime.http.HttpMethod
 import aws.smithy.kotlin.runtime.http.request.HttpRequest

runtime/runtime-core/build.gradle.kts

@@ -79,19 +79,19 @@ kotlin {
                     Files.writeString(
                         defPath.get().asFile.toPath(),
                         """
-                        package = aws.smithy.kotlin.native.winver
-                        headers = windows.h
-                        compilerOpts = \
-                            -DUNICODE \
-                            -DWINVER=0x0601 \
-                            -D_WIN32_WINNT=0x0601 \
-                            -DWINAPI_FAMILY=3 \
-                            -DOEMRESOURCE \
-                            -Wno-incompatible-pointer-types \
-                            -Wno-deprecated-declarations
-                        libraryPaths = $mingwLibs
-                        staticLibraries = libversion.a
-                    """.trimIndent(),
+                            package = aws.smithy.kotlin.native.winver
+                            headers = windows.h
+                            compilerOpts = \
+                                -DUNICODE \
+                                -DWINVER=0x0601 \
+                                -D_WIN32_WINNT=0x0601 \
+                                -DWINAPI_FAMILY=3 \
+                                -DOEMRESOURCE \
+                                -Wno-incompatible-pointer-types \
+                                -Wno-deprecated-declarations
+                            libraryPaths = $mingwLibs
+                            staticLibraries = libversion.a
+                        """.trimIndent(),
                     )
                 }
             }
@@ -113,13 +113,14 @@ kotlin {
                 "-v",
             )
             compilerOptions.freeCompilerArgs.addAll(compilerArgs)
-
         }
     }
 }
 
 private fun findMingwHome(): String =
-    System.getenv("MINGW_PREFIX")?.takeUnless { it.isBlank() } ?:
-    typedProp("mingw.prefix") ?:
-    throw IllegalStateException("Cannot determine MinGW prefix location. Please verify MinGW is installed correctly " +
-            "and that either the `MINGW_PREFIX` environment variable or the `mingw.prefix` Gradle property is set.")
+    System.getenv("MINGW_PREFIX")?.takeUnless { it.isBlank() }
+        ?: typedProp("mingw.prefix")
+        ?: throw IllegalStateException(
+            "Cannot determine MinGW prefix location. Please verify MinGW is installed correctly " +
+                "and that either the `MINGW_PREFIX` environment variable or the `mingw.prefix` Gradle property is set.",
+        )

runtime/runtime-core/mingw/src/aws/smithy/kotlin/runtime/net/DefaultHostResolverMingw.kt

@@ -1,3 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.smithy.kotlin.runtime.net
 
 import kotlinx.cinterop.UnsafeNumber
@@ -40,7 +45,6 @@ internal actual object DefaultHostResolver : HostResolver {
         check(wsaResult == 0) { "Failed to initialize Windows Sockets (error code $wsaResult)" }
 
         try {
-
             val hints = alloc<addrinfo>().apply {
                 ai_family = AF_UNSPEC // Allow both IPv4 and IPv6
                 ai_socktype = SOCK_STREAM // TCP stream sockets

runtime/runtime-core/mingw/src/aws/smithy/kotlin/runtime/util/SystemDefaultProviderMingw.kt

@@ -1,9 +1,14 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package aws.smithy.kotlin.runtime.util
 
+import aws.smithy.kotlin.native.winver.*
 import kotlinx.cinterop.*
 import platform.posix.environ
 import platform.posix.memcpy
-import aws.smithy.kotlin.native.winver.*
 
 internal actual val rawEnvironmentVariables: CPointer<CPointerVarOf<CPointer<ByteVarOf<Byte>>>>? = environ