[version roller] Update dependencies
SDK version updated from 10.20221130.0.1 to 11.20230109.3.1
Change-Id: I945734a98e3bca6e6d54aef4f52e8e70c93ad004
Reviewed-on: https://fuchsia-review.googlesource.com/c/sdk-samples/getting-started/+/786966
Reviewed-by: Wayne Piekarski <waynepie@google.com>
diff --git a/src/routing/cpp/echo_client/main.cc b/src/routing/cpp/echo_client/main.cc
index bb88bae..6ca2f8f 100644
--- a/src/routing/cpp/echo_client/main.cc
+++ b/src/routing/cpp/echo_client/main.cc
@@ -4,7 +4,6 @@
// [START imports]
#include <fidl/examples.routing.echo/cpp/fidl.h>
-#include <lib/fidl/cpp/string.h>
#include <lib/component/incoming/cpp/service_client.h>
#include <lib/syslog/global.h>
diff --git a/src/routing/cpp/echo_server/BUILD.bazel b/src/routing/cpp/echo_server/BUILD.bazel
index f559bd1..193a21d 100644
--- a/src/routing/cpp/echo_server/BUILD.bazel
+++ b/src/routing/cpp/echo_server/BUILD.bazel
@@ -26,7 +26,7 @@
"@fuchsia_sdk//pkg/fdio",
"@fuchsia_sdk//pkg/inspect",
"@fuchsia_sdk//pkg/inspect_component_cpp",
- "@fuchsia_sdk//pkg/sys_component_cpp",
+ "@fuchsia_sdk//pkg/component_outgoing_cpp",
"@fuchsia_sdk//pkg/syslog",
],
)
@@ -38,18 +38,18 @@
src = "meta/echo_server.cml",
component_name = "echo_server_component",
includes = [
- "@fuchsia_sdk//pkg/syslog:client",
"@fuchsia_sdk//pkg/inspect:client",
+ "@fuchsia_sdk//pkg/syslog:client",
],
)
fuchsia_component(
name = "echo_server_component",
component_name = "echo_server_component",
- deps = [
- ':echo_server_cpp',
- ],
manifest = ":manifest",
visibility = ["//visibility:public"],
+ deps = [
+ ":echo_server_cpp",
+ ],
)
# [END component]
diff --git a/src/routing/cpp/echo_server/main.cc b/src/routing/cpp/echo_server/main.cc
index 5134378..0fcbb03 100644
--- a/src/routing/cpp/echo_server/main.cc
+++ b/src/routing/cpp/echo_server/main.cc
@@ -6,9 +6,8 @@
#include <fidl/examples.routing.echo/cpp/fidl.h>
#include <lib/async-loop/cpp/loop.h>
#include <lib/async-loop/default.h>
-#include <lib/fidl/cpp/binding.h>
#include <lib/inspect/component/cpp/component.h>
-#include <lib/sys/component/cpp/outgoing_directory.h>
+#include <lib/component/outgoing/cpp/outgoing_directory.h>
#include <lib/syslog/global.h>
// [END imports]
@@ -50,7 +49,7 @@
// Serve the Echo protocol
std::unique_ptr<EchoImplementation> echo_instance = std::make_unique<EchoImplementation>();
- zx::result result = outgoing.AddProtocol<examples_routing_echo::Echo>(echo_instance.get());
+ zx::result result = outgoing.AddProtocol<examples_routing_echo::Echo>(std::move(echo_instance));
if (result.is_error()) {
FX_LOGF(ERROR, "echo_server", "Failed to add Echo protocol: %s", result.status_string());
return -1;
diff --git a/src/routing/cpp/inspect_server/BUILD.bazel b/src/routing/cpp/inspect_server/BUILD.bazel
index d863306..3c5029f 100644
--- a/src/routing/cpp/inspect_server/BUILD.bazel
+++ b/src/routing/cpp/inspect_server/BUILD.bazel
@@ -26,7 +26,7 @@
"@fuchsia_sdk//pkg/fdio",
"@fuchsia_sdk//pkg/inspect",
"@fuchsia_sdk//pkg/inspect_component_cpp",
- "@fuchsia_sdk//pkg/sys_component_cpp",
+ "@fuchsia_sdk//pkg/component_outgoing_cpp",
"@fuchsia_sdk//pkg/syslog",
],
)
@@ -37,17 +37,17 @@
src = "meta/echo_server.cml",
component_name = "inspect_server_component",
includes = [
- "@fuchsia_sdk//pkg/syslog:client",
"@fuchsia_sdk//pkg/inspect:client",
+ "@fuchsia_sdk//pkg/syslog:client",
],
)
fuchsia_component(
name = "inspect_server_component",
component_name = "inspect_server_component",
- deps = [
- ':inspect_server_cpp',
- ],
manifest = ":manifest",
visibility = ["//visibility:public"],
+ deps = [
+ ":inspect_server_cpp",
+ ],
)
diff --git a/src/routing/cpp/inspect_server/main.cc b/src/routing/cpp/inspect_server/main.cc
index 0707793..5c731dc 100644
--- a/src/routing/cpp/inspect_server/main.cc
+++ b/src/routing/cpp/inspect_server/main.cc
@@ -6,9 +6,8 @@
#include <fidl/examples.routing.echo/cpp/fidl.h>
#include <lib/async-loop/cpp/loop.h>
#include <lib/async-loop/default.h>
-#include <lib/fidl/cpp/binding.h>
#include <lib/inspect/component/cpp/component.h>
-#include <lib/sys/component/cpp/outgoing_directory.h>
+#include <lib/component/outgoing/cpp/outgoing_directory.h>
#include <lib/syslog/global.h>
// [END imports]
@@ -61,7 +60,7 @@
// Serve the Echo protocol
std::unique_ptr<EchoImplementation> echo_instance = std::make_unique<EchoImplementation>();
// [END echo_instance]
- zx::result result = outgoing.AddProtocol<examples_routing_echo::Echo>(echo_instance.get());
+ zx::result result = outgoing.AddProtocol<examples_routing_echo::Echo>(std::move(echo_instance));
if (result.is_error()) {
FX_LOGF(ERROR, "echo_server", "Failed to add Echo protocol: %s", result.status_string());
return -1;
diff --git a/src/routing/integration_tests/echo_integration_test.cc b/src/routing/integration_tests/echo_integration_test.cc
index bf29fbe..47374b1 100644
--- a/src/routing/integration_tests/echo_integration_test.cc
+++ b/src/routing/integration_tests/echo_integration_test.cc
@@ -5,7 +5,6 @@
// [START example_snippet]
#include <fidl/examples.routing.echo/cpp/fidl.h>
#include <gtest/gtest.h>
-#include <lib/fidl/cpp/string.h>
#include <lib/component/incoming/cpp/service_client.h>
#include <string>
diff --git a/third_party/sdk-integration b/third_party/sdk-integration
index a43e2e0..90f105d 160000
--- a/third_party/sdk-integration
+++ b/third_party/sdk-integration
@@ -1 +1 @@
-Subproject commit a43e2e0504a5c57446c5d86d7668ffb0682f1edf
+Subproject commit 90f105d158c93262b18d11e1861b4f3b440311ea
