Andrew/upgrade core

.project

@@ -24,4 +24,24 @@
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1684928805201</id>
+			<name>external</name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-catch</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1684928848403</id>
+			<name>src/external</name>
+			<type>14</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

CMakeLists.txt

@@ -297,8 +297,8 @@ endif()
 # Just use -lz and let Xcode figure it out
 # Emscripten does provide Zlib, but it doesn't work with find_package and is handled specially
 if(NOT APPLE AND NOT EMSCRIPTEN AND NOT TARGET ZLIB::ZLIB)
-    if(WIN32)
-        realm_acquire_dependency(zlib ${DEP_WIN32_ZLIB_VERSION} ZLIB_CMAKE_INCLUDE_FILE)
+    if(WIN32 OR (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND REALM_LINUX_TOOLCHAIN))
+        realm_acquire_dependency(zlib ${DEP_ZLIB_VERSION} ZLIB_CMAKE_INCLUDE_FILE)
         include(${ZLIB_CMAKE_INCLUDE_FILE})
     elseif(ANDROID)
         # On Android FindZLIB chooses the static libz over the dynamic one, but this leads to issues

Package.swift

@@ -3,7 +3,7 @@
 import PackageDescription
 import Foundation
 
-let versionStr = "13.11.0"
+let versionStr = "13.17.1"
 let versionPieces = versionStr.split(separator: "-")
 let versionCompontents = versionPieces[0].split(separator: ".")
 let versionExtra = versionPieces.count > 1 ? versionPieces[1] : ""
@@ -348,21 +348,12 @@ let bidExcludes: [String] = [
     "wcstod64.c",
 ]
 
-#if swift(>=5.7)
 let platforms: [SupportedPlatform] = [
     .macOS(.v10_13),
     .iOS(.v11),
     .tvOS(.v11),
     .watchOS(.v4)
 ]
-#else
-let platforms: [SupportedPlatform] = [
-    .macOS(.v10_10),
-    .iOS(.v11),
-    .tvOS(.v9),
-    .watchOS(.v2)
-]
-#endif
 
 let package = Package(
     name: "RealmDatabase",

bindgen/CMakeLists.txt

@@ -34,7 +34,7 @@ set_property(TARGET BindgenSpecJsonSchema PROPERTY NPX "${NPX}")
 
 function(bindgen)
     set(options)
-    set(oneValueArgs TEMPLATE OUTDIR)
+    set(oneValueArgs TEMPLATE OUTDIR OPTIN)
     set(multiValueArgs OUTPUTS SPECS SOURCES)
     cmake_parse_arguments(PARSE_ARGV 0 BINDGEN "${options}" "${oneValueArgs}" "${multiValueArgs}")
 
@@ -64,6 +64,7 @@ function(bindgen)
         WORKING_DIRECTORY ${CMAKE_CURRENT_FUNCTION_LIST_DIR}
         COMMAND ${NPX} tsx -- "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/realm-bindgen.ts"
             --spec "$<JOIN:${CORE_SPEC_FILE};${BINDGEN_SPECS},;--spec;>"
+            "$<$<BOOL:${BINDGEN_OPTIN}>:--opt-in;${BINDGEN_OPTIN}>"
             --template "${BINDGEN_TEMPLATE}"
             --output "${BINDGEN_OUTDIR}"
         COMMAND_EXPAND_LISTS
@@ -78,6 +79,7 @@ function(bindgen)
             # from sdk
             ${BINDGEN_SPECS}
             ${BINDGEN_SOURCES}
+            ${BINDGEN_OPTIN}
     )
 
     foreach(FILE ${BINDGEN_OUTPUTS})

bindgen/spec.yml

@@ -65,6 +65,7 @@ typeAliases:
   AppCredentialsToken: std::string
   Email: std::string
   SchemaVersion: int64_t # is uint64_t in C++ but -1 is used as a sentinel.
+  PortType: int32_t # is uint_fast16_t in C++ but we don't want to add more primitive types and expect SDKs to reject port number > 65535
 
 templates: # value tells you how many arguments it takes ('*' means any number)
   util::Optional: 1
@@ -125,6 +126,7 @@ mixedInfo:
     - LinkList
   extraCtors:
     - Obj
+    - Geospatial
 
 enums:
   SchemaMode:
@@ -209,8 +211,7 @@ enums:
       - CUSTOM
       - USERNAME_PASSWORD
       - FUNCTION
-      - USER_API_KEY
-      - SERVER_API_KEY
+      - API_KEY
   MetadataMode:
     cppName: SyncClientConfig::MetadataMode
     values:
@@ -293,6 +294,11 @@ enums:
       - NEED_DATA
       - HAVE_EVENT
       - HAVE_ERROR
+  ProxyType:
+    cppName: SyncConfig::ProxyConfig::Type
+    values:
+      - HTTP
+      - HTTPS
 
 # These types are handled specially. They must be structs with a single fields named "value".
 keyTypes:
@@ -357,6 +363,28 @@ records:
         type: std::string
         default: ''
 
+  GeoPoint:
+    fields:
+      longitude: double
+      latitude: double
+      altitude: 
+        type: double
+        default: std::numeric_limits<double>::quiet_NaN()
+
+  GeoCircle:
+    fields:
+      radius_radians: double
+      center: GeoPoint
+
+  GeoBox:
+    fields:
+      lo: GeoPoint
+      hi: GeoPoint
+
+  GeoPolygon:
+    fields:
+      points: std::vector<std::vector<GeoPoint>>
+
   RealmConfig:
     fields:
       path: std::string
@@ -414,6 +442,13 @@ records:
       disabled:
         type: bool
 
+  SyncProxyConfig:
+    cppName: SyncConfig::ProxyConfig
+    fields:
+      address: std::string
+      port: PortType
+      type: ProxyType
+
   SyncConfig:
     fields:
       user: SharedSyncUser
@@ -443,6 +478,7 @@ records:
       cancel_waits_on_nonfatal_error:
         type: bool
         default: false
+      proxy_config: util::Optional<SyncProxyConfig>
 
   SyncSubscription:
     cppName: sync::Subscription
@@ -577,15 +613,14 @@ records:
   DeviceInfo:
     cppName: app::App::Config::DeviceInfo
     fields:
-      platform: std::string
       platform_version: std::string
       sdk_version: std::string
       sdk: std::string
-      cpu_arch: std::string
       device_name: std::string
       device_version: std::string
       framework_name: std::string
       framework_version: std::string
+      bundle_id: std::string
 
   AppConfig:
     cppName: app::App::Config
@@ -741,6 +776,12 @@ classes:
       get_seconds: int64_t
       get_nanoseconds: int32_t
 
+  Geospatial:
+    constructors:
+      make_from_circle: '(circle: GeoCircle)'
+      make_from_box: '(box: GeoBox)'
+      make_from_polygon: '(polygon: GeoPolygon)'
+
   ObjLink:
     properties:
       is_null: bool
@@ -1068,8 +1109,7 @@ classes:
         - '(serialized_payload: const EJsonObj&) -> AppCredentials'
         - sig: '(payload: const bson::BsonDocument&) -> AppCredentials'
           suffix: 'bson'
-      user_api_key: '(api_key: std::string) -> AppCredentials'
-      server_api_key: '(api_key: std::string) -> AppCredentials'
+      api_key: '(api_key: std::string) -> AppCredentials'
     properties:
       provider: AuthProvider
       provider_as_string: std::string