From 0d3dd22278e2ff6bcc60bd0f0a7d482209a78b78 Mon Sep 17 00:00:00 2001 From: Ian Levesque Date: Fri, 31 Jan 2025 18:55:47 -0800 Subject: [PATCH] Add java-swift language support Summary: This is a similar hack to what buck did with the javadeprecated client, adding a java_binary so we can get a self-contained set of fbcode deps over to fbandroid as a jar file. I don't love it and would be happy if someone knows an alternative. Moving to xplat was one failed approach I tried. It failed because the swift runtime still requires fbcode's third-party-java. Reviewed By: cute-jumper Differential Revision: D68968874 fbshipit-source-id: 1337a92b05929c331c6986fab582a40bad2146c8 --- third-party/watchman/src/eden/fs/config/eden_config.thrift | 1 + third-party/watchman/src/eden/fs/service/eden.thrift | 1 + third-party/watchman/src/eden/fs/service/streamingeden.thrift | 1 + 3 files changed, 3 insertions(+) diff --git a/third-party/watchman/src/eden/fs/config/eden_config.thrift b/third-party/watchman/src/eden/fs/config/eden_config.thrift index a5d2cc1bb19662..216fd339431348 100644 --- a/third-party/watchman/src/eden/fs/config/eden_config.thrift +++ b/third-party/watchman/src/eden/fs/config/eden_config.thrift @@ -7,6 +7,7 @@ namespace cpp2 facebook.eden namespace java com.facebook.eden.thrift +namespace java.swift com.facebook.eden.thrift.config namespace py facebook.eden.eden_config namespace py3 eden.fs.config namespace hack edenfs.config diff --git a/third-party/watchman/src/eden/fs/service/eden.thrift b/third-party/watchman/src/eden/fs/service/eden.thrift index 7858a1c23afba8..6f4dcaee0540ff 100644 --- a/third-party/watchman/src/eden/fs/service/eden.thrift +++ b/third-party/watchman/src/eden/fs/service/eden.thrift @@ -13,6 +13,7 @@ include "thrift/annotation/thrift.thrift" namespace cpp2 facebook.eden namespace java com.facebook.eden.thrift +namespace java.swift com.facebook.eden.thrift namespace py facebook.eden namespace py3 eden.fs.service namespace hack edenfs.service diff --git a/third-party/watchman/src/eden/fs/service/streamingeden.thrift b/third-party/watchman/src/eden/fs/service/streamingeden.thrift index 3908e566815b85..f59b39eb42193c 100644 --- a/third-party/watchman/src/eden/fs/service/streamingeden.thrift +++ b/third-party/watchman/src/eden/fs/service/streamingeden.thrift @@ -7,6 +7,7 @@ include "eden/fs/service/eden.thrift" namespace cpp2 facebook.eden +namespace java.swift com.facebook.eden.thrift.streaming namespace py3 eden.fs.service enum FsEventType {