Merge branch 'SDK_V3'

CHANGELOG.md

@@ -1,21 +1,16 @@
 
-Changelog for the MapsIndoors iOS SDK. This document structure is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and the project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+## [3.50.0] 2023-04-26
 
-<Tabs>
-<TabItem value="v3" label="iOS SDK V3">
-
-<!---
-## [Unreleased]
-### Fixed
-### Added
-### Fixed
 ### Changed
-### Removed
--->
 
-## iOS Version Support
+- The minimum supported iOS version is now iOS 11.
+- The MapsIndoors XCFramework is now built with Xcode 14.2. This is due to [the Apple announcement](https://developer.apple.com/news/?id=jd9wcyov) that from April 25 all apps submitted to the App Store must be built with Xcode 14.1 or later.
+- MapsIndoors now sports the new MapsPeople logo.
+
+### Fixed
 
-Please note that support for iOS 10 in MapsIndoors SDK v3 will soon end. The minimum supported version will then be iOS 11. The required version of Xcode will remain Xcode 13 a bit longer.
+- 2D Models will now show for POIs as well.
+- Removed potential crash in some circumstances related to offline assets.
 
 ## [3.43.3] 2023-03-08
 
@@ -733,5 +728,3 @@ __*Note: Due to [a bug in CocoaPods](https://github.com/CocoaPods/CocoaPods/issu
 
 - Removed a number of deprecated methods that was introduced in V1
 
-</TabItem>
-</Tabs>

MapsIndoors.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "MapsIndoors"
-  s.version          = "3.43.3"
+  s.version          = "3.50.0"
   s.summary          = "Library making the MapsIndoors experience available to your iOS users."
   s.description      = "The MapsIndoors SDK is the idea of integrating everything at your venue, like people, goods, offices, shops, rooms and buildings with the mapping, positioning and wayfinding technologies provided in the MapsIndoors platform. We make the MapsIndoors platform available to interested businesses and/or partners. So if you think you should be one of them, please call us or send us an email. Meanwhile, you are most welcome to check out the demo project using 'pod try MapsIndoors'."
 

MapsIndoors.xcframework/Info.plist

@@ -6,29 +6,29 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>MapsIndoors.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>x86_64</string>
+				<string>arm64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>MapsIndoors.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPVersionConstants.h

@@ -3,8 +3,8 @@
 
 
 // Auto-generated file - Do not modify
-#define MI_SDK_VERSION        @"3.43.3"
+#define MI_SDK_VERSION        @"3.50.0"
 #define MI_SDK_VERSION_MAJOR  3
-#define MI_SDK_VERSION_MINOR  43
-#define MI_SDK_VERSION_PATCH  3
+#define MI_SDK_VERSION_MINOR  50
+#define MI_SDK_VERSION_PATCH  0
 #define MI_SDK_VERSION_LABEL  @""

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MapsIndoors-Swift.h

@@ -1,4 +1,6 @@
-// Generated by Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)
+#if 0
+#elif defined(__arm64__) && __arm64__
+// Generated by Apple Swift version 5.7.2 (swiftlang-5.7.2.135.5 clang-1400.0.29.51)
 #ifndef MAPSINDOORS_SWIFT_H
 #define MAPSINDOORS_SWIFT_H
 #pragma clang diagnostic push
@@ -21,11 +23,20 @@
 # include <swift/objc-prologue.h>
 #endif
 
+#pragma clang diagnostic ignored "-Wduplicate-method-match"
 #pragma clang diagnostic ignored "-Wauto-import"
+#if defined(__OBJC__)
 #include <Foundation/Foundation.h>
+#endif
+#if defined(__cplusplus)
+#include <cstdint>
+#include <cstddef>
+#include <cstdbool>
+#else
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
+#endif
 
 #if !defined(SWIFT_TYPEDEFS)
 # define SWIFT_TYPEDEFS 1
@@ -181,30 +192,56 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #else
 # define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
 #endif
+#if defined(__OBJC__)
 #if !defined(IBSegueAction)
 # define IBSegueAction
 #endif
+#endif
 #if !defined(SWIFT_EXTERN)
 # if defined(__cplusplus)
 #  define SWIFT_EXTERN extern "C"
 # else
 #  define SWIFT_EXTERN extern
 # endif
 #endif
+#if !defined(SWIFT_CALL)
+# define SWIFT_CALL __attribute__((swiftcall))
+#endif
+#if defined(__cplusplus)
+#if !defined(SWIFT_NOEXCEPT)
+# define SWIFT_NOEXCEPT noexcept
+#endif
+#else
+#if !defined(SWIFT_NOEXCEPT)
+# define SWIFT_NOEXCEPT 
+#endif
+#endif
+#if defined(__cplusplus)
+#if !defined(SWIFT_CXX_INT_DEFINED)
+#define SWIFT_CXX_INT_DEFINED
+namespace swift {
+using Int = ptrdiff_t;
+using UInt = size_t;
+}
+#endif
+#endif
+#if defined(__OBJC__)
 #if __has_feature(modules)
 #if __has_warning("-Watimport-in-framework-header")
 #pragma clang diagnostic ignored "-Watimport-in-framework-header"
 #endif
 @import ObjectiveC;
 #endif
 
+#endif
 #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
 #pragma clang diagnostic ignored "-Wduplicate-method-arg"
 #if __has_warning("-Wpragma-clang-attribute")
 # pragma clang diagnostic ignored "-Wpragma-clang-attribute"
 #endif
 #pragma clang diagnostic ignored "-Wunknown-pragmas"
 #pragma clang diagnostic ignored "-Wnullability"
+#pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"
 
 #if __has_attribute(external_source_symbol)
 # pragma push_macro("any")
@@ -213,15 +250,23 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 # pragma pop_macro("any")
 #endif
 
+#if defined(__OBJC__)
 
 SWIFT_CLASS("_TtC11MapsIndoors20MPDisplayRuleManager")
 @interface MPDisplayRuleManager : NSObject
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 @end
 
 
+#endif
+#if defined(__cplusplus)
+#endif
 #if __has_attribute(external_source_symbol)
 # pragma clang attribute pop
 #endif
 #pragma clang diagnostic pop
 #endif
+
+#else
+#error unsupported Swift architecture
+#endif

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Modules/MapsIndoors.swiftmodule/arm64-apple-ios.abi.json

@@ -0,0 +1,133 @@
+{
+  "ABIRoot": {
+    "kind": "Root",
+    "name": "TopLevel",
+    "printedName": "TopLevel",
+    "children": [
+      {
+        "kind": "Import",
+        "name": "MapsIndoors_Private",
+        "printedName": "MapsIndoors_Private",
+        "declKind": "Import",
+        "moduleName": "MapsIndoors",
+        "declAttributes": [
+          "RawDocComment"
+        ]
+      },
+      {
+        "kind": "Import",
+        "name": "UIKit",
+        "printedName": "UIKit",
+        "declKind": "Import",
+        "moduleName": "MapsIndoors"
+      },
+      {
+        "kind": "TypeDecl",
+        "name": "MPDisplayRuleManager",
+        "printedName": "MPDisplayRuleManager",
+        "children": [
+          {
+            "kind": "Constructor",
+            "name": "init",
+            "printedName": "init()",
+            "children": [
+              {
+                "kind": "TypeNominal",
+                "name": "MPDisplayRuleManager",
+                "printedName": "MapsIndoors.MPDisplayRuleManager",
+                "usr": "c:@M@MapsIndoors@objc(cs)MPDisplayRuleManager"
+              }
+            ],
+            "declKind": "Constructor",
+            "usr": "c:@M@MapsIndoors@objc(cs)MPDisplayRuleManager(im)init",
+            "mangledName": "$s11MapsIndoors20MPDisplayRuleManagerCACycfc",
+            "moduleName": "MapsIndoors",
+            "overriding": true,
+            "implicit": true,
+            "objc_name": "init",
+            "declAttributes": [
+              "Dynamic",
+              "ObjC",
+              "Override"
+            ],
+            "init_kind": "Designated"
+          }
+        ],
+        "declKind": "Class",
+        "usr": "c:@M@MapsIndoors@objc(cs)MPDisplayRuleManager",
+        "mangledName": "$s11MapsIndoors20MPDisplayRuleManagerC",
+        "moduleName": "MapsIndoors",
+        "declAttributes": [
+          "AccessControl",
+          "ObjC"
+        ],
+        "superclassUsr": "c:objc(cs)NSObject",
+        "inheritsConvenienceInitializers": true,
+        "superclassNames": [
+          "ObjectiveC.NSObject"
+        ],
+        "conformances": [
+          {
+            "kind": "Conformance",
+            "name": "Equatable",
+            "printedName": "Equatable",
+            "usr": "s:SQ",
+            "mangledName": "$sSQ"
+          },
+          {
+            "kind": "Conformance",
+            "name": "Hashable",
+            "printedName": "Hashable",
+            "usr": "s:SH",
+            "mangledName": "$sSH"
+          },
+          {
+            "kind": "Conformance",
+            "name": "CVarArg",
+            "printedName": "CVarArg",
+            "usr": "s:s7CVarArgP",
+            "mangledName": "$ss7CVarArgP"
+          },
+          {
+            "kind": "Conformance",
+            "name": "_KeyValueCodingAndObservingPublishing",
+            "printedName": "_KeyValueCodingAndObservingPublishing",
+            "usr": "s:10Foundation37_KeyValueCodingAndObservingPublishingP",
+            "mangledName": "$s10Foundation37_KeyValueCodingAndObservingPublishingP"
+          },
+          {
+            "kind": "Conformance",
+            "name": "_KeyValueCodingAndObserving",
+            "printedName": "_KeyValueCodingAndObserving",
+            "usr": "s:10Foundation27_KeyValueCodingAndObservingP",
+            "mangledName": "$s10Foundation27_KeyValueCodingAndObservingP"
+          },
+          {
+            "kind": "Conformance",
+            "name": "CustomStringConvertible",
+            "printedName": "CustomStringConvertible",
+            "usr": "s:s23CustomStringConvertibleP",
+            "mangledName": "$ss23CustomStringConvertibleP"
+          },
+          {
+            "kind": "Conformance",
+            "name": "CustomDebugStringConvertible",
+            "printedName": "CustomDebugStringConvertible",
+            "usr": "s:s28CustomDebugStringConvertibleP",
+            "mangledName": "$ss28CustomDebugStringConvertibleP"
+          }
+        ]
+      }
+    ],
+    "json_format_version": 8
+  },
+  "ConstValues": [
+    {
+      "filePath": "\/Users\/ciuser\/builds\/hR_k36Qo\/0\/MapsIndoors\/SDK\/MISDKIOS\/Source\/ObjC\/Private\/models\/MPDisplayRuleManager.swift",
+      "kind": "StringLiteral",
+      "offset": 5039,
+      "length": 28,
+      "value": "\"com.mapspeople.mapsindoors\""
+    }
+  ]
+}

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Modules/MapsIndoors.swiftmodule/arm64-apple-ios.private.swiftinterface

@@ -0,0 +1,14 @@
+// swift-interface-format-version: 1.0
+// swift-compiler-version: Apple Swift version 5.7.2 (swiftlang-5.7.2.135.5 clang-1400.0.29.51)
+// swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name MapsIndoors
+// swift-module-flags-ignorable: -enable-bare-slash-regex
+@_exported import MapsIndoors
+import MapsIndoors_Private
+import Swift
+import UIKit
+import _Concurrency
+import _StringProcessing
+@_inheritsConvenienceInitializers @objc public class MPDisplayRuleManager : ObjectiveC.NSObject {
+  @objc override dynamic public init()
+  @objc deinit
+}

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Modules/MapsIndoors.swiftmodule/arm64-apple-ios.swiftinterface

@@ -1,11 +1,13 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)
-// swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name MapsIndoors
+// swift-compiler-version: Apple Swift version 5.7.2 (swiftlang-5.7.2.135.5 clang-1400.0.29.51)
+// swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name MapsIndoors
+// swift-module-flags-ignorable: -enable-bare-slash-regex
 @_exported import MapsIndoors
 import MapsIndoors_Private
 import Swift
 import UIKit
 import _Concurrency
+import _StringProcessing
 @_inheritsConvenienceInitializers @objc public class MPDisplayRuleManager : ObjectiveC.NSObject {
   @objc override dynamic public init()
   @objc deinit

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Modules/module.modulemap

@@ -6,6 +6,6 @@ framework module MapsIndoors {
 }
 
 module MapsIndoors.Swift {
-    header "MapsIndoors-Swift.h"
-    requires objc
+  header "MapsIndoors-Swift.h"
+  requires objc
 }

MapsIndoors.xcframework/ios-x86_64-simulator/MapsIndoors.framework/Headers/MPVersionConstants.h

@@ -3,8 +3,8 @@
 
 
 // Auto-generated file - Do not modify
-#define MI_SDK_VERSION        @"3.43.3"
+#define MI_SDK_VERSION        @"3.50.0"
 #define MI_SDK_VERSION_MAJOR  3
-#define MI_SDK_VERSION_MINOR  43
-#define MI_SDK_VERSION_PATCH  3
+#define MI_SDK_VERSION_MINOR  50
+#define MI_SDK_VERSION_PATCH  0
 #define MI_SDK_VERSION_LABEL  @""