WIP broken upgrade of Smithy to 1.34.0-SNAPSHOT including endpoints r…

…efactor
awslabs · Jul 20, 2023 · 0dfd642 · 0dfd642
1 parent 0510cc7
commit 0dfd642
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/codegen/smithy-aws-kotlin-codegen/build.gradle.kts b/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
     api("software.amazon.smithy:smithy-aws-iam-traits:$smithyVersion")
     api("software.amazon.smithy:smithy-aws-cloudformation-traits:$smithyVersion")
     api("software.amazon.smithy:smithy-protocol-test-traits:$smithyVersion")
-    implementation("software.amazon.smithy:smithy-rules-engine:$smithyVersion")
+    implementation("software.amazon.smithy:smithy-aws-rules-engine:$smithyVersion")
 
     testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-params:$junitVersion")

diff --git a/.../src/main/kotlin/aws/sdk/kotlin/codegen/protocols/endpoints/DefaultEndpointProviderExt.kt b/.../src/main/kotlin/aws/sdk/kotlin/codegen/protocols/endpoints/DefaultEndpointProviderExt.kt
@@ -12,7 +12,7 @@ import software.amazon.smithy.kotlin.codegen.rendering.endpoints.ExpressionRende
 import software.amazon.smithy.kotlin.codegen.utils.getOrNull
 import software.amazon.smithy.model.node.Node
 import software.amazon.smithy.model.node.ObjectNode
-import software.amazon.smithy.rulesengine.language.syntax.expr.Expression
+import software.amazon.smithy.rulesengine.language.syntax.expressions.Expression
 import java.util.*
 
 val awsEndpointFunctions = mapOf(
@@ -24,9 +24,6 @@ val awsEndpointPropertyRenderers = mapOf(
     "authSchemes" to ::renderAuthSchemes,
 )
 
-// valid auth scheme names that can appear in a smithy endpoint's properties
-private val validAuthSchemeNames = setOf("sigv4", "sigv4a")
-
 private fun String.toSigningContextClassName(): String? =
     when (this) {
         "sigv4" -> "SigV4"

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=2G
 sdkVersion=0.29.0-SNAPSHOT
 
 # codegen
-smithyVersion=1.29.0
+smithyVersion=1.34.0-SNAPSHOT
 smithyGradleVersion=0.6.0
 # smithy-kotlin codegen and runtime are versioned together
 smithyKotlinVersion=0.23.0-SNAPSHOT

diff --git a/gradle/sdk-plugins/build.gradle.kts b/gradle/sdk-plugins/build.gradle.kts
@@ -5,6 +5,7 @@
 import java.util.Properties
 buildscript {
     repositories {
+        mavenLocal()
         mavenCentral()
     }
 }
@@ -15,6 +16,7 @@ plugins {
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
     gradlePluginPortal()
 }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -5,6 +5,7 @@
 
 pluginManagement {
     repositories {
+        mavenLocal()
         mavenCentral()
         gradlePluginPortal()
     }