address comments

smithy-lang · Dec 10, 2024 · b262ffb · b262ffb
1 parent 616d6f8
commit b262ffb
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,7 @@ import org.jreleaser.model.Active
  */
 
 plugins {
-    id("org.jreleaser") version "1.15.0" apply false
+    alias(libs.plugins.jreleaser) apply false
 }
 
 // Load the Smithy version from VERSION.

diff --git a/buildSrc/src/main/kotlin/Extensions.kt b/buildSrc/src/main/kotlin/Extensions.kt
@@ -1,7 +1,6 @@
 import org.gradle.api.Project
 import org.gradle.api.file.Directory
 import org.gradle.api.provider.Provider
-import org.gradle.kotlin.dsl.*
 
 // JReleaser publishes artifacts from a local staging repository, rather than maven local.
 // https://jreleaser.org/guide/latest/examples/maven/staging-artifacts.html#_gradle

diff --git a/buildSrc/src/main/kotlin/smithy.module-conventions.gradle.kts b/buildSrc/src/main/kotlin/smithy.module-conventions.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
     id("smithy.java-conventions")
-    id("smithy.integ-test-conventions")
     id("smithy.publishing-conventions")
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,6 +15,8 @@ compile-testing = "0.21.0"
 json-schema = "1.12.1"
 shadow = "8.3.5"
 api-guardian = "1.1.2"
+jreleaser = "1.15.0"
+runtime = "1.13.1"
 
 [libraries]
 prettier4j = { module = "com.opencastsoftware:prettier4j", version.ref = "prettier4j" }
@@ -51,3 +53,5 @@ jmh = { module = "me.champeau.jmh:jmh-gradle-plugin", version.ref = "jmh" }
 [plugins]
 smithy-jar = { id = "software.amazon.smithy.gradle.smithy-jar", version.ref = "smithy-gradle" }
 shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
+jreleaser = { id = "org.jreleaser", version.ref = "jreleaser" }
+runtime = { id = "org.beryx.runtime", version.ref = "runtime"}
diff --git a/smithy-cli/build.gradle.kts b/smithy-cli/build.gradle.kts
@@ -13,10 +13,11 @@ import org.jreleaser.model.Stereotype
 
 plugins {
     application
-    id("org.beryx.runtime") version "1.13.1"
-    id("org.jreleaser") version "1.15.0" apply false
+    alias(libs.plugins.jreleaser) apply false
+    alias(libs.plugins.runtime)
     alias(libs.plugins.shadow)
     id("smithy.module-conventions")
+    id("smithy.integ-test-conventions")
 }
 
 description = "This module implements the Smithy command line interface."

diff --git a/smithy-trait-codegen/build.gradle.kts b/smithy-trait-codegen/build.gradle.kts
@@ -4,6 +4,7 @@
  */
 plugins {
     id("smithy.module-conventions")
+    id("smithy.integ-test-conventions")
 }
 
 description = "Plugin for Generating Trait Code from Smithy Models"