Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies to match aws-iot-device-sdk 1.19.1; stop limiting port to 16 bits #7

Merged
merged 1 commit into from
Feb 1, 2024
Merged

Update dependencies to match aws-iot-device-sdk 1.19.1; stop limiting port to 16 bits #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions event-stream-rpc-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ tasks.withType<JavaCompile> {

dependencies {
implementation(project(":event-stream-rpc-model"))
implementation("com.google.code.gson:gson:2.8.6")
implementation("software.amazon.awssdk.crt:aws-crt:0.16.14")
implementation("com.google.code.gson:gson:2.9.0")
implementation("software.amazon.awssdk.crt:aws-crt:0.29.9")

testImplementation("org.json:json:20200518")
testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0")
testImplementation("org.json:json:20231013")
testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1")
testImplementation("org.junit.platform:junit-platform-console-standalone:1.7.0")
testRuntimeOnly("org.slf4j:slf4j-jdk14:1.7.30")

Expand Down
2 changes: 1 addition & 1 deletion ...-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public CompletableFuture<Void> connect(final LifecycleHandler lifecycleHandler)
}
final CompletableFuture<Void> initialConnectFuture = new CompletableFuture<>();

ClientConnection.connect(config.getHost(), (short) config.getPort(), config.getSocketOptions(),
ClientConnection.connect(config.getHost(), config.getPort(), config.getSocketOptions(),
config.getTlsContext(), config.getClientBootstrap(), new ClientConnectionHandler() {
@Override
protected void onConnectionSetup(final ClientConnection clientConnection, int errorCode) {
Expand Down
3 changes: 0 additions & 3 deletions ...t/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ public EventStreamRPCConnectionConfig(ClientBootstrap clientBootstrap, EventLoop
this.port = port;
this.connectMessageAmender = connectMessageAmender;

//perform cast to throw exception here if port value is out of short value range
final short shortPort = (short)port;

//bit of C++ RAII here, validate what we can
if (clientBootstrap == null || eventLoopGroup == null || socketOptions == null ||
host == null || host.isEmpty() || port < 0) {
Expand Down
12 changes: 6 additions & 6 deletions event-stream-rpc-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ tasks.withType<JavaCompile> {
}

dependencies {
testImplementation("org.json:json:20200518")
implementation("com.google.code.gson:gson:2.8.6")
implementation("software.amazon.awssdk.crt:aws-crt:0.16.14")
testImplementation("org.json:json:20231013")
implementation("com.google.code.gson:gson:2.9.0")
implementation("software.amazon.awssdk.crt:aws-crt:0.29.9")

testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1")
testRuntimeOnly("org.slf4j:slf4j-jdk14:1.7.30")

testImplementation(project(":test-model-codegen"))
Expand Down
10 changes: 5 additions & 5 deletions event-stream-rpc-server/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ tasks.withType<JavaCompile> {

dependencies {
implementation(project(":event-stream-rpc-model"))
implementation("com.google.code.gson:gson:2.8.6")
implementation("software.amazon.awssdk.crt:aws-crt:0.16.14")
implementation("com.google.code.gson:gson:2.9.0")
implementation("software.amazon.awssdk.crt:aws-crt:0.29.9")
implementation("org.slf4j:slf4j-api:1.7.30")

testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1")

//pull in server for tests
testImplementation(project(":test-model-codegen"))
Expand Down
2 changes: 1 addition & 1 deletion event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/RpcServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void runServer() {
}
serverBootstrap = new ServerBootstrap(eventLoopGroup);
tlsContext = tlsContextOptions != null ? new ServerTlsContext(tlsContextOptions) : null;
listener = new ServerListener(hostname, (short) port, socketOptions, tlsContext, serverBootstrap, new ServerListenerHandler() {
listener = new ServerListener(hostname, port, socketOptions, tlsContext, serverBootstrap, new ServerListenerHandler() {
@Override
public ServerConnectionHandler onNewConnection(ServerConnection serverConnection, int errorCode) {
try {
Expand Down
4 changes: 2 additions & 2 deletions greengrass-client/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ dependencies {
implementation(project(":event-stream-rpc-model"))
implementation(project(":event-stream-rpc-client"))

implementation("software.amazon.awssdk.crt:aws-crt:0.16.14")
implementation("com.google.code.gson:gson:2.8.6")
implementation("com.google.code.gson:gson:2.9.0")
implementation("software.amazon.awssdk.crt:aws-crt:0.29.9")
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
Expand Down
4 changes: 2 additions & 2 deletions greengrass-server/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ dependencies {
implementation(project(":event-stream-rpc-model"))
implementation(project(":event-stream-rpc-server"))

implementation("software.amazon.awssdk.crt:aws-crt:0.16.14")
implementation("com.google.code.gson:gson:2.8.6")
implementation("com.google.code.gson:gson:2.9.0")
implementation("software.amazon.awssdk.crt:aws-crt:0.29.9")
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
Expand Down
4 changes: 2 additions & 2 deletions import-spec.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# sdk version to build from
SDK_VERSION=1.12.1
SDK_VERSION=1.19.1

# target sdk version to deploy
TARGET_VERSION=1.12.2-CLI-SNAPSHOT
TARGET_VERSION=1.19.1-CLI-SNAPSHOT

#Python sdk to build on top of
PYTHON_SDK_VERSION=1.6.1
Expand Down
6 changes: 3 additions & 3 deletions smithy-event-stream-rpc-cpp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ dependencies {
implementation("org.jsoup:jsoup:1.13.1")
implementation("software.amazon.smithy:smithy-protocol-test-traits:[1.0.2,1.1.0[")

testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1")
testCompileOnly("org.hamcrest:hamcrest:2.1")
}
6 changes: 3 additions & 3 deletions smithy-event-stream-rpc-java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ dependencies {
implementation("org.jsoup:jsoup:1.13.1")
implementation("software.amazon.smithy:smithy-protocol-test-traits:[1.0.2,1.1.0[")

testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1")
testCompileOnly("org.hamcrest:hamcrest:2.1")
}
6 changes: 3 additions & 3 deletions smithy-event-stream-rpc-javascript/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ dependencies {
implementation("org.jsoup:jsoup:1.13.1")
implementation("software.amazon.smithy:smithy-protocol-test-traits:[1.0.2,1.1.0[")

testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1")
testCompileOnly("org.hamcrest:hamcrest:2.1")
}
6 changes: 3 additions & 3 deletions smithy-event-stream-rpc-python/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ dependencies {
implementation("org.jsoup:jsoup:1.13.1")
implementation("software.amazon.smithy:smithy-protocol-test-traits:[1.0.2,1.1.0[")

testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0")
testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1")
testCompileOnly("org.hamcrest:hamcrest:2.1")
}
10 changes: 5 additions & 5 deletions test-model-codegen/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ dependencies {
implementation(project(":event-stream-rpc-client"))
implementation(project(":event-stream-rpc-server"))

compileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0")
compileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0")
runtimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0")
compileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1")
compileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1")
runtimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")

implementation("software.amazon.awssdk.crt:aws-crt:0.16.14")
implementation("com.google.code.gson:gson:2.8.6")
implementation("com.google.code.gson:gson:2.9.0")
implementation("software.amazon.awssdk.crt:aws-crt:0.29.9")
}

java {
Expand Down
Loading