Merge branch 'main' of github.com:awslabs/aws-kotlin-repo-tools into …

…ktlint-upgrade
awslabs · Jun 25, 2024 · b00efff · b00efff
2 parents dd50396 + 42f729f
commit b00efff
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,14 @@ To cut a new release:
 7. Specify the tag you created under `Source Version`.
 8. Start the build.
 
-## Projects
+## Development
+
+### Local development
+To use a local version of the plugin in downstream projects (such as `smithy-kotlin` or `aws-sdk-kotlin`):
+1. Run `./gradlew -Prelease.version=<YOUR_SNAPSHOT_VERSION> publishToMavenLocal`
+2. Consume the snapshot plugin version in the projects 
+
+### Project Structure
 
 * `:build-plugins:build-support`   - common build support (publishing, linting, utils, etc)
 * `:build-plugins:kmp-conventions` - Plugin that applies common conventions for KMP projects (source sets, targets, etc)

diff --git a/...in/kotlin/aws/sdk/kotlin/gradle/plugins/artifactsizemetrics/AnalyzeArtifactSizeMetrics.kt b/...in/kotlin/aws/sdk/kotlin/gradle/plugins/artifactsizemetrics/AnalyzeArtifactSizeMetrics.kt
@@ -91,7 +91,7 @@ internal abstract class AnalyzeArtifactSizeMetrics : DefaultTask() {
             val release = releaseMetrics[artifact] ?: 0
 
             val delta = current - release
-            val percentage = if (current == 0L || release == 0L) Double.NaN else delta.toDouble() / release.toDouble() * 100
+            val percentage = if (release == 0L) Double.NaN else delta.toDouble() / release.toDouble() * 100
 
             ArtifactSizeMetric(
                 current,

diff --git a/...n/aws/sdk/kotlin/gradle/plugins/artifactsizemetrics/PutArtifactSizeMetricsInCloudWatch.kt b/...n/aws/sdk/kotlin/gradle/plugins/artifactsizemetrics/PutArtifactSizeMetricsInCloudWatch.kt
@@ -54,10 +54,6 @@ internal abstract class PutArtifactSizeMetricsInCloudWatch : DefaultTask() {
                     unit = StandardUnit.Bytes
                     value = artifactSize
                     dimensions = listOf(
-                        Dimension {
-                            name = "Version"
-                            value = "${pluginConfig.projectRepositoryName}-$releaseTag"
-                        },
                         Dimension {
                             name = "Project"
                             value = pluginConfig.projectRepositoryName

diff --git a/build-plugins/kmp-conventions/build.gradle.kts b/build-plugins/kmp-conventions/build.gradle.kts
@@ -18,7 +18,7 @@ repositories {
 
 dependencies {
     implementation(project(":build-plugins:build-support"))
-    compileOnly(kotlin("gradle-plugin", "1.9.20"))
+    compileOnly(kotlin("gradle-plugin", "2.0.0"))
     testImplementation(libs.junit.jupiter)
 }
 

diff --git a/build-plugins/kmp-conventions/src/main/kotlin/aws/sdk/kotlin/gradle/kmp/ConfigureTargets.kt b/build-plugins/kmp-conventions/src/main/kotlin/aws/sdk/kotlin/gradle/kmp/ConfigureTargets.kt
@@ -68,23 +68,29 @@ fun Project.configureKmpTargets() {
         // see https://kotlinlang.org/docs/multiplatform-hierarchy.html#see-the-full-hierarchy-template
         kmpExt.applyDefaultHierarchyTemplate {
             if (hasJvmAndNative) {
-                group("jvmAndNative") {
-                    withJvm()
-                    withNative()
+                common {
+                    group("jvmAndNative") {
+                        withJvm()
+                        withNative()
+                    }
                 }
             }
 
             if (hasWindows) {
-                group("windows") {
-                    withMingw()
+                common {
+                    group("windows") {
+                        withMingw()
+                    }
                 }
             }
 
             if (hasDesktop) {
-                group("desktop") {
-                    withLinux()
-                    withMingw()
-                    withMacos()
+                common {
+                    group("desktop") {
+                        withLinux()
+                        withMingw()
+                        withMacos()
+                    }
                 }
             }
         }

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style=official
 
 # kotlin
-kotlinVersion=1.9.10
+kotlinVersion=2.0.0