Merge pull request #74 from attentive-mobile/rsmith/support-swift

Rsmith/support swift

Example/Example.xcodeproj/project.pbxproj

@@ -432,7 +432,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = SP5WN9647Z;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -606,7 +606,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = SP5WN9647Z;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -667,7 +667,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = SP5WN9647Z;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = "";

ExampleSwift/ExampleSwift.xcodeproj/xcshareddata/xcschemes/ExampleSwift - SPM.xcscheme

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "NO">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "588EB71B2995BC3A00C0163A"
+               BuildableName = "ExampleSwift - SPM.app"
+               BlueprintName = "ExampleSwift - SPM"
+               ReferencedContainer = "container:ExampleSwift.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "588EB71B2995BC3A00C0163A"
+            BuildableName = "ExampleSwift - SPM.app"
+            BlueprintName = "ExampleSwift - SPM"
+            ReferencedContainer = "container:ExampleSwift.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "588EB71B2995BC3A00C0163A"
+            BuildableName = "ExampleSwift - SPM.app"
+            BlueprintName = "ExampleSwift - SPM"
+            ReferencedContainer = "container:ExampleSwift.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

ExampleSwift/ExampleSwift/AppDelegate.swift

@@ -6,12 +6,14 @@
 //
 
 import Foundation
+import UIKit
+import ATTNSDKFramework
 
 @main
 class AppDelegate : UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
-    public var attentiveSdk : ATTNSDK?
+    public var attentiveSdk : ATTNSDK?;
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
 

ExampleSwift/ExampleSwift/ProductViewController.swift

@@ -7,6 +7,8 @@
 
 import Foundation
 import os
+import UIKit
+import ATTNSDKFramework
 
 class ProductViewController : UIViewController {
     @IBOutlet var addToCartBtn : UIButton?

ExampleSwift/ExampleSwift/ViewController.swift

@@ -7,6 +7,8 @@
 
 import Foundation
 import os
+import UIKit
+import ATTNSDKFramework
 
 class ViewController : UIViewController {
     @IBOutlet var creativeBtn : UIButton?
@@ -15,7 +17,7 @@ class ViewController : UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.view.backgroundColor = .systemGray3
+        self.view.backgroundColor = .white
     }
 
     @IBAction func creativeBtnPressed(sender: Any) {

ExampleSwift/Package.resolved

@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "ATTNSDKFramework",
+        "repositoryURL": "https://github.com/attentive-mobile/attentive-ios-sdk",
+        "state": {
+          "branch": "rsmith/support-swift",
+          "revision": "0bf29e1001e180c0b84fe8e2bd350de7232a8346",
+          "version": null
+        }
+      }
+    ]
+  },
+  "version": 1
+}

ExampleSwift/Package.swift

@@ -0,0 +1,25 @@
+// swift-tools-version:5.3
+import PackageDescription
+
+let package = Package(
+    name: "ExampleSwift",
+    platforms: [
+       .iOS(.v12)
+    ],
+    products: [
+        .library(
+            name: "ExampleSwift",
+            targets: ["ExampleSwift"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/attentive-mobile/attentive-ios-sdk", .branch("rsmith/support-swift"))
+    ],
+    targets: [
+        .target(
+            name: "ExampleSwift",
+            dependencies: [
+                .product(name: "ATTNSDKFramework", package: "attentive-ios-sdk")],
+            path: "ExampleSwift" // Ensure this path exists and is correct
+        ),
+    ]
+)

Package.swift

@@ -0,0 +1,19 @@
+// swift-tools-version:5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+	name: "ATTNSDKFramework",
+	platforms: [.iOS(.v12)],
+	products: [
+		.library(name: "ATTNSDKFramework", targets: ["ATTNSDKFramework"])
+
+	],
+	targets: [
+		.target(
+			name: "ATTNSDKFramework",
+			path: "Sources/"
+		)
+	]
+)

Sources/ATTNSDK.m

@@ -6,6 +6,7 @@
 //
 
 #import <WebKit/WebKit.h>
+#import <UIKit/UIKit.h>
 #import "ATTNAPI.h"
 #import "ATTNSDK.h"
 #import "ATTNUserIdentity.h"

Sources/Internal/ATTNInfoEvent.h

@@ -8,7 +8,7 @@
 #ifndef ATTNInfoEvent_h
 #define ATTNInfoEvent_h
 
-#import "ATTNEvent.h"
+#import "../ATTNEvent.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Sources/include/ATTNSDKFramework.h

@@ -0,0 +1,18 @@
+#import <Foundation/Foundation.h>
+
+FOUNDATION_EXPORT double ATTNSDKFrameworkVersionNumber;
+
+FOUNDATION_EXPORT const unsigned char ATTNSDKFrameworkVersionString[];
+
+#import <../ATTNSDK.h>
+#import <../ATTNUserIdentity.h>
+#import <../ATTNEventTracker.h>
+#import <../ATTNItem.h>
+#import <../ATTNPrice.h>
+#import <../ATTNEvent.h>
+#import <../ATTNPurchaseEvent.h>
+#import <../ATTNProductViewEvent.h>
+#import <../ATTNAddToCartEvent.h>
+#import <../ATTNOrder.h>
+#import <../ATTNCart.h>
+#import <../ATTNCustomEvent.h>

attentive-ios-sdk.xcodeproj/project.pbxproj

@@ -569,7 +569,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
+				ENABLE_TESTABILITY = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -587,6 +587,7 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -631,6 +632,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -641,6 +643,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -675,7 +678,7 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.attentive.attentive-ios-sdk-local";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
-				SDKROOT = auto;
+				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = YES;
@@ -713,7 +716,7 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.attentive.attentive-ios-sdk-local";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
-				SDKROOT = auto;
+				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = YES;