Skip to content

Commit 376f95f

Browse files
authored
chore: upgrade to published version (#1170)
1 parent 30d45c5 commit 376f95f

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

bom/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fun createBomConstraintsAndVersionCatalog() {
8080
fun Project.artifactId(target: KotlinTarget): String = when (target) {
8181
is KotlinMetadataTarget -> name
8282
is KotlinJsTarget -> "$name-js"
83-
else -> "$name-${target.targetName.toLowerCase(Locale.ROOT)}"
83+
else -> "$name-${target.targetName.lowercase()}"
8484
}
8585

8686
/**

build.gradle.kts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ buildscript {
1212
// only need to add e.g. atomic-fu and build-plugins here for imports and plugins to be available in subprojects.
1313
dependencies {
1414
classpath(libs.kotlinx.atomicfu.plugin)
15-
classpath("aws.sdk.kotlin:build-plugins") {
16-
version {
17-
require("0.3.2")
18-
}
19-
}
2015

2116
// FIXME - we need the ClassLoader used for Model and any traits to be the same. Unfortunately our
2217
// build plugin has a transitive dependency on `smithy-model` which means our :codegen:sdk project
@@ -29,15 +24,15 @@ buildscript {
2924

3025
plugins {
3126
alias(libs.plugins.dokka)
27+
// configures (KMP) subprojects with our own KMP conventions and some default dependencies
28+
alias(libs.plugins.aws.kotlin.repo.tools.kmp)
29+
3230
// ensure the correct version of KGP ends up on our buildscript classpath
3331
// since build-plugins also has <some> version in its dependency closure
3432
alias(libs.plugins.kotlin.multiplatform) apply false
3533
alias(libs.plugins.kotlin.jvm) apply false
3634
}
3735

38-
// configures (KMP) subprojects with our own KMP conventions and some default dependencies
39-
apply(plugin = "aws.sdk.kotlin.kmp")
40-
4136
val testJavaVersion = typedProp<String>("test.java.version")?.let {
4237
JavaLanguageVersion.of(it)
4338
}?.also {

gradle/libs.versions.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
kotlin-version = "1.9.21"
33
dokka-version = "1.9.10"
44

5+
aws-kotlin-repo-tools-version = "0.3.2"
6+
57
# libs
68
coroutines-version = "1.7.3"
79
atomicfu-version = "0.23.1"
@@ -129,3 +131,5 @@ kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kot
129131
kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" }
130132
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version"}
131133
smithy-gradle = { id = "software.amazon.smithy", version.ref = "smithy-gradle-version" }
134+
aws-kotlin-repo-tools-kmp = { id = "aws.sdk.kotlin.kmp", version.ref = "aws-kotlin-repo-tools-version" }
135+
aws-kotlin-repo-tools-smithybuild = { id = "aws.sdk.kotlin.gradle.smithybuild", version.ref = "aws-kotlin-repo-tools-version" }

settings.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ pluginManagement {
88
mavenLocal()
99
mavenCentral()
1010
gradlePluginPortal()
11+
maven {
12+
name = "kotlinRepoTools"
13+
url = java.net.URI("https://d2gys1nrxnjnyg.cloudfront.net/releases")
14+
content {
15+
includeGroupByRegex("""aws\.sdk\.kotlin.*""")
16+
}
17+
}
1118
}
1219
}
1320

@@ -18,13 +25,6 @@ dependencyResolutionManagement {
1825
}
1926
}
2027

21-
sourceControl {
22-
gitRepository(java.net.URI("https://github.com/awslabs/aws-kotlin-repo-tools.git")) {
23-
producesModule("aws.sdk.kotlin:build-plugins")
24-
producesModule("aws.sdk.kotlin:ktlint-rules")
25-
}
26-
}
27-
2828
rootProject.name = "aws-sdk-kotlin"
2929

3030
include(":dokka-aws")

0 commit comments

Comments
 (0)