diff --git a/Package.swift b/Package.swift index d3d56601..d134633d 100644 --- a/Package.swift +++ b/Package.swift @@ -55,87 +55,10 @@ let package = Package( name: "google-toolbox-for-mac", path: "third_party/google-toolbox-for-mac", exclude: [ - "google-toolbox-for-mac/Foundation/GTMNSString+HTMLTest.m", - "google-toolbox-for-mac/Foundation/GTMSystemVersionTest.m", - "google-toolbox-for-mac/Foundation/GTMNSFileHandle+UniqueName.m", - "google-toolbox-for-mac/Foundation/GTMLoggerRingBufferWriterTest.m", - "google-toolbox-for-mac/Foundation/GTMNSData+zlib.m", - "google-toolbox-for-mac/Foundation/GTMNSNumber+64BitTest.m", - "google-toolbox-for-mac/Foundation/GTMScriptRunnerTest.m", - "google-toolbox-for-mac/Foundation/GTMSystemVersion.m", - "google-toolbox-for-mac/Foundation/GTMFileSystemKQueueTest.m", - "google-toolbox-for-mac/Foundation/GTMFileSystemKQueue.m", - "google-toolbox-for-mac/Foundation/GTMGeometryUtilsTest.m", - "google-toolbox-for-mac/Foundation/GTMLocalizedStringTest.m", - "google-toolbox-for-mac/Foundation/BUILD", - "google-toolbox-for-mac/Foundation/GTMSQLite.m", - "google-toolbox-for-mac/Foundation/GTMLoggerRingBufferWriter.m", - "google-toolbox-for-mac/Foundation/GTMStringEncoding.m", - "google-toolbox-for-mac/Foundation/GTMNSFileHandle+UniqueNameTest.m", - "google-toolbox-for-mac/Foundation/GTMLogger+ASLTest.m", - "google-toolbox-for-mac/Foundation/GTMNSObject+KeyValueObservingTest.m", - "google-toolbox-for-mac/Foundation/GTMNSString+XMLTest.m", - "google-toolbox-for-mac/Foundation/GTMNSThread+BlocksTest.m", - "google-toolbox-for-mac/Foundation/GTMNSString+HTML.m", - "google-toolbox-for-mac/Foundation/GTMSignalHandlerTest.m", - "google-toolbox-for-mac/Foundation/GTMURLBuilderTest.m", - "google-toolbox-for-mac/Foundation/GTMLoggerTest.m", - "google-toolbox-for-mac/Foundation/GTMServiceManagementTestingHarness.c", - "google-toolbox-for-mac/Foundation/GTMSQLiteTest.m", - "google-toolbox-for-mac/Foundation/GTMTimeUtilsTest.m", - "google-toolbox-for-mac/Foundation/GTMNSFileManager+PathTest.m", - "google-toolbox-for-mac/Foundation/GTMServiceManagement.c", - "google-toolbox-for-mac/Foundation/GTMNSString+URLArgumentsTest.m", - "google-toolbox-for-mac/Foundation/GTMRegexTest.m", - "google-toolbox-for-mac/Foundation/GTMNSThread+Blocks.m", - "google-toolbox-for-mac/Foundation/GTMNSScanner+JSONTest.m", - "google-toolbox-for-mac/Foundation/GTMNSData+zlibTest.m", - "google-toolbox-for-mac/Foundation/GTMNSDictionary+URLArgumentsTest.m", - "google-toolbox-for-mac/Foundation/GTMLogger+ASL.m", - "google-toolbox-for-mac/Foundation/GTMServiceManagementTest.m", - "google-toolbox-for-mac/Foundation/GTMNSString+URLArguments.m", - "google-toolbox-for-mac/Foundation/GTMNSNumber+64Bit.m", - "google-toolbox-for-mac/Foundation/GTMNSScanner+JSON.m", - "google-toolbox-for-mac/Foundation/GTMGeometryUtils.m", - "google-toolbox-for-mac/Foundation/GTMRegex.m", - "google-toolbox-for-mac/Foundation/GTMScriptRunner.m", - "google-toolbox-for-mac/Foundation/GTMStackTrace.m", - "google-toolbox-for-mac/Foundation/GTMURLBuilder.m", - "google-toolbox-for-mac/Foundation/GTMNSString+FindFolderTest.m", - "google-toolbox-for-mac/Foundation/GTMObjC2Runtime.m", - "google-toolbox-for-mac/Foundation/GTMNSString+FindFolder.m", - "google-toolbox-for-mac/Foundation/GTMNSDictionary+URLArguments.m", - "google-toolbox-for-mac/Foundation/GTMStackTraceTest.m", - "google-toolbox-for-mac/Foundation/GTMLightweightProxyTest.m", - "google-toolbox-for-mac/Foundation/GTMNSFileManager+Path.m", - "google-toolbox-for-mac/Foundation/GTMStringEncodingTest.m", - "google-toolbox-for-mac/Foundation/GTMNSObject+KeyValueObserving.m", - "google-toolbox-for-mac/Foundation/GTMTimeUtils.m", - "google-toolbox-for-mac/Foundation/GTMSignalHandler.m", - "google-toolbox-for-mac/Foundation/GTMNSString+XML.m", - "google-toolbox-for-mac/Foundation/GTMLightweightProxy.m", "google-toolbox-for-mac/AppKit", - "google-toolbox-for-mac/DebugUtils", - "google-toolbox-for-mac/LICENSE", - "google-toolbox-for-mac/WORKSPACE", - "google-toolbox-for-mac/BUILD", - "google-toolbox-for-mac/GTMiPhone-Info.plist", - "google-toolbox-for-mac/README.md", - "google-toolbox-for-mac/XcodeConfig", - "google-toolbox-for-mac/BuildingAndUsing.txt", - "google-toolbox-for-mac/GTM-Info.plist", - "google-toolbox-for-mac/GTMiPhone.xcodeproj", - "google-toolbox-for-mac/UnitTest-Info.plist", - "google-toolbox-for-mac/bazel_support", - "google-toolbox-for-mac/CONTRIBUTING.md", - "google-toolbox-for-mac/GTM.xcodeproj", - "google-toolbox-for-mac/GoogleToolboxForMac.podspec", "google-toolbox-for-mac/UnitTesting", - "google-toolbox-for-mac/iPhone", - ], - sources: [ - "google-toolbox-for-mac/Foundation/GTMLogger.m" ], + sources: ["google-toolbox-for-mac/Foundation/GTMLogger.m"], publicHeadersPath: "include", cSettings: [ .headerSearchPath("google-toolbox-for-mac/"), @@ -145,38 +68,7 @@ let package = Package( .target( name: "smhasher", path: "third_party/smhasher", - exclude: [ - "include", - "smhasher/src/CMakeLists.txt", - "smhasher/src/main.cpp", - "smhasher/README.md", - "smhasher/src/AvalancheTest.cpp", - "smhasher/src/Bitslice.cpp", - "smhasher/src/Bitvec.cpp", - "smhasher/src/CityTest.cpp", - "smhasher/src/City.cpp", - "smhasher/src/crc.cpp", - "smhasher/src/DifferentialTest.cpp", - "smhasher/src/Hashes.cpp", - "smhasher/src/KeysetTest.cpp", - "smhasher/src/lookup3.cpp", - "smhasher/src/md5.cpp", - "smhasher/src/MurmurHash1.cpp", - "smhasher/src/MurmurHash2.cpp", - "smhasher/src/Platform.cpp", - "smhasher/src/Random.cpp", - "smhasher/src/sha1.cpp", - "smhasher/src/SpeedTest.cpp", - "smhasher/src/Spooky.cpp", - "smhasher/src/SpookyTest.cpp", - "smhasher/src/Stats.cpp", - "smhasher/src/SuperFastHash.cpp", - "smhasher/src/Types.cpp", - "smhasher/src/PMurHash.c", - ], - sources: [ - "smhasher/src/MurmurHash3.cpp" - ], + sources: ["smhasher/src/MurmurHash3.cpp"], publicHeadersPath: "include", cSettings: [ .headerSearchPath("smhasher/src/") @@ -192,22 +84,7 @@ let package = Package( moduleAliases: ["NearbySSL": "openssl_grpc"]), ], path: "third_party/ukey2", - exclude: [ - "ukey2/src/main/cpp/src/securegcm/ukey2_shell.cc", - "ukey2/src/main/cpp/test", - "ukey2/src/main/java", - "ukey2/src/main/javatest", - "ukey2/src/main/proto", - "ukey2/third_party", - "ukey2/Android.bp", - "ukey2/build.gradle", - "ukey2/CONTRIBUTING.md", - "ukey2/LICENSE", - "ukey2/MODULE_LICENSE_APACHE2", - "ukey2/NOTICE", - "ukey2/README", - "ukey2/README.md", - ], + exclude: ["ukey2/src/main/cpp/src/securegcm/ukey2_shell.cc"], sources: [ "ukey2/src/securemessage/src/securemessage", "ukey2/src/main/cpp/src/securegcm", @@ -223,23 +100,6 @@ let package = Package( .target( name: "json", path: "third_party/json", - exclude: [ - "json/LICENSES", - "json/cmake", - "json/docs", - "json/single_include", - "json/tests", - "json/tools", - "json/CITATION.cff", - "json/CMakeLists.txt", - "json/ChangeLog.md", - "json/LICENSE.MIT", - "json/Makefile", - "json/README.md", - "json/meson.build", - "json/nlohmann_json.natvis", - "json/wsjcpp.yml", - ], sources: ["EmptySwiftPackageManagerFile.cpp"], publicHeadersPath: "json/include" ), @@ -247,12 +107,6 @@ let package = Package( name: "protobuf", path: "third_party/protobuf/src", exclude: [ - "solaris", - "libprotoc.map", - "libprotobuf-lite.map", - "Makefile.am", - "libprotobuf.map", - "README.md", "google/protobuf/compiler", "google/protobuf/testdata", "google/protobuf/testing", @@ -362,16 +216,14 @@ let package = Package( "google/protobuf/map_test.inc", "google/protobuf/reflection_tester.cc", ], - sources: [ - "google/protobuf" - ], + sources: ["google/protobuf"], publicHeadersPath: ".", cSettings: [ .headerSearchPath("./") ] ), .target( - name: "NearbyCoreAdapter", + name: "NearbyCommon", dependencies: [ "google-toolbox-for-mac", "json", @@ -383,18 +235,11 @@ let package = Package( path: ".", exclude: [ "compiled_proto/connections/cpp", - "presence", - "embedded", "connections/c", "connections/dart", - "connections/java", - "connections/clients/ios", "connections/README.md", - "connections/swift/NearbyConnections", - "connections/swift/NearbyCoreAdapter/BUILD", - "connections/swift/NearbyCoreAdapter/Tests", + "connections/swift", "internal/platform/implementation/g3", - "internal/platform/implementation/android", "internal/platform/implementation/apple/Flags/Tests", "internal/platform/implementation/apple/Log/Tests", "internal/platform/implementation/apple/Mediums/BLE/Tests", @@ -404,10 +249,6 @@ let package = Package( "internal/platform/implementation/apple/Tests", "internal/platform/implementation/windows", "third_party", - "CONTRIBUTING.md", - "LICENSE", - "README.md", - "WORKSPACE", // build files "connections/implementation/analytics/BUILD", "connections/implementation/flags/BUILD", @@ -420,7 +261,6 @@ let package = Package( "connections/v3/BUILD", "connections/BUILD", "internal/crypto/BUILD", - "internal/crypto/BUILD.gn", "internal/crypto_cros/BUILD", "internal/encoding/BUILD", "internal/interop/BUILD", @@ -525,7 +365,6 @@ let package = Package( "internal/crypto_cros/symmetric_key_unittest.cc", "internal/encoding/base85_test.cc", "internal/data/leveldb_data_set_test.cc", - "internal/data/memory_data_set_test.cc", "internal/flags/nearby_flags_test.cc", "internal/proto/analytics/connections_log_test.cc", "internal/platform/feature_flags_test.cc", @@ -533,7 +372,6 @@ let package = Package( "internal/platform/cancelable_alarm_test.cc", "internal/platform/crypto_test.cc", "internal/platform/byte_array_test.cc", - "internal/platform/bluetooth_utils_test.cc", "internal/platform/credential_storage_impl_test.cc", "internal/platform/implementation/g3/awdl_test.cc", "internal/platform/implementation/g3/ble_v2_test.cc", @@ -590,13 +428,11 @@ let package = Package( "internal/network/http_request_test.cc", "internal/network/http_client_impl_test.cc", "internal/network/http_status_code_test.cc", - "internal/test/google3_only/fake_authentication_manager_test.cc", "internal/test/fake_clock_test.cc", "internal/test/fake_webrtc.cc", "internal/test/fake_timer_test.cc", "internal/test/fake_device_info_test.cc", "internal/test/fake_task_runner_test.cc", - "internal/test/fake_data_set_test.cc", "internal/test/fake_http_client_test.cc", "internal/weave/base_socket_test.cc", "internal/weave/control_packet_write_request_test.cc", @@ -629,57 +465,51 @@ let package = Package( "internal", "proto", ], - publicHeadersPath: "connections/swift/NearbyCoreAdapter/Sources/Public", + publicHeadersPath: "connections", cSettings: [ .headerSearchPath("./"), .headerSearchPath("compiled_proto/"), .headerSearchPath("third_party/ukey2/ukey2/"), .headerSearchPath("third_party/ukey2/compiled_proto/"), .define("NO_WEBRTC"), - .define("NEARBY_SWIFTPM"), + ] + ), + .target( + name: "NearbyConnectionsC", + dependencies: ["NearbyCommon"], + path: ".", + exclude: [ + "connections/c/BUILD", + "connections/c/macOS_exported_symbols.txt", + "third_party", + ], + sources: ["connections/c"], + publicHeadersPath: "connections/c", + cSettings: [ + .headerSearchPath("./"), + .headerSearchPath("compiled_proto/"), + .define("NO_WEBRTC"), + ] + ), + .target( + name: "NearbyCoreAdapter", + dependencies: ["NearbyCommon"], + path: ".", + exclude: ["third_party"], + sources: ["connections/swift/NearbyCoreAdapter/Sources"], + publicHeadersPath: "connections/swift/NearbyCoreAdapter/Sources/Public", + cSettings: [ + .headerSearchPath("./"), + .headerSearchPath("compiled_proto/"), + .define("NO_WEBRTC"), ] ), .target( name: "NearbyConnections", dependencies: ["NearbyCoreAdapter"], path: ".", - exclude: [ - "compiled_proto", - "connections/c", - "connections/dart", - "connections/java", - "connections/clients/ios", - "connections/swift/NearbyCoreAdapter", - "connections/swift/NearbyConnections/BUILD", - "connections/swift/NearbyConnections/Tests", - "connections/BUILD", - "connections/discovery_options.cc", - "connections/status.cc", - "connections/listeners_test.cc", - "connections/advertising_options.cc", - "connections/payload.cc", - "connections/strategy_test.cc", - "connections/connection_options.cc", - "connections/core_test.cc", - "connections/status_test.cc", - "connections/core.cc", - "connections/strategy.cc", - "connections/payload_test.cc", - "connections/implementation", - "docs", - "embedded", - "internal", - "presence", - "proto", - "third_party", - "CONTRIBUTING.md", - "LICENSE", - "README.md", - "WORKSPACE", - ], - sources: [ - "connections/swift/NearbyConnections/Sources" - ] + exclude: ["third_party"], + sources: ["connections/swift/NearbyConnections/Sources"] ), .testTarget( name: "NearbyCoreAdapterTests",