Merge pull request #301 from iZettle/fix-build-issue

Fix an issue where importing iZettleSDK from Swift files failed compilation
iZettle · Jul 9, 2020 · 4215521 · 4215521
2 parents 19805c5 + e69a102
commit 4215521
Show file tree

Hide file tree

Showing 16 changed files with 942 additions and 176 deletions.
diff --git a/Example/Sample/iZettleSDKSample.xcodeproj/project.pbxproj b/Example/Sample/iZettleSDKSample.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		9B8B199E24754A0F00C74D78 /* CustomAuthorizationProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B8B199D24754A0F00C74D78 /* CustomAuthorizationProvider.m */; };
 		9BC1DCBB24ACBA58004E74DC /* AccountManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BC1DCBA24ACBA58004E74DC /* AccountManager.m */; };
+		D77864A524B70AE500B6607E /* SDK.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77864A424B70AE500B6607E /* SDK.swift */; };
 		D7C9022524B35DCA0004EDA0 /* iZettlePayments.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D7C9022124B35D6A0004EDA0 /* iZettlePayments.xcframework */; };
 		D7C9022624B35DCA0004EDA0 /* iZettlePayments.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D7C9022124B35D6A0004EDA0 /* iZettlePayments.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		D7C9022724B35DCB0004EDA0 /* iZettleSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D7C9022224B35D6A0004EDA0 /* iZettleSDK.xcframework */; };
@@ -45,6 +46,8 @@
 		9B8B199D24754A0F00C74D78 /* CustomAuthorizationProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomAuthorizationProvider.m; sourceTree = "<group>"; };
 		9BC1DCB924ACBA58004E74DC /* AccountManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AccountManager.h; sourceTree = "<group>"; };
 		9BC1DCBA24ACBA58004E74DC /* AccountManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AccountManager.m; sourceTree = "<group>"; };
+		D77864A324B70AE500B6607E /* iZettle SDK Sample-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "iZettle SDK Sample-Bridging-Header.h"; sourceTree = "<group>"; };
+		D77864A424B70AE500B6607E /* SDK.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDK.swift; sourceTree = "<group>"; };
 		D7C9022124B35D6A0004EDA0 /* iZettlePayments.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = iZettlePayments.xcframework; path = ../../iZettleSDK/iZettlePayments.xcframework; sourceTree = "<group>"; };
 		D7C9022224B35D6A0004EDA0 /* iZettleSDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = iZettleSDK.xcframework; path = ../../iZettleSDK/iZettleSDK.xcframework; sourceTree = "<group>"; };
 		E6F9FED91DDDFFC80051C21D /* AmountWheel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AmountWheel.h; sourceTree = "<group>"; };
@@ -123,6 +126,8 @@
 				9B8B199D24754A0F00C74D78 /* CustomAuthorizationProvider.m */,
 				9BC1DCB924ACBA58004E74DC /* AccountManager.h */,
 				9BC1DCBA24ACBA58004E74DC /* AccountManager.m */,
+				D77864A424B70AE500B6607E /* SDK.swift */,
+				D77864A324B70AE500B6607E /* iZettle SDK Sample-Bridging-Header.h */,
 			);
 			path = iZettleSDKSample;
 			sourceTree = "<group>";
@@ -159,6 +164,7 @@
 				TargetAttributes = {
 					3F0C93971AC30F4600305D8F = {
 						CreatedOnToolsVersion = 6.2;
+						LastSwiftMigration = 1150;
 					};
 				};
 			};
@@ -205,6 +211,7 @@
 				9BC1DCBB24ACBA58004E74DC /* AccountManager.m in Sources */,
 				9B8B199E24754A0F00C74D78 /* CustomAuthorizationProvider.m in Sources */,
 				E6F9FEEF1DDDFFC80051C21D /* ConsoleViewController.m in Sources */,
+				D77864A524B70AE500B6607E /* SDK.swift in Sources */,
 				E6F9FEF31DDDFFC80051C21D /* ViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -348,6 +355,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = G94FN7ACW4;
@@ -364,6 +372,9 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.izettle.iZorn;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "iZettleSDKSample/iZettle SDK Sample-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -372,6 +383,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = G94FN7ACW4;
@@ -388,6 +400,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.izettle.iZorn;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "iZettleSDKSample/iZettle SDK Sample-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/Example/Sample/iZettleSDKSample/SDK.swift b/Example/Sample/iZettleSDKSample/SDK.swift
@@ -0,0 +1,10 @@
+//
+//  SDK.swift
+//  iZettle SDK Sample
+//
+//  Created by Said Sikira on 2020-07-09.
+//  Copyright © 2020 iZettle. All rights reserved.
+//
+
+import Foundation
+import iZettleSDK
diff --git a/Example/Sample/iZettleSDKSample/iZettle SDK Sample-Bridging-Header.h b/Example/Sample/iZettleSDKSample/iZettle SDK Sample-Bridging-Header.h
@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+