chore: upgrade to published version (#1021)

Author: aajtodd

build.gradle.kts

@@ -11,18 +11,6 @@ buildscript {
     // only need to add e.g. atomic-fu and build-plugins here for imports and plugins to be available in subprojects.
     dependencies {
         classpath(libs.kotlinx.atomicfu.plugin)
-
-        // Add our custom gradle plugin(s) to buildscript classpath (comes from github source)
-        // NOTE: Anything included in our build plugin is added to the classpath for all projects,
-        // this includes bundled plugins and their versions. As an example the smithy gradle base
-        // plugin is used by the smithybuild plugin which means you can't apply it with a different
-        // version directly because it's already on the classpath.
-        // FIXME - if we publish this plugin it would fix a lot of things
-        classpath("aws.sdk.kotlin:build-plugins") {
-            version {
-                require("0.3.2")
-            }
-        }
     }
 }
 
@@ -33,10 +21,16 @@ plugins {
     // since build-plugins also has <some> version in its dependency closure
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.kotlin.jvm) apply false
-}
 
-// configures (KMP) subprojects with our own KMP conventions and some default dependencies
-apply(plugin = "aws.sdk.kotlin.kmp")
+    // Add our custom gradle plugin(s) to buildscript classpath
+    // NOTE: Anything included in our build plugin is added to the classpath for all projects,
+    // this includes bundled plugins and their versions. As an example the smithy gradle base
+    // plugin is used by the smithybuild plugin which means you can't apply it with a different
+    // version directly because it's already on the classpath.
+    //
+    // Plugin configures (KMP) subprojects with our own KMP conventions and some default dependencies
+    alias(libs.plugins.aws.kotlin.repo.tools.kmp)
+}
 
 val testJavaVersion = typedProp<String>("test.java.version")?.let {
     JavaLanguageVersion.of(it)

gradle/libs.versions.toml

@@ -2,6 +2,8 @@
 kotlin-version = "1.9.21"
 dokka-version = "1.9.10"
 
+aws-kotlin-repo-tools-version = "0.3.2"
+
 # libs
 coroutines-version = "1.7.3"
 atomicfu-version = "0.23.1"
@@ -93,3 +95,5 @@ kotlin-multiplatform = {id = "org.jetbrains.kotlin.multiplatform", version.ref =
 kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinx-benchmark-version" }
 kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version"}
+aws-kotlin-repo-tools-kmp = { id = "aws.sdk.kotlin.kmp", version.ref = "aws-kotlin-repo-tools-version" }
+aws-kotlin-repo-tools-smithybuild = { id = "aws.sdk.kotlin.gradle.smithybuild", version.ref = "aws-kotlin-repo-tools-version" }

settings.gradle.kts

@@ -8,6 +8,13 @@ pluginManagement {
         mavenLocal()
         mavenCentral()
         gradlePluginPortal()
+        maven {
+            name = "kotlinRepoTools"
+            url = java.net.URI("https://d2gys1nrxnjnyg.cloudfront.net/releases")
+            content {
+                includeGroupByRegex("""aws\.sdk\.kotlin.*""")
+            }
+        }
     }
 }
 
@@ -19,13 +26,6 @@ dependencyResolutionManagement {
     }
 }
 
-sourceControl {
-    gitRepository(java.net.URI("https://github.com/awslabs/aws-kotlin-repo-tools.git")) {
-        producesModule("aws.sdk.kotlin:build-plugins")
-        producesModule("aws.sdk.kotlin:ktlint-rules")
-    }
-}
-
 rootProject.name = "smithy-kotlin"
 
 include(":dokka-smithy")