diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index a186f05..d56e261 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/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 = ""; diff --git a/ExampleSwift/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/ExampleSwift/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/ExampleSwift/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ExampleSwift/ExampleSwift.xcodeproj/project.pbxproj b/ExampleSwift/ExampleSwift.xcodeproj/project.pbxproj index 2733691..f6ff400 100644 --- a/ExampleSwift/ExampleSwift.xcodeproj/project.pbxproj +++ b/ExampleSwift/ExampleSwift.xcodeproj/project.pbxproj @@ -7,15 +7,13 @@ objects = { /* Begin PBXBuildFile section */ - 0FCA287A57FA7E931DD97683 /* Pods_ExampleSwift___Pod.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECCE8A4C3DF5E1DC2D9DBC3D /* Pods_ExampleSwift___Pod.framework */; }; 58389AB62987647B00A31A35 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 58389AB52987647B00A31A35 /* Preview Assets.xcassets */; }; + 586439712B7D17680031140F /* ATTNSDKFramework in Frameworks */ = {isa = PBXBuildFile; productRef = 586439702B7D17680031140F /* ATTNSDKFramework */; }; 587DC5BF299550DA0082F8D0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587DC5BE299550DA0082F8D0 /* AppDelegate.swift */; }; 587DC5C4299554B00082F8D0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 587DC5C3299554B00082F8D0 /* Assets.xcassets */; }; 587DC5CB2995551A0082F8D0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 587DC5C82995551A0082F8D0 /* Main.storyboard */; }; 587DC5CD299555D70082F8D0 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587DC5CC299555D70082F8D0 /* ViewController.swift */; }; 587DC5CF2995748B0082F8D0 /* ProductViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587DC5CE2995748B0082F8D0 /* ProductViewController.swift */; }; - 588B597829B94AC200E3BA33 /* attentive_ios_sdk_framework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 588B597729B94AC200E3BA33 /* attentive_ios_sdk_framework.framework */; }; - 588B597929B94AC200E3BA33 /* attentive_ios_sdk_framework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 588B597729B94AC200E3BA33 /* attentive_ios_sdk_framework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 588EB71A2995BBB700C0163A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 588EB7182995BBB700C0163A /* LaunchScreen.storyboard */; }; 588EB71D2995BC3A00C0163A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587DC5BE299550DA0082F8D0 /* AppDelegate.swift */; }; 588EB71E2995BC3A00C0163A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587DC5CC299555D70082F8D0 /* ViewController.swift */; }; @@ -33,7 +31,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 588B597929B94AC200E3BA33 /* attentive_ios_sdk_framework.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -41,7 +38,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0BC1FCC82562655752224489 /* Pods-ExampleSwift - Pod.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleSwift - Pod.debug.xcconfig"; path = "Target Support Files/Pods-ExampleSwift - Pod/Pods-ExampleSwift - Pod.debug.xcconfig"; sourceTree = ""; }; 58389AAA2987647900A31A35 /* ExampleSwift - Local.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ExampleSwift - Local.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 58389AB32987647B00A31A35 /* ExampleSwift.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ExampleSwift.entitlements; sourceTree = ""; }; 58389AB52987647B00A31A35 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; @@ -50,15 +46,8 @@ 587DC5C92995551A0082F8D0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = SOURCE_ROOT; }; 587DC5CC299555D70082F8D0 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 587DC5CE2995748B0082F8D0 /* ProductViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductViewController.swift; sourceTree = ""; }; - 588B597729B94AC200E3BA33 /* attentive_ios_sdk_framework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = attentive_ios_sdk_framework.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 588EB7192995BBB700C0163A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = SOURCE_ROOT; }; - 588EB72C2995BC3A00C0163A /* ExampleSwift - Pod.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ExampleSwift - Pod.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 588EB72D2995BC3A00C0163A /* ExampleSwift - Local copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "ExampleSwift - Local copy-Info.plist"; path = "/Users/wdavis/repos/attentive-ios-sdk/ExampleSwift/ExampleSwift - Local copy-Info.plist"; sourceTree = ""; }; - 588EB72E2995BE2E00C0163A /* attentive-ios-sdk-bridging-header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "attentive-ios-sdk-bridging-header.h"; sourceTree = ""; }; - 58ADF92E2988738D002EA268 /* attentive_ios_sdk.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = attentive_ios_sdk.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 58ADF9322988746D002EA268 /* attentive-ios-sdk-local-bridging-header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "attentive-ios-sdk-local-bridging-header.h"; sourceTree = ""; }; - 859F6AE5F75849A800B53A78 /* Pods-ExampleSwift - Pod.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleSwift - Pod.release.xcconfig"; path = "Target Support Files/Pods-ExampleSwift - Pod/Pods-ExampleSwift - Pod.release.xcconfig"; sourceTree = ""; }; - ECCE8A4C3DF5E1DC2D9DBC3D /* Pods_ExampleSwift___Pod.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ExampleSwift___Pod.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 588EB72C2995BC3A00C0163A /* ExampleSwift - SPM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ExampleSwift - SPM.app"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -66,7 +55,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 588B597829B94AC200E3BA33 /* attentive_ios_sdk_framework.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -74,7 +62,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0FCA287A57FA7E931DD97683 /* Pods_ExampleSwift___Pod.framework in Frameworks */, + 586439712B7D17680031140F /* ATTNSDKFramework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -87,9 +75,6 @@ 58389AAC2987647900A31A35 /* ExampleSwift */, 587DC5C5299554DF0082F8D0 /* Supporting Files */, 58389AAB2987647900A31A35 /* Products */, - 58ADF92D2988738D002EA268 /* Frameworks */, - 588EB72D2995BC3A00C0163A /* ExampleSwift - Local copy-Info.plist */, - 8DDF698A66FE410250C43DCE /* Pods */, ); sourceTree = ""; }; @@ -97,7 +82,7 @@ isa = PBXGroup; children = ( 58389AAA2987647900A31A35 /* ExampleSwift - Local.app */, - 588EB72C2995BC3A00C0163A /* ExampleSwift - Pod.app */, + 588EB72C2995BC3A00C0163A /* ExampleSwift - SPM.app */, ); name = Products; sourceTree = ""; @@ -110,8 +95,6 @@ 587DC5CE2995748B0082F8D0 /* ProductViewController.swift */, 58389AB32987647B00A31A35 /* ExampleSwift.entitlements */, 58389AB42987647B00A31A35 /* Preview Content */, - 588EB72E2995BE2E00C0163A /* attentive-ios-sdk-bridging-header.h */, - 58ADF9322988746D002EA268 /* attentive-ios-sdk-local-bridging-header.h */, ); path = ExampleSwift; sourceTree = ""; @@ -135,25 +118,6 @@ path = "ExampleSwift/Supporting Files"; sourceTree = ""; }; - 58ADF92D2988738D002EA268 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 588B597729B94AC200E3BA33 /* attentive_ios_sdk_framework.framework */, - 58ADF92E2988738D002EA268 /* attentive_ios_sdk.framework */, - ECCE8A4C3DF5E1DC2D9DBC3D /* Pods_ExampleSwift___Pod.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 8DDF698A66FE410250C43DCE /* Pods */ = { - isa = PBXGroup; - children = ( - 0BC1FCC82562655752224489 /* Pods-ExampleSwift - Pod.debug.xcconfig */, - 859F6AE5F75849A800B53A78 /* Pods-ExampleSwift - Pod.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -175,23 +139,24 @@ productReference = 58389AAA2987647900A31A35 /* ExampleSwift - Local.app */; productType = "com.apple.product-type.application"; }; - 588EB71B2995BC3A00C0163A /* ExampleSwift - Pod */ = { + 588EB71B2995BC3A00C0163A /* ExampleSwift - SPM */ = { isa = PBXNativeTarget; - buildConfigurationList = 588EB7292995BC3A00C0163A /* Build configuration list for PBXNativeTarget "ExampleSwift - Pod" */; + buildConfigurationList = 588EB7292995BC3A00C0163A /* Build configuration list for PBXNativeTarget "ExampleSwift - SPM" */; buildPhases = ( - 91D7BFB881B221C30507B74F /* [CP] Check Pods Manifest.lock */, 588EB71C2995BC3A00C0163A /* Sources */, 588EB7202995BC3A00C0163A /* Frameworks */, 588EB7222995BC3A00C0163A /* Resources */, - 2DDBEEF11B26F3D0A486B571 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( ); - name = "ExampleSwift - Pod"; + name = "ExampleSwift - SPM"; + packageProductDependencies = ( + 586439702B7D17680031140F /* ATTNSDKFramework */, + ); productName = ExampleSwift; - productReference = 588EB72C2995BC3A00C0163A /* ExampleSwift - Pod.app */; + productReference = 588EB72C2995BC3A00C0163A /* ExampleSwift - SPM.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -218,12 +183,15 @@ Base, ); mainGroup = 58389AA12987647900A31A35; + packageReferences = ( + 5864396F2B7D17680031140F /* XCRemoteSwiftPackageReference "attentive-ios-sdk" */, + ); productRefGroup = 58389AAB2987647900A31A35 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( 58389AA92987647900A31A35 /* ExampleSwift - Local */, - 588EB71B2995BC3A00C0163A /* ExampleSwift - Pod */, + 588EB71B2995BC3A00C0163A /* ExampleSwift - SPM */, ); }; /* End PBXProject section */ @@ -253,48 +221,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 2DDBEEF11B26F3D0A486B571 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ExampleSwift - Pod/Pods-ExampleSwift - Pod-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ExampleSwift - Pod/Pods-ExampleSwift - Pod-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ExampleSwift - Pod/Pods-ExampleSwift - Pod-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 91D7BFB881B221C30507B74F /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-ExampleSwift - Pod-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 58389AA62987647900A31A35 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -458,6 +384,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"ExampleSwift/Preview Content\""; + DEVELOPMENT_TEAM = SP5WN9647Z; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ""; @@ -481,8 +408,9 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.attentive.ExampleSwift; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "ExampleSwift/attentive-ios-sdk-local-bridging-header.h"; SWIFT_VERSION = 5.0; @@ -499,6 +427,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"ExampleSwift/Preview Content\""; + DEVELOPMENT_TEAM = SP5WN9647Z; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ""; @@ -522,8 +451,9 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.attentive.ExampleSwift; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "ExampleSwift/attentive-ios-sdk-local-bridging-header.h"; SWIFT_VERSION = 5.0; @@ -533,7 +463,6 @@ }; 588EB72A2995BC3A00C0163A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0BC1FCC82562655752224489 /* Pods-ExampleSwift - Pod.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -541,6 +470,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"ExampleSwift/Preview Content\""; + DEVELOPMENT_TEAM = SP5WN9647Z; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ""; @@ -564,18 +494,20 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.attentive.ExampleSwift; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_OBJC_BRIDGING_HEADER = "ExampleSwift/attentive-ios-sdk-bridging-header.h"; + SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; 588EB72B2995BC3A00C0163A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 859F6AE5F75849A800B53A78 /* Pods-ExampleSwift - Pod.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -583,6 +515,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"ExampleSwift/Preview Content\""; + DEVELOPMENT_TEAM = SP5WN9647Z; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ""; @@ -606,12 +539,15 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.attentive.ExampleSwift; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_OBJC_BRIDGING_HEADER = "ExampleSwift/attentive-ios-sdk-bridging-header.h"; + SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; @@ -636,7 +572,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 588EB7292995BC3A00C0163A /* Build configuration list for PBXNativeTarget "ExampleSwift - Pod" */ = { + 588EB7292995BC3A00C0163A /* Build configuration list for PBXNativeTarget "ExampleSwift - SPM" */ = { isa = XCConfigurationList; buildConfigurations = ( 588EB72A2995BC3A00C0163A /* Debug */, @@ -646,6 +582,25 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 5864396F2B7D17680031140F /* XCRemoteSwiftPackageReference "attentive-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/attentive-mobile/attentive-ios-sdk"; + requirement = { + branch = "rsmith/support-swift"; + kind = branch; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 586439702B7D17680031140F /* ATTNSDKFramework */ = { + isa = XCSwiftPackageProductDependency; + package = 5864396F2B7D17680031140F /* XCRemoteSwiftPackageReference "attentive-ios-sdk" */; + productName = ATTNSDKFramework; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 58389AA22987647900A31A35 /* Project object */; } diff --git a/ExampleSwift/ExampleSwift.xcodeproj/xcshareddata/xcschemes/ExampleSwift - SPM.xcscheme b/ExampleSwift/ExampleSwift.xcodeproj/xcshareddata/xcschemes/ExampleSwift - SPM.xcscheme new file mode 100644 index 0000000..ff3575e --- /dev/null +++ b/ExampleSwift/ExampleSwift.xcodeproj/xcshareddata/xcschemes/ExampleSwift - SPM.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ExampleSwift/ExampleSwift/AppDelegate.swift b/ExampleSwift/ExampleSwift/AppDelegate.swift index 50b137c..659aba3 100644 --- a/ExampleSwift/ExampleSwift/AppDelegate.swift +++ b/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 { diff --git a/ExampleSwift/ExampleSwift/ProductViewController.swift b/ExampleSwift/ExampleSwift/ProductViewController.swift index ab7ed2c..014d943 100644 --- a/ExampleSwift/ExampleSwift/ProductViewController.swift +++ b/ExampleSwift/ExampleSwift/ProductViewController.swift @@ -7,6 +7,8 @@ import Foundation import os +import UIKit +import ATTNSDKFramework class ProductViewController : UIViewController { @IBOutlet var addToCartBtn : UIButton? diff --git a/ExampleSwift/ExampleSwift/ViewController.swift b/ExampleSwift/ExampleSwift/ViewController.swift index ac35871..5165db7 100644 --- a/ExampleSwift/ExampleSwift/ViewController.swift +++ b/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) { diff --git a/ExampleSwift/ExampleSwift/attentive-ios-sdk-bridging-header.h b/ExampleSwift/ExampleSwift/attentive-ios-sdk-bridging-header.h deleted file mode 100644 index 7cc6023..0000000 --- a/ExampleSwift/ExampleSwift/attentive-ios-sdk-bridging-header.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// attentive-ios-sdk-bridging-header-pod.h -// ExampleSwift - Pod -// -// Created by Wyatt Davis on 2/9/23. -// - -#ifndef attentive_ios_sdk_bridging_header_h -#define attentive_ios_sdk_bridging_header_h - -#import "ATTNSDK.h" -#import "ATTNUserIdentity.h" -#import "ATTNEventTracker.h" -#import "ATTNPurchaseEvent.h" -#import "ATTNAddToCartEvent.h" -#import "ATTNProductViewEvent.h" -#import "ATTNItem.h" -#import "ATTNPrice.h" -#import "ATTNOrder.h" -#import "ATTNCart.h" -#import "ATTNCustomEvent.h" - -#endif /* attentive_ios_sdk_bridging_header_h */ diff --git a/ExampleSwift/ExampleSwift/attentive-ios-sdk-local-bridging-header.h b/ExampleSwift/ExampleSwift/attentive-ios-sdk-local-bridging-header.h deleted file mode 100644 index c778bf4..0000000 --- a/ExampleSwift/ExampleSwift/attentive-ios-sdk-local-bridging-header.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// attentive-ios-sdk-bridging-header.h -// ExampleSwift - Local -// -// Created by Wyatt Davis on 1/30/23. -// - -// This bridging file should not be used by any customers. Customers should use 'attentive-ios-sdk-bridging-header-pod.h' instead. - -#ifndef attentive_ios_sdk_local_bridging_header_h -#define attentive_ios_sdk_local_bridging_header_h - -#import - -#endif /* attentive_ios_sdk_local_bridging_header_h */ diff --git a/ExampleSwift/Package.resolved b/ExampleSwift/Package.resolved new file mode 100644 index 0000000..e8af413 --- /dev/null +++ b/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 +} diff --git a/ExampleSwift/Package.swift b/ExampleSwift/Package.swift new file mode 100644 index 0000000..1eb0ab2 --- /dev/null +++ b/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 + ), + ] +) diff --git a/ExampleSwift/Podfile b/ExampleSwift/Podfile deleted file mode 100644 index 0f4c63b..0000000 --- a/ExampleSwift/Podfile +++ /dev/null @@ -1,10 +0,0 @@ -platform :ios, '10.0' - -target 'ExampleSwift - Pod' do - # The 'use_frameworks!' option builds the pods as dynamic frameworks instead of static libs. - use_frameworks! - - # Pods for Example - pod 'attentive-ios-sdk' - -end diff --git a/ExampleSwift/Podfile.lock b/ExampleSwift/Podfile.lock deleted file mode 100644 index 08dea6f..0000000 --- a/ExampleSwift/Podfile.lock +++ /dev/null @@ -1,16 +0,0 @@ -PODS: - - attentive-ios-sdk (0.3.2) - -DEPENDENCIES: - - attentive-ios-sdk - -SPEC REPOS: - trunk: - - attentive-ios-sdk - -SPEC CHECKSUMS: - attentive-ios-sdk: a57deefc671e36886ce90da369db9ce8505bf0a1 - -PODFILE CHECKSUM: f10aeee61e5d03d783da7f32dae98581d4e7f101 - -COCOAPODS: 1.11.3 diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..d583008 --- /dev/null +++ b/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/" + ) + ] +) diff --git a/Sources/ATTNSDK.m b/Sources/ATTNSDK.m index 8e34c56..d37b0cc 100644 --- a/Sources/ATTNSDK.m +++ b/Sources/ATTNSDK.m @@ -6,6 +6,7 @@ // #import +#import #import "ATTNAPI.h" #import "ATTNSDK.h" #import "ATTNUserIdentity.h" diff --git a/Sources/Internal/ATTNInfoEvent.h b/Sources/Internal/ATTNInfoEvent.h index 02cd5d3..5d14514 100644 --- a/Sources/Internal/ATTNInfoEvent.h +++ b/Sources/Internal/ATTNInfoEvent.h @@ -8,7 +8,7 @@ #ifndef ATTNInfoEvent_h #define ATTNInfoEvent_h -#import "ATTNEvent.h" +#import "../ATTNEvent.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Sources/include/ATTNSDKFramework.h b/Sources/include/ATTNSDKFramework.h new file mode 100644 index 0000000..6ce9113 --- /dev/null +++ b/Sources/include/ATTNSDKFramework.h @@ -0,0 +1,18 @@ +#import + +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> diff --git a/attentive-ios-sdk.xcodeproj/project.pbxproj b/attentive-ios-sdk.xcodeproj/project.pbxproj index f19e39d..1a2fb46 100644 --- a/attentive-ios-sdk.xcodeproj/project.pbxproj +++ b/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; diff --git a/attentive-ios-sdk.xcworkspace/contents.xcworkspacedata b/attentive-ios-sdk.xcworkspace/contents.xcworkspacedata index 6af5063..d6d73f1 100644 --- a/attentive-ios-sdk.xcworkspace/contents.xcworkspacedata +++ b/attentive-ios-sdk.xcworkspace/contents.xcworkspacedata @@ -13,7 +13,4 @@ - - diff --git a/attentive-ios-sdk.xcworkspace/xcshareddata/swiftpm/Package.resolved b/attentive-ios-sdk.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..9d3aab5 --- /dev/null +++ b/attentive-ios-sdk.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,14 @@ +{ + "pins" : [ + { + "identity" : "attentive-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/attentive-mobile/attentive-ios-sdk", + "state" : { + "branch" : "rsmith/support-swift", + "revision" : "0bf29e1001e180c0b84fe8e2bd350de7232a8346" + } + } + ], + "version" : 2 +}