Update examples to use new gradle plugin (#54)

Update examples to use version 0.8.0 of the gradle plugin.
smithy-lang · Aug 28, 2023 · c85ee25 · c85ee25
1 parent 1c765a9
commit c85ee25
Show file tree

Hide file tree

Showing 31 changed files with 221 additions and 389 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -0,0 +1,6 @@
+allprojects {
+ repositories {
+ mavenLocal()
+ mavenCentral()
+ }
+}
diff --git a/custom-trait-examples/custom-annotation-trait/build.gradle.kts b/custom-trait-examples/custom-annotation-trait/build.gradle.kts
@@ -1,11 +1,9 @@
 description = "A package used to define an annotation trait"
 
 plugins {
- val smithyGradleVersion: String by project
-
  `java-library`
  id("com.github.spotbugs").version("4.7.1")
- id("software.amazon.smithy").version(smithyGradleVersion)
+ id("software.amazon.smithy.gradle.smithy-jar").version("0.8.0")
 }
 
 java {
@@ -53,17 +51,10 @@ repositories {
  mavenCentral()
 }
 
-buildscript {
- val smithyVersion: String by project
-
- // Set the version of the CLI for the smithy gradle plugin to use when building this project
- dependencies {
- classpath("software.amazon.smithy:smithy-cli:$smithyVersion")
- }
-}
-
 dependencies {
  val smithyVersion: String by project
 
+ smithyCli("software.amazon.smithy:smithy-cli:$smithyVersion")
+
  implementation("software.amazon.smithy:smithy-model:$smithyVersion")
-}
+}
diff --git a/custom-trait-examples/custom-annotation-trait/model/custom-trait.smithy b/custom-trait-examples/custom-annotation-trait/model/custom-trait.smithy
@@ -3,4 +3,4 @@ $version: "2.0"
 namespace smithy.example
 
 @trait(selector: "structure")
-structure special {}
+structure special {}
diff --git a/custom-trait-examples/custom-string-trait/build.gradle.kts b/custom-trait-examples/custom-string-trait/build.gradle.kts
@@ -2,11 +2,9 @@
 description = "Package for a custom Smithy string trait"
 
 plugins {
- val smithyGradleVersion: String by project
-
  `java-library`
  id("com.github.spotbugs").version("4.7.3")
- id("software.amazon.smithy").version(smithyGradleVersion)
+ id("software.amazon.smithy.gradle.smithy-jar").version("0.8.0")
 }
 
 java {
@@ -54,18 +52,11 @@ repositories {
  mavenCentral()
 }
 
-buildscript {
- val smithyVersion: String by project
-
- // Set the version of the CLI for the smithy gradle plugin to use when building this project
- dependencies {
- classpath("software.amazon.smithy:smithy-cli:$smithyVersion")
- }
-}
-
 dependencies {
  val smithyVersion: String by project
 
+ smithyCli("software.amazon.smithy:smithy-cli:$smithyVersion")
+
  implementation("software.amazon.smithy:smithy-model:$smithyVersion")
 
  testImplementation("org.junit.jupiter:junit-jupiter-api:5.4.0")

diff --git a/custom-trait-examples/custom-string-trait/model/custom-trait.smithy b/custom-trait-examples/custom-string-trait/model/custom-trait.smithy
@@ -3,4 +3,4 @@ $version: "2.0"
 namespace io.smithy.example
 
 @trait(selector: "member")
-string jsonName
+string jsonName
diff --git a/custom-trait-examples/custom-structure-trait/build.gradle.kts b/custom-trait-examples/custom-structure-trait/build.gradle.kts
@@ -2,19 +2,9 @@
 description = "Custom Smithy structure trait with multiple inputs"
 
 plugins {
- val smithyGradleVersion: String by project
  `java-library`
  id("com.github.spotbugs").version("4.7.3")
- id("software.amazon.smithy").version(smithyGradleVersion)
-}
-
-buildscript {
- val smithyVersion: String by project
-
- // Set the version of the CLI for the smithy gradle plugin to use when building this project
- dependencies {
- classpath("software.amazon.smithy:smithy-cli:$smithyVersion")
- }
+ id("software.amazon.smithy.gradle.smithy-jar").version("0.8.0")
 }
 
 java {
@@ -59,6 +49,9 @@ repositories {
 dependencies {
  val smithyVersion: String by project
 
+
+ smithyCli("software.amazon.smithy:smithy-cli:$smithyVersion")
+
  implementation("software.amazon.smithy:smithy-model:$smithyVersion")
 
  testImplementation("org.junit.jupiter:junit-jupiter-api:5.4.0")

diff --git a/custom-trait-examples/custom-structure-trait/model/custom-trait.smithy b/custom-trait-examples/custom-structure-trait/model/custom-trait.smithy
@@ -3,13 +3,15 @@ $version: "2.0"
 namespace io.smithy.example
 
 @trait(
- selector: "resource",
- breakingChanges: [{change: "presence"}]
+ selector: "resource"
+ breakingChanges: [
+ {change: "presence"}
+ ]
 )
 structure resourceMetadata {
  /// Provides a custom name for your resource.
  @required
- description: String,
+ description: String
 
  /// A type for the resource
  @required
@@ -20,13 +22,13 @@ structure resourceMetadata {
 }
 
 enum ResourceType {
- NORMAL,
- SPECIAL,
+ NORMAL
+ SPECIAL
  NONE
 }
 
 @private
 list StructureIdList {
  @idRef(failWhenMissing: true, selector: "structure")
  member: String
-}
+}
diff --git a/custom-trait-examples/integ/custom-annotation-trait-test/build.gradle.kts b/custom-trait-examples/integ/custom-annotation-trait-test/build.gradle.kts
@@ -1,27 +1,16 @@
 plugins {
- val smithyGradleVersion: String by project
-
- id("software.amazon.smithy").version(smithyGradleVersion)
+ id("java-library")
+ id("software.amazon.smithy.gradle.smithy-jar").version("0.8.0")
 }
 
 
 // The test project doesn't produce a JAR.
 tasks["jar"].enabled = false
 
-repositories {
- mavenLocal()
- mavenCentral()
-}
-
-buildscript {
+dependencies {
  val smithyVersion: String by project
 
- // Set the version of the CLI for the smithy gradle plugin to use when building this project
- dependencies {
- classpath("software.amazon.smithy:smithy-cli:$smithyVersion")
- }
-}
+ smithyCli("software.amazon.smithy:smithy-cli:$smithyVersion")
 
-dependencies {
  implementation(project(":custom-trait-examples:custom-annotation-trait"))
 }
diff --git a/custom-trait-examples/integ/custom-annotation-trait-test/model/main.smithy b/custom-trait-examples/integ/custom-annotation-trait-test/model/main.smithy
@@ -8,4 +8,3 @@ use smithy.example#special
 structure MyStructure {
  myMember: String
 }
-
diff --git a/custom-trait-examples/integ/custom-string-trait-test/build.gradle.kts b/custom-trait-examples/integ/custom-string-trait-test/build.gradle.kts
@@ -1,28 +1,18 @@
 
 plugins {
- val smithyGradleVersion: String by project
-
- id("software.amazon.smithy").version(smithyGradleVersion)
+ id("java-library")
+ id("software.amazon.smithy.gradle.smithy-jar").version("0.8.0")
 }
 
 
 // The test project doesn't produce a JAR.
 tasks["jar"].enabled = false
 
-repositories {
- mavenLocal()
- mavenCentral()
-}
 
-buildscript {
+dependencies {
  val smithyVersion: String by project
 
- // Set the version of the CLI for the smithy gradle plugin to use when building this project
- dependencies {
- classpath("software.amazon.smithy:smithy-cli:$smithyVersion")
- }
-}
+ smithyCli("software.amazon.smithy:smithy-cli:$smithyVersion")
 
-dependencies {
  implementation(project(":custom-trait-examples:custom-string-trait"))
 }
diff --git a/custom-trait-examples/integ/custom-string-trait-test/model/main.smithy b/custom-trait-examples/integ/custom-string-trait-test/model/main.smithy
@@ -9,4 +9,3 @@ structure MyStructure {
  @jsonName("TESTING")
  myMember: String
 }
-
diff --git a/custom-trait-examples/integ/custom-structure-trait-test/build.gradle.kts b/custom-trait-examples/integ/custom-structure-trait-test/build.gradle.kts
@@ -1,28 +1,16 @@
 
 plugins {
- val smithyGradleVersion: String by project
-
- id("software.amazon.smithy").version(smithyGradleVersion)
+ id("java-library")
+ id("software.amazon.smithy.gradle.smithy-jar").version("0.8.0")
 }
 
-
 // The test project doesn't produce a JAR.
 tasks["jar"].enabled = false
 
-buildscript {
+dependencies {
  val smithyVersion: String by project
 
- // Set the version of the CLI for the smithy gradle plugin to use when building this project
- dependencies {
- classpath("software.amazon.smithy:smithy-cli:$smithyVersion")
- }
-}
+ smithyCli("software.amazon.smithy:smithy-cli:$smithyVersion")
 
-repositories {
- mavenLocal()
- mavenCentral()
-}
-
-dependencies {
  implementation(project(":custom-trait-examples:custom-structure-trait"))
 }
diff --git a/custom-trait-examples/integ/custom-structure-trait-test/model/main.smithy b/custom-trait-examples/integ/custom-structure-trait-test/model/main.smithy
@@ -5,17 +5,14 @@ namespace example
 use io.smithy.example#resourceMetadata
 
 @resourceMetadata(
- description: "woo",
+ description: "woo"
  type: "NORMAL"
- associatedStructures: [ ForecastStruct ]
+ associatedStructures: [ForecastStruct]
 )
 resource Forecast {
- identifiers: { forecastId: ForecastId }
+ identifiers: {forecastId: ForecastId}
 }
 
 string ForecastId
 
 structure ForecastStruct {}
-
-
-
diff --git a/linting-and-validation-examples/common-linting-configuration/build.gradle.kts b/linting-and-validation-examples/common-linting-configuration/build.gradle.kts
@@ -1,18 +1,8 @@
 description = "A package used to share a common linting configuration between smithy projects"
 
 plugins {
- val smithyGradleVersion: String by project
-
- id("software.amazon.smithy").version(smithyGradleVersion)
-}
-
-buildscript {
- val smithyVersion: String by project
-
- // Set the version of the CLI for the smithy gradle plugin to use when building this project
- dependencies {
- classpath("software.amazon.smithy:smithy-cli:$smithyVersion")
- }
+ id("java-library")
+ id("software.amazon.smithy.gradle.smithy-jar").version("0.8.0")
 }
 
 repositories {
@@ -23,9 +13,10 @@ repositories {
 dependencies {
  val smithyVersion: String by project
 
+ smithyCli("software.amazon.smithy:smithy-cli:$smithyVersion")
  implementation("software.amazon.smithy:smithy-linters:$smithyVersion")
 }
 
 smithy {
- tags = setOf("validators", "common-config")
+ tags.addAll("validators", "common-config")
 }