chore(codegen): move smithy version settings to gradle properties (#4035)

srchase · web-flow · commit 4e6df5ef9e32 · 2022-10-12T12:30:18.000-07:00
diff --git a/codegen/build.gradle.kts b/codegen/build.gradle.kts
@@ -31,8 +31,6 @@ allprojects {
     version = "0.12.0"
 }
 
-extra["smithyVersion"] = "[1.25.2,1.26.0["
-
 // The root project doesn't produce a JAR.
 tasks["jar"].enabled = false
 
diff --git a/codegen/generic-client-test-codegen/build.gradle.kts b/codegen/generic-client-test-codegen/build.gradle.kts
@@ -15,21 +15,26 @@
 
 import software.amazon.smithy.gradle.tasks.SmithyBuild
 
+val smithyVersion: String by project
+
 buildscript {
+    val smithyVersion: String by project
+
     repositories {
         mavenCentral()
     }
     dependencies {
-        "classpath"("software.amazon.smithy:smithy-cli:${rootProject.extra["smithyVersion"]}")
+        "classpath"("software.amazon.smithy:smithy-cli:$smithyVersion")
     }
 }
 
 plugins {
-    id("software.amazon.smithy") version "0.6.0"
+    val smithyGradleVersion: String by project
+    id("software.amazon.smithy").version(smithyGradleVersion)
 }
 
 dependencies {
-    implementation("software.amazon.smithy:smithy-aws-protocol-tests:${rootProject.extra["smithyVersion"]}")
+    implementation("software.amazon.smithy:smithy-aws-protocol-tests:$smithyVersion")
     implementation(project(":smithy-aws-typescript-codegen"))
 }
 
diff --git a/codegen/gradle.properties b/codegen/gradle.properties
@@ -0,0 +1,2 @@
+smithyVersion=[1.25.0,1.26.0[
+smithyGradleVersion=0.6.0
diff --git a/codegen/protocol-test-codegen/build.gradle.kts b/codegen/protocol-test-codegen/build.gradle.kts
@@ -15,21 +15,26 @@
 
 import software.amazon.smithy.gradle.tasks.SmithyBuild
 
+val smithyVersion: String by project
+
 buildscript {
+    val smithyVersion: String by project
+
     repositories {
         mavenCentral()
     }
     dependencies {
-        "classpath"("software.amazon.smithy:smithy-cli:${rootProject.extra["smithyVersion"]}")
+        "classpath"("software.amazon.smithy:smithy-cli:$smithyVersion")
     }
 }
 
 plugins {
-    id("software.amazon.smithy") version "0.6.0"
+    val smithyGradleVersion: String by project
+    id("software.amazon.smithy").version(smithyGradleVersion)
 }
 
 dependencies {
-    implementation("software.amazon.smithy:smithy-aws-protocol-tests:${rootProject.extra["smithyVersion"]}")
+    implementation("software.amazon.smithy:smithy-aws-protocol-tests:$smithyVersion")
     implementation(project(":smithy-aws-typescript-codegen"))
 }
 
diff --git a/codegen/sdk-codegen/build.gradle.kts b/codegen/sdk-codegen/build.gradle.kts
@@ -21,19 +21,24 @@ import software.amazon.smithy.aws.traits.ServiceTrait
 import java.util.stream.Stream
 import kotlin.streams.toList
 
+val smithyVersion: String by project
+
 buildscript {
+    val smithyVersion: String by project
+
     repositories {
         mavenLocal()
         mavenCentral()
     }
     dependencies {
-        "classpath"("software.amazon.smithy:smithy-cli:${rootProject.extra["smithyVersion"]}")
-        "classpath"("software.amazon.smithy:smithy-aws-traits:${rootProject.extra["smithyVersion"]}")
+        "classpath"("software.amazon.smithy:smithy-cli:$smithyVersion")
+        "classpath"("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
     }
 }
 
 plugins {
-    id("software.amazon.smithy") version "0.6.0"
+    val smithyGradleVersion: String by project
+    id("software.amazon.smithy").version(smithyGradleVersion)
 }
 
 dependencies {
diff --git a/codegen/smithy-aws-typescript-codegen/build.gradle.kts b/codegen/smithy-aws-typescript-codegen/build.gradle.kts
@@ -20,23 +20,27 @@ description = "Generates TypeScript code for AWS protocols from Smithy models"
 extra["displayName"] = "Smithy :: AWS :: Typescript :: Codegen"
 extra["moduleName"] = "software.amazon.smithy.aws.typescript.codegen"
 
+val smithyVersion: String by project
+
 buildscript {
+    val smithyVersion: String by project
+
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath("software.amazon.smithy:smithy-model:${rootProject.extra["smithyVersion"]}")
+        classpath("software.amazon.smithy:smithy-model:$smithyVersion")
     }
 }
 
 dependencies {
-    api("software.amazon.smithy:smithy-aws-cloudformation-traits:${rootProject.extra["smithyVersion"]}")
-    api("software.amazon.smithy:smithy-aws-traits:${rootProject.extra["smithyVersion"]}")
-    api("software.amazon.smithy:smithy-waiters:${rootProject.extra["smithyVersion"]}")
-    api("software.amazon.smithy:smithy-aws-iam-traits:${rootProject.extra["smithyVersion"]}")
-    api("software.amazon.smithy:smithy-protocol-test-traits:${rootProject.extra["smithyVersion"]}")
-    api("software.amazon.smithy:smithy-model:${rootProject.extra["smithyVersion"]}")
-    api("software.amazon.smithy:smithy-rules-engine:${rootProject.extra["smithyVersion"]}")
+    api("software.amazon.smithy:smithy-aws-cloudformation-traits:$smithyVersion")
+    api("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
+    api("software.amazon.smithy:smithy-waiters:$smithyVersion")
+    api("software.amazon.smithy:smithy-aws-iam-traits:$smithyVersion")
+    api("software.amazon.smithy:smithy-protocol-test-traits:$smithyVersion")
+    api("software.amazon.smithy:smithy-model:$smithyVersion")
+    api("software.amazon.smithy:smithy-rules-engine:$smithyVersion")
     api("software.amazon.smithy.typescript:smithy-typescript-codegen:0.12.0")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ allprojects {`
`31`	`31`	`version = "0.12.0"`
`32`	`32`	`}`
`33`	`33`
`34`		`-extra["smithyVersion"] = "[1.25.2,1.26.0["`
`35`		`-`
`36`	`34`	`// The root project doesn't produce a JAR.`
`37`	`35`	`tasks["jar"].enabled = false`
`38`	`36`
Original file line number	Diff line number	Diff line change
`@@ -15,21 +15,26 @@`
`15`	`15`
`16`	`16`	`import software.amazon.smithy.gradle.tasks.SmithyBuild`
`17`	`17`
	`18`	`+val smithyVersion: String by project`
	`19`	`+`
`18`	`20`	`buildscript {`
	`21`	`+ val smithyVersion: String by project`
	`22`	`+`
`19`	`23`	`repositories {`
`20`	`24`	`mavenCentral()`
`21`	`25`	`}`
`22`	`26`	`dependencies {`
`23`		`- "classpath"("software.amazon.smithy:smithy-cli:${rootProject.extra["smithyVersion"]}")`
	`27`	`+ "classpath"("software.amazon.smithy:smithy-cli:$smithyVersion")`
`24`	`28`	`}`
`25`	`29`	`}`
`26`	`30`
`27`	`31`	`plugins {`
`28`		`- id("software.amazon.smithy") version "0.6.0"`
	`32`	`+ val smithyGradleVersion: String by project`
	`33`	`+ id("software.amazon.smithy").version(smithyGradleVersion)`
`29`	`34`	`}`
`30`	`35`
`31`	`36`	`dependencies {`
`32`		`- implementation("software.amazon.smithy:smithy-aws-protocol-tests:${rootProject.extra["smithyVersion"]}")`
	`37`	`+ implementation("software.amazon.smithy:smithy-aws-protocol-tests:$smithyVersion")`
`33`	`38`	`implementation(project(":smithy-aws-typescript-codegen"))`
`34`	`39`	`}`
`35`	`40`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+smithyVersion=[1.25.0,1.26.0[`
	`2`	`+smithyGradleVersion=0.6.0`