diff --git a/.github/workflows/update-smithy-version.yml b/.github/workflows/update-smithy-version.yml index 95b7c52..dd4fed4 100644 --- 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 index e4f207d..f9dc560 100644 --- 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 index c4ec95e..7c81698 100644 --- 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 index afc1b97..ed69ff8 100644 --- 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 index a0de8de..e9643d6 100644 --- 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 index 4dad887..89a1301 100644 --- 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 index 4ceca83..9f1e7e0 100644 --- a/custom-trait-examples/custom-structure-trait/settings.gradle +++ b/custom-trait-examples/custom-structure-trait/settings.gradle @@ -1,5 +1,10 @@ pluginManagement { + val smithyGradleVersion: String by settings + plugins { + id("software.amazon.smithy.gradle.smithy-jar").version(smithyGradleVersion) + } + repositories { mavenLocal() mavenCentral() @@ -7,4 +12,4 @@ pluginManagement { } } -rootProject.name = "custom-structure-trait" \ No newline at end of file +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 index 5e3e1ef..a31b5ee 100644 --- 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 index ac2d261..5777918 100644 --- 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 index e94b7ac..556c212 100644 --- 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 index 5a943df..2b1a1de 100644 --- 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 index 374e40f..e96a88f 100644 --- 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 index fd01a6c..661dccc 100644 --- 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 index df6c4d8..d22d068 100644 --- 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 index c0563bf..81a68b3 100644 --- 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 index 05c50c4..3b32fb7 100644 --- 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 index d2fa299..c3b5de6 100644 --- 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 index 09353dd..a84df6d 100644 --- 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 index 573386e..161cc64 100644 --- 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 index a62b703..c0e7ed0 100644 --- a/quickstart-examples/quickstart-gradle/settings.gradle.kts +++ b/quickstart-examples/quickstart-gradle/settings.gradle.kts @@ -1,5 +1,10 @@ pluginManagement { + val smithyGradleVersion: String by settings + plugins { + id("software.amazon.smithy.gradle.smithy-jar").version(smithyGradleVersion) + } + repositories { mavenLocal() mavenCentral() @@ -7,4 +12,4 @@ pluginManagement { } } -rootProject.name = "quickstart-gradle" \ No newline at end of file +rootProject.name = "quickstart-gradle" diff --git a/settings.gradle.kts b/settings.gradle.kts index 6a7f8dd..164294e 100644 --- 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 index 8e2b663..539f7e8 100644 --- 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 index 053a7f8..0909993 100644 --- 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 index c745ab8..a0c894e 100644 --- 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.