Use gradle.properties for gradle plugin version (#71)

Use gradle.properties to set gradle plugin version.
smithy-lang · Feb 14, 2024 · a8f14cf · a8f14cf
1 parent 9a166d9
commit a8f14cf
Show file tree

Hide file tree

Showing 24 changed files with 68 additions and 25 deletions.
diff --git a/.github/workflows/update-smithy-version.yml b/.github/workflows/update-smithy-version.yml
@@ -15,7 +15,7 @@ jobs:
         id: fetch-latest
         run: |
           echo "latestSmithy=$( \
-            curl -sL https://api.github.com/repos/awslabs/smithy/releases/latest | \
+            curl -sL https://api.github.com/repos/smithy-lang/smithy/releases/latest | \
             jq -r '.tag_name')" >> $GITHUB_OUTPUT
 
       - name: Get current versions

diff --git a/custom-trait-examples/custom-annotation-trait/build.gradle.kts b/custom-trait-examples/custom-annotation-trait/build.gradle.kts
@@ -3,7 +3,7 @@ description = "A package used to define an annotation trait"
 plugins {
     `java-library`
     id("com.github.spotbugs").version("4.7.1")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 java {

diff --git a/custom-trait-examples/custom-annotation-trait/settings.gradle.kts b/custom-trait-examples/custom-annotation-trait/settings.gradle.kts
@@ -10,6 +10,11 @@
 rootProject.name = "custom-annotation-trait"
 
 pluginManagement {
+    val smithyGradleVersion: String by settings
+    plugins {
+        id("software.amazon.smithy.gradle.smithy-jar").version(smithyGradleVersion)
+    }
+
     repositories {
         mavenLocal()
         mavenCentral()

diff --git a/custom-trait-examples/custom-string-trait/build.gradle.kts b/custom-trait-examples/custom-string-trait/build.gradle.kts
@@ -4,7 +4,7 @@ description = "Package for a custom Smithy string trait"
 plugins {
     `java-library`
     id("com.github.spotbugs").version("4.7.3")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 java {

diff --git a/custom-trait-examples/custom-string-trait/settings.gradle.kts b/custom-trait-examples/custom-string-trait/settings.gradle.kts
@@ -10,6 +10,11 @@
 rootProject.name = "custom-string-trait"
 
 pluginManagement {
+    val smithyGradleVersion: String by settings
+    plugins {
+        id("software.amazon.smithy.gradle.smithy-jar").version(smithyGradleVersion)
+    }
+
     repositories {
         mavenLocal()
         mavenCentral()

diff --git a/custom-trait-examples/custom-structure-trait/build.gradle.kts b/custom-trait-examples/custom-structure-trait/build.gradle.kts
@@ -4,7 +4,7 @@ description = "Custom Smithy structure trait with multiple inputs"
 plugins {
     `java-library`
     id("com.github.spotbugs").version("4.7.3")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 java {

diff --git a/custom-trait-examples/custom-structure-trait/settings.gradle b/custom-trait-examples/custom-structure-trait/settings.gradle
@@ -1,10 +1,15 @@
 
 pluginManagement {
+    val smithyGradleVersion: String by settings
+    plugins {
+        id("software.amazon.smithy.gradle.smithy-jar").version(smithyGradleVersion)
+    }
+
     repositories {
         mavenLocal()
         mavenCentral()
         gradlePluginPortal()
     }
 }
 
-rootProject.name = "custom-structure-trait"
+rootProject.name = "custom-structure-trait"
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,6 +1,6 @@
 plugins {
-    id("java-library")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    `java-library`
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 

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,7 +1,7 @@
 
 plugins {
-    id("java-library")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    `java-library`
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 

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,7 +1,7 @@
 
 plugins {
-    id("java-library")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    `java-library`
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 // The test project doesn't produce a JAR.

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,8 +1,8 @@
 description = "A package used to share a common linting configuration between smithy projects"
 
 plugins {
-    id("java-library")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    `java-library`
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 repositories {

diff --git a/linting-and-validation-examples/common-linting-configuration/settings.gradle.kts b/linting-and-validation-examples/common-linting-configuration/settings.gradle.kts
@@ -10,6 +10,11 @@
 rootProject.name = "common-linting-configuration"
 
 pluginManagement {
+    val smithyGradleVersion: String by settings
+    plugins {
+        id("software.amazon.smithy.gradle.smithy-jar").version(smithyGradleVersion)
+    }
+
     repositories {
         mavenLocal()
         mavenCentral()

diff --git a/linting-and-validation-examples/custom-validator/build.gradle.kts b/linting-and-validation-examples/custom-validator/build.gradle.kts
@@ -4,7 +4,7 @@ description = "Creates a custom Smithy model validator"
 plugins {
     `java-library`
     id("com.github.spotbugs").version("4.7.3")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 java {

diff --git a/linting-and-validation-examples/custom-validator/settings.gradle.kts b/linting-and-validation-examples/custom-validator/settings.gradle.kts
@@ -2,6 +2,11 @@
 rootProject.name = "custom-validator"
 
 pluginManagement {
+    val smithyGradleVersion: String by settings
+    plugins {
+        id("software.amazon.smithy.gradle.smithy-jar").version(smithyGradleVersion)
+    }
+
     repositories {
         mavenLocal()
         mavenCentral()

diff --git a/linting-and-validation-examples/integ/common-linting-configuration-test/build.gradle.kts b/linting-and-validation-examples/integ/common-linting-configuration-test/build.gradle.kts
@@ -1,7 +1,7 @@
 
 plugins {
     id("java-library")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 // The test project doesn't produce a JAR.

diff --git a/linting-and-validation-examples/integ/custom-linter-test/build.gradle.kts b/linting-and-validation-examples/integ/custom-linter-test/build.gradle.kts
@@ -1,7 +1,7 @@
 
 plugins {
-    id("java-library")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    `java-library`
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 

diff --git a/linting-and-validation-examples/integ/custom-validator-test/build.gradle.kts b/linting-and-validation-examples/integ/custom-validator-test/build.gradle.kts
@@ -1,7 +1,7 @@
 
 plugins {
-    id("java-library")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    `java-library`
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 

diff --git a/quickstart-examples/quickstart-gradle/build.gradle.kts b/quickstart-examples/quickstart-gradle/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("java-library")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    `java-library`
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 repositories {

diff --git a/quickstart-examples/quickstart-gradle/gradle.properties b/quickstart-examples/quickstart-gradle/gradle.properties
@@ -1 +1,2 @@
 smithyVersion=1.44.0
+smithyGradleVersion=0.10.0
diff --git a/quickstart-examples/quickstart-gradle/settings.gradle.kts b/quickstart-examples/quickstart-gradle/settings.gradle.kts
@@ -1,10 +1,15 @@
 
 pluginManagement {
+    val smithyGradleVersion: String by settings
+    plugins {
+        id("software.amazon.smithy.gradle.smithy-jar").version(smithyGradleVersion)
+    }
+
     repositories {
         mavenLocal()
         mavenCentral()
         gradlePluginPortal()
     }
 }
 
-rootProject.name = "quickstart-gradle"
+rootProject.name = "quickstart-gradle"
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,11 @@
 
 pluginManagement {
+    val smithyGradleVersion: String by settings
+    plugins {
+        id("software.amazon.smithy.gradle.smithy-jar").version(smithyGradleVersion)
+        id("software.amazon.smithy.gradle.smithy-base").version(smithyGradleVersion)
+    }
+
     repositories {
         mavenLocal()
         mavenCentral()

diff --git a/shared-model-examples/common-shapes/build.gradle.kts b/shared-model-examples/common-shapes/build.gradle.kts
@@ -3,7 +3,7 @@ description = "A package used to share common shapes between smithy projects"
 
 plugins {
     `java-library`
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 repositories {

diff --git a/shared-model-examples/common-shapes/settings.gradle.kts b/shared-model-examples/common-shapes/settings.gradle.kts
@@ -2,6 +2,12 @@
 rootProject.name = "common-shapes"
 
 pluginManagement {
+    val smithyGradleVersion: String by settings
+
+    plugins {
+        id("software.amazon.smithy.gradle.smithy-jar").version(smithyGradleVersion)
+    }
+
     repositories {
         mavenLocal()
         mavenCentral()

diff --git a/shared-model-examples/integ/build.gradle.kts b/shared-model-examples/integ/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("java-library")
-    id("software.amazon.smithy.gradle.smithy-jar").version("0.10.0")
+    `java-library`
+    id("software.amazon.smithy.gradle.smithy-jar")
 }
 
 // The test project doesn't produce a JAR.