Skip to content

Commit b80a607

Browse files
authored
Initial semi-consistent renaming of modules (#621)
1 parent c19a319 commit b80a607

File tree

443 files changed

+54
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

443 files changed

+54
-56
lines changed

aws/sigv4/build.gradle.kts renamed to aws/aws-sigv4/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ extra["moduleName"] = "software.amazon.smithy.java.aws.sigv4"
1414
dependencies {
1515
implementation(project(":client:client-core"))
1616
api(project(":aws:client:aws-client-core"))
17-
implementation(project(":http-api"))
17+
implementation(project(":http:http-api"))
1818
implementation(project(":io"))
1919
implementation(project(":logging"))
2020
implementation(libs.smithy.aws.traits)

aws/client/aws-client-awsjson/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ extra["moduleName"] = "software.amazon.smithy.java.aws.client.awsjson"
1111
dependencies {
1212
api(project(":client:client-http"))
1313
api(project(":codecs:json-codec"))
14-
api(project(":aws:event-streams"))
14+
api(project(":aws:aws-event-streams"))
1515
api(libs.smithy.aws.traits)
1616

1717
// Protocol test dependencies

aws/client/aws-client-http/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ extra["moduleName"] = "software.amazon.smithy.java.aws.client.http"
1010
dependencies {
1111
api(project(":aws:client:aws-client-core"))
1212
api(project(":client:client-http"))
13-
api(project(":http-api"))
13+
api(project(":http:http-api"))
1414

1515
testImplementation(project(":client:dynamic-client"))
16-
testImplementation(project(":client:mock-client-plugin"))
16+
testImplementation(project(":client:client-mock-plugin"))
1717
testImplementation(project(":aws:client:aws-client-awsjson"))
1818
}

aws/client/aws-client-restjson/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
api(project(":client:client-http-binding"))
1313
api(project(":client:client-http"))
1414
api(project(":codecs:json-codec"))
15-
api(project(":aws:event-streams"))
15+
api(project(":aws:aws-event-streams"))
1616
api(libs.smithy.aws.traits)
1717

1818
// Protocol test dependencies

aws/client/aws-client-restxml/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
api(project(":client:client-http-binding"))
1313
api(project(":client:client-http"))
1414
api(project(":codecs:xml-codec"))
15-
api(project(":aws:event-streams"))
15+
api(project(":aws:aws-event-streams"))
1616
api(libs.smithy.aws.traits)
1717

1818
// Protocol test dependencies

aws/integrations/lambda-endpoint/build.gradle.kts renamed to aws/integrations/aws-lambda-endpoint/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ extra["moduleName"] = "software.amazon.smithy.java.aws.integrations.lambda"
1212
dependencies {
1313
implementation("com.amazonaws:aws-lambda-java-core:1.2.3")
1414
implementation(project(":server:server-api"))
15-
implementation(project(":http-api"))
15+
implementation(project(":http:http-api"))
1616
implementation(project(":logging"))
1717
implementation(project(":core"))
1818
api(project(":server:server-core"))

aws/server/aws-server-restjson/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ extra["moduleName"] = "software.amazon.smithy.java.server-aws-rest-json1"
1010

1111
dependencies {
1212
api(project(":server:server-api"))
13-
api(project(":http-api"))
13+
api(project(":http:http-api"))
1414
api(libs.smithy.aws.traits)
1515
implementation(project(":server:server-core"))
1616
implementation(project(":context"))
1717
implementation(project(":core"))
1818
implementation(project(":codecs:json-codec"))
19-
implementation(project(":http-binding"))
19+
implementation(project(":http:http-binding"))
2020

2121
itImplementation(project(":server:server-api"))
2222
itImplementation(project(":server:server-netty"))

buildSrc/src/main/kotlin/smithy-java.codegen-plugin-conventions.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@ plugins {
88
// Workaround per: https://github.com/gradle/gradle/issues/15383
99
val Project.libs get() = the<org.gradle.accessors.dm.LibrariesForLibs>()
1010

11-
group = "software.amazon.smithy.java.codegen.plugins"
12-
1311
dependencies {
1412
implementation(libs.smithy.codegen)
1513
implementation(project(":core"))
1614
implementation(project(":logging"))
1715

1816
// Avoid circular dependency in codegen core
19-
if (project.name != "core") {
20-
api(project(":codegen:core"))
17+
if (project.name != "codegen-core") {
18+
api(project(":codegen:codegen-core"))
2119
}
2220
}
2321

client/client-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ dependencies {
1717

1818
testImplementation(project(":client:dynamic-client"))
1919
testImplementation(project(":aws:client:aws-client-restjson"))
20-
testImplementation(project(":client:mock-client-plugin"))
20+
testImplementation(project(":client:client-mock-plugin"))
2121
}

client/client-http-binding/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extra["moduleName"] = "software.amazon.smithy.java.client.http.binding"
1010
dependencies {
1111
api(project(":client:client-core"))
1212
api(project(":client:client-http"))
13-
api(project(":http-binding"))
13+
api(project(":http:http-binding"))
1414
implementation(project(":logging"))
1515

1616
testImplementation(project(":codecs:json-codec"))

client/client-http/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ extra["moduleName"] = "software.amazon.smithy.java.client.http"
99

1010
dependencies {
1111
api(project(":client:client-core"))
12-
api(project(":http-api"))
12+
api(project(":http:http-api"))
1313
implementation(project(":logging"))
1414

1515
testImplementation(project(":codecs:json-codec"))

client/dynamic-client/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ dependencies {
1313

1414
testImplementation(project(":aws:client:aws-client-restjson"))
1515
testImplementation(project(":aws:client:aws-client-awsjson"))
16-
testImplementation(project(":aws:sigv4"))
16+
testImplementation(project(":aws:aws-sigv4"))
1717
}

codegen/core/build.gradle.kts renamed to codegen/codegen-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
description = "This module provides the core codegen functionality for Smithy java"
7-
group = "software.amazon.smithy.java.codegen"
7+
88
extra["displayName"] = "Smithy :: Java :: Codegen :: Core"
99
extra["moduleName"] = "software.amazon.smithy.java.codegen.core"
1010

0 commit comments

Comments
 (0)