Fix native build

realm · Sep 9, 2024 · 36a7bda · 36a7bda
1 parent 1344d89
commit 36a7bda
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 54 deletions.
diff --git a/Realm - Windows.sln b/Realm - Windows.sln
@@ -55,8 +55,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Storage", "wrappers\cmake\W
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Realm.UnityUtils", "Realm\Realm.UnityUtils\Realm.UnityUtils.csproj", "{693D198D-C4F4-44B5-8C04-11544E0FE79A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sync", "wrappers\cmake\Windows\Debug-Win32\realm-core\src\realm\sync\Sync.vcxproj", "{CD7F1F01-CBD4-3CF6-892A-230FB024217C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Realm.UnityWeaver", "Realm\Realm.UnityWeaver\Realm.UnityWeaver.csproj", "{9322B1D0-B3F7-4D6A-9947-2FC11D3161A0}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Realm.Weaver", "Realm\Realm.Weaver\Realm.Weaver.shproj", "{89FDB2A1-6FC0-4604-9AEB-8B8DD8A88DEC}"
@@ -731,34 +729,6 @@ Global
 		{693D198D-C4F4-44B5-8C04-11544E0FE79A}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 		{693D198D-C4F4-44B5-8C04-11544E0FE79A}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
 		{693D198D-C4F4-44B5-8C04-11544E0FE79A}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Debug|ARM.ActiveCfg = Debug|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Debug|iPhone.ActiveCfg = Debug|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Debug|x64.ActiveCfg = Debug|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Debug|x86.ActiveCfg = Debug|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Debug|x86.Build.0 = Debug|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.MinSizeRel|ARM.ActiveCfg = MinSizeRel|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.MinSizeRel|iPhone.ActiveCfg = MinSizeRel|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.MinSizeRel|iPhoneSimulator.ActiveCfg = MinSizeRel|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.MinSizeRel|x64.ActiveCfg = MinSizeRel|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.MinSizeRel|x86.Build.0 = MinSizeRel|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Release|Any CPU.ActiveCfg = Release|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Release|ARM.ActiveCfg = Release|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Release|iPhone.ActiveCfg = Release|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Release|iPhoneSimulator.ActiveCfg = Release|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Release|x64.ActiveCfg = Release|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Release|x86.ActiveCfg = Release|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.Release|x86.Build.0 = Release|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.RelWithDebInfo|ARM.ActiveCfg = RelWithDebInfo|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.RelWithDebInfo|iPhone.ActiveCfg = RelWithDebInfo|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.RelWithDebInfo|iPhoneSimulator.ActiveCfg = RelWithDebInfo|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32
-		{CD7F1F01-CBD4-3CF6-892A-230FB024217C}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32
 		{9322B1D0-B3F7-4D6A-9947-2FC11D3161A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9322B1D0-B3F7-4D6A-9947-2FC11D3161A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9322B1D0-B3F7-4D6A-9947-2FC11D3161A0}.Debug|ARM.ActiveCfg = Debug|Any CPU

diff --git a/wrappers/src/error_handling.cpp b/wrappers/src/error_handling.cpp
@@ -29,8 +29,6 @@
 #include <realm/alloc_slab.hpp>
 #include <realm/object-store/object_accessor.hpp>
 
-using namespace realm::app;
-
 namespace realm {
     /**
     @note mostly copied from util.cpp in Java but has a much richer range of exceptions
@@ -53,17 +51,6 @@ namespace realm {
         catch (const ManagedExceptionDuringCallback& e) {
             return NativeException(e, CustomError::None, e.m_managed_error);
         }
-        catch (const AppError& e) {
-            REALM_ASSERT_DEBUG(e.additional_status_code == util::none);
-            REALM_ASSERT_DEBUG(e.link_to_server_logs == "");
-
-            return NativeException(e);
-        }
-        catch (const SyncError& e) {
-            REALM_ASSERT_DEBUG(false);
-
-            return NativeException(e.status.code(), e.status.reason());
-        }
         catch (const Exception& e) {
             return NativeException(e);
         }

diff --git a/wrappers/src/shared_realm_cs.cpp b/wrappers/src/shared_realm_cs.cpp
@@ -28,10 +28,7 @@
 #include <realm/object-store/binding_context.hpp>
 #include <realm/object-store/object_accessor.hpp>
 #include <realm/object-store/thread_safe_reference.hpp>
-#include <realm/object-store/sync/async_open_task.hpp>
 #include <realm/object-store/impl/realm_coordinator.hpp>
-#include <realm/object-store/sync/app.hpp>
-#include <realm/sync/subscriptions.hpp>
 #include <realm/exceptions.hpp>
 #include <realm/util/logger.hpp>
 #include <realm/util/platform_info.hpp>
@@ -42,7 +39,6 @@
 
 using namespace realm;
 using namespace realm::binding;
-using namespace realm::sync;
 using namespace realm::util;
 
 using OpenRealmCallbackT = void(void* task_completion_source, ThreadSafeReference* ref, NativeException::Marshallable ex);
@@ -51,8 +47,6 @@ using ReleaseGCHandleT = void(void* managed_handle);
 using LogMessageT = void(util::Logger::Level level, realm_string_t category_name, realm_string_t message);
 using MigrationCallbackT = void*(realm::SharedRealm* old_realm, realm::SharedRealm* new_realm, Schema* migration_schema, MarshaledVector<SchemaObject>, uint64_t schema_version, void* managed_migration_handle);
 using HandleTaskCompletionCallbackT = void(void* tcs_ptr, bool invoke_async, NativeException::Marshallable ex);
-using SharedSyncSession = std::shared_ptr<SyncSession>;
-using ErrorCallbackT = void(SharedSyncSession* session, realm_sync_error error, void* managed_sync_config);
 using ShouldCompactCallbackT = void*(void* managed_delegate, uint64_t total_size, uint64_t data_size, bool* should_compact);
 using DataInitializationCallbackT = void*(void* managed_delegate, realm::SharedRealm& realm);
 

diff --git a/wrappers/src/shared_realm_cs.hpp b/wrappers/src/shared_realm_cs.hpp
@@ -23,13 +23,8 @@
 #include <realm/object-store/shared_realm.hpp>
 #include <realm/object-store/binding_context.hpp>
 #include <realm/object-store/object_accessor.hpp>
-#include <realm/object-store/sync/sync_manager.hpp>
-#include <realm/object-store/sync/sync_session.hpp>
-#include <realm/sync/config.hpp>
-#include <realm/object-store/sync/app_user.hpp>
 
 namespace realm::binding {
-using SharedSyncUser = std::shared_ptr<app::User>;
 
 struct Configuration
 {