Skip to content

Commit f5ff2c3

Browse files
Removing the FileObserver protocol that intended to replace SpeakEasy, as the LocalSocket protocol is superior and the FileObserver protocol was never adopted.
PiperOrigin-RevId: 703192031
1 parent 8199b18 commit f5ff2c3

12 files changed

+5
-1204
lines changed

services/CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
**Bug Fixes**
88

9+
* The obsolete FileObserver protocol has been removed in favor of the
10+
LocalSocket-based protocol.
11+
912
**New Features**
1013

1114
**Breaking Changes**

services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD

-30
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,6 @@ package(default_applicable_licenses = ["//services:license"])
99

1010
licenses(["notice"])
1111

12-
kt_android_library(
13-
name = "coroutine_file_observer",
14-
srcs = [
15-
"CoroutineFileObserver.kt",
16-
],
17-
visibility = ["//visibility:private"],
18-
deps = [
19-
"@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
20-
],
21-
)
22-
23-
kt_android_library(
24-
name = "file_observer_protocol",
25-
srcs = [
26-
"FileObserverProtocol.kt",
27-
"Messages.kt",
28-
],
29-
visibility = [
30-
"//services/shellexecutor/javatests/androidx/test/services/shellexecutor:__subpackages__",
31-
],
32-
)
33-
3412
proto_library(
3513
name = "local_socket_protocol_pb",
3614
srcs = ["local_socket_protocol.proto"],
@@ -61,21 +39,17 @@ kt_android_library(
6139
name = "exec_server",
6240
srcs = [
6341
"BlockingPublish.java",
64-
"FileObserverShellMain.kt",
6542
"LocalSocketShellMain.kt",
6643
"ShellCommand.java",
6744
"ShellCommandExecutor.java",
6845
"ShellCommandExecutorServer.java",
69-
"ShellCommandFileObserverExecutorServer.kt",
7046
"ShellCommandLocalSocketExecutorServer.kt",
7147
"ShellExecSharedConstants.java",
7248
"ShellMain.java",
7349
],
7450
idl_srcs = ["Command.aidl"],
7551
visibility = [":export"],
7652
deps = [
77-
":coroutine_file_observer",
78-
":file_observer_protocol",
7953
":local_socket_protocol",
8054
":local_socket_protocol_pb_java_proto_lite",
8155
"//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
@@ -93,20 +67,16 @@ kt_android_library(
9367
"ClientNotConnected.java",
9468
"ShellCommand.java",
9569
"ShellCommandClient.java",
96-
"ShellCommandFileObserverClient.kt",
9770
"ShellCommandLocalSocketClient.kt",
9871
"ShellExecSharedConstants.java",
9972
"ShellExecutor.java",
10073
"ShellExecutorFactory.java",
101-
"ShellExecutorFileObserverImpl.kt",
10274
"ShellExecutorImpl.java",
10375
"ShellExecutorLocalSocketImpl.kt",
10476
],
10577
idl_srcs = ["Command.aidl"],
10678
visibility = [":export"],
10779
deps = [
108-
":coroutine_file_observer",
109-
":file_observer_protocol",
11080
":local_socket_protocol",
11181
":local_socket_protocol_pb_java_proto_lite",
11282
"//services/speakeasy/java/androidx/test/services/speakeasy:protocol",

services/shellexecutor/java/androidx/test/services/shellexecutor/CoroutineFileObserver.kt

-197
This file was deleted.

0 commit comments

Comments
 (0)