From d637dfa66f5552b454f7a3cf25c3648f097f46ba Mon Sep 17 00:00:00 2001 From: Marc Sciglimpaglia Date: Tue, 14 Sep 2021 15:13:17 -0700 Subject: [PATCH] fix value transformers, new auth type reporting, embed basement in samples (#2346) * fix value transformers, new auth type reporting, embed basement in samples * unembed tvOS basement * more basement fixes --- Airship/AirshipCore/Source/EventUtils.swift | 9 ++++ .../Source/NSArrayValueTransformer.swift | 2 +- .../Source/NSDictionaryValueTransformer.swift | 2 +- Sample/Sample.xcodeproj/project.pbxproj | 40 ++++++++++++++++-- .../SwiftSample.xcodeproj/project.pbxproj | 42 +++++++++++++++++-- .../tvOSSample.xcodeproj/project.pbxproj | 32 +++++++------- 6 files changed, 105 insertions(+), 22 deletions(-) diff --git a/Airship/AirshipCore/Source/EventUtils.swift b/Airship/AirshipCore/Source/EventUtils.swift index a61695fb3..80a1f990e 100644 --- a/Airship/AirshipCore/Source/EventUtils.swift +++ b/Airship/AirshipCore/Source/EventUtils.swift @@ -55,6 +55,15 @@ class EventUtils { if (UAAuthorizedNotificationSettings.criticalAlert.rawValue & authorizedSettings.rawValue) > 0 { notificationTypes.append("critical_alert") } + + if (UAAuthorizedNotificationSettings.scheduledDelivery.rawValue & authorizedSettings.rawValue) > 0 { + notificationTypes.append("scheduled_delivery") + } + + if (UAAuthorizedNotificationSettings.timeSensitive.rawValue & authorizedSettings.rawValue) > 0 { + notificationTypes.append("time_sensitive") + } + #endif return notificationTypes diff --git a/Airship/AirshipCore/Source/NSArrayValueTransformer.swift b/Airship/AirshipCore/Source/NSArrayValueTransformer.swift index ef0d89434..7abfcc686 100644 --- a/Airship/AirshipCore/Source/NSArrayValueTransformer.swift +++ b/Airship/AirshipCore/Source/NSArrayValueTransformer.swift @@ -31,7 +31,7 @@ public class NSArrayValueTransformer: ValueTransformer { } do { - let classes = [NSDictionary.self, NSArray.self, NSSet.self, NSData.self, + let classes = [NSString.self, NSDictionary.self, NSArray.self, NSSet.self, NSData.self, NSNumber.self, NSDate.self, NSURL.self, NSUUID.self, NSNull.self] return try NSKeyedUnarchiver.unarchivedObject(ofClasses: classes, from: value) } catch { diff --git a/Airship/AirshipCore/Source/NSDictionaryValueTransformer.swift b/Airship/AirshipCore/Source/NSDictionaryValueTransformer.swift index 2c6c57ddb..e3d43eda8 100644 --- a/Airship/AirshipCore/Source/NSDictionaryValueTransformer.swift +++ b/Airship/AirshipCore/Source/NSDictionaryValueTransformer.swift @@ -31,7 +31,7 @@ public class NSDictionaryValueTransformer: ValueTransformer { } do { - let classes = [NSDictionary.self, NSArray.self, NSSet.self, NSData.self, + let classes = [NSString.self, NSDictionary.self, NSArray.self, NSSet.self, NSData.self, NSNumber.self, NSDate.self, NSURL.self, NSUUID.self, NSNull.self] return try NSKeyedUnarchiver.unarchivedObject(ofClasses: classes, from: value) } catch { diff --git a/Sample/Sample.xcodeproj/project.pbxproj b/Sample/Sample.xcodeproj/project.pbxproj index 462c46c22..038e5540f 100644 --- a/Sample/Sample.xcodeproj/project.pbxproj +++ b/Sample/Sample.xcodeproj/project.pbxproj @@ -30,6 +30,10 @@ 3CCB661124E7491C0039CA3B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 764693B61C237B630090FE40 /* LaunchScreen.storyboard */; }; 3CCB661224E7491C0039CA3B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 764693FC1C238E7C0090FE40 /* Images.xcassets */; }; 3CCB661324E7491C0039CA3B /* MessageCenterStyle.plist in Resources */ = {isa = PBXBuildFile; fileRef = 61E392301CC81EA800D994E3 /* MessageCenterStyle.plist */; }; + 3CE5592C26F11EDD00FBCBA5 /* AirshipBasement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB1B42026EAA539000421B9 /* AirshipBasement.framework */; }; + 3CE5592D26F11EDD00FBCBA5 /* AirshipBasement.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB1B42026EAA539000421B9 /* AirshipBasement.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 3CE5593126F11EEC00FBCBA5 /* AirshipBasement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB1B42026EAA539000421B9 /* AirshipBasement.framework */; }; + 3CE5593226F11EEC00FBCBA5 /* AirshipBasement.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6EB1B42026EAA539000421B9 /* AirshipBasement.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3CF3DDF124E75CF7000CF516 /* AirshipAccengage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E6CC33B239A2F93003D583C /* AirshipAccengage.framework */; }; 3CF3DDF224E75CF7000CF516 /* AirshipAccengage.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6E6CC33B239A2F93003D583C /* AirshipAccengage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3CF3DDF324E75CF8000CF516 /* AirshipAutomation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E75B25D2395D1B100425530 /* AirshipAutomation.framework */; }; @@ -120,6 +124,20 @@ remoteGlobalIDString = 1BFB703D23882E4900BF7F07; remoteInfo = SampleContentExtension; }; + 3CE5598326F14B5B00FBCBA5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E75B2412395D1B100425530 /* Airship.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 6E431F6B26EA814F009228AB; + remoteInfo = AirshipBasement; + }; + 3CE5598F26F14B6400FBCBA5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E75B2412395D1B100425530 /* Airship.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 6E431F6B26EA814F009228AB; + remoteInfo = AirshipBasement; + }; 3CF3DE9124EB0768000CF516 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 6E75B2412395D1B100425530 /* Airship.xcodeproj */; @@ -381,6 +399,7 @@ 3CF3DE8E24E76F44000CF516 /* AirshipLocation.framework in Embed Frameworks */, 3CF3DE8624E76F44000CF516 /* AirshipAutomation.framework in Embed Frameworks */, 3CF3DE8824E76F44000CF516 /* AirshipCore.framework in Embed Frameworks */, + 3CE5592D26F11EDD00FBCBA5 /* AirshipBasement.framework in Embed Frameworks */, 3CF3DE8C24E76F44000CF516 /* AirshipExtendedActions.framework in Embed Frameworks */, 3CF3DE9024E76F44000CF516 /* AirshipMessageCenter.framework in Embed Frameworks */, 3CF3DE8424E76F44000CF516 /* AirshipAccengage.framework in Embed Frameworks */, @@ -430,6 +449,7 @@ E9F15EE726EA534F007E07E9 /* AirshipPreferenceCenter.framework in CopyFiles */, 3CF3DDF824E75CFB000CF516 /* AirshipExtendedActions.framework in CopyFiles */, 3CF3DDF424E75CF8000CF516 /* AirshipAutomation.framework in CopyFiles */, + 3CE5593226F11EEC00FBCBA5 /* AirshipBasement.framework in CopyFiles */, 6E7C072F261285AA006D0E84 /* AirshipChat.framework in CopyFiles */, 3CF3DDFC24E75CFE000CF516 /* AirshipMessageCenter.framework in CopyFiles */, 3CF3DDFA24E75CFC000CF516 /* AirshipLocation.framework in CopyFiles */, @@ -499,6 +519,7 @@ 3CF3DE8524E76F44000CF516 /* AirshipAutomation.framework in Frameworks */, 3CF3DE8724E76F44000CF516 /* AirshipCore.framework in Frameworks */, 3CF3DE8B24E76F44000CF516 /* AirshipExtendedActions.framework in Frameworks */, + 3CE5592C26F11EDD00FBCBA5 /* AirshipBasement.framework in Frameworks */, 3CF3DE8F24E76F44000CF516 /* AirshipMessageCenter.framework in Frameworks */, 3CF62FF42588495E0007502B /* AirshipDebug.framework in Frameworks */, 3CF3DE8324E76F44000CF516 /* AirshipAccengage.framework in Frameworks */, @@ -530,6 +551,7 @@ 6E1892C4268CFCA400417887 /* AirshipPreferenceCenter.framework in Frameworks */, 3CF3DDF924E75CFC000CF516 /* AirshipLocation.framework in Frameworks */, 3CF3DDF324E75CF8000CF516 /* AirshipAutomation.framework in Frameworks */, + 3CE5593126F11EEC00FBCBA5 /* AirshipBasement.framework in Frameworks */, 6E7C072E261285AA006D0E84 /* AirshipChat.framework in Frameworks */, 3CF3DDFB24E75CFE000CF516 /* AirshipMessageCenter.framework in Frameworks */, 3CF3DDF724E75CFB000CF516 /* AirshipExtendedActions.framework in Frameworks */, @@ -591,7 +613,7 @@ isa = PBXGroup; children = ( 6EB1B42026EAA539000421B9 /* AirshipBasement.framework */, - 6EB1B42226EAA539000421B9 /* AirshipBasement tvOS.framework */, + 6EB1B42226EAA539000421B9 /* AirshipBasement.framework */, 6E75B2532395D1B100425530 /* AirshipCore.framework */, 6E75B2552395D1B100425530 /* AirshipCore.framework */, 6E75B2572395D1B100425530 /* AirshipTests.xctest */, @@ -732,6 +754,7 @@ buildRules = ( ); dependencies = ( + 3CE5599026F14B6400FBCBA5 /* PBXTargetDependency */, 3CF3DE9224EB0768000CF516 /* PBXTargetDependency */, 3CF3DE9424EB0768000CF516 /* PBXTargetDependency */, 3CF3DE9624EB0768000CF516 /* PBXTargetDependency */, @@ -796,6 +819,7 @@ buildRules = ( ); dependencies = ( + 3CE5598426F14B5B00FBCBA5 /* PBXTargetDependency */, 6E1892B4268CEC9600417887 /* PBXTargetDependency */, 6E7C07152612821C006D0E84 /* PBXTargetDependency */, 6E6CC334239A2F93003D583C /* PBXTargetDependency */, @@ -1019,10 +1043,10 @@ remoteRef = 6EB1B41F26EAA539000421B9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 6EB1B42226EAA539000421B9 /* AirshipBasement tvOS.framework */ = { + 6EB1B42226EAA539000421B9 /* AirshipBasement.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = "AirshipBasement tvOS.framework"; + path = AirshipBasement.framework; remoteRef = 6EB1B42126EAA539000421B9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1183,6 +1207,16 @@ target = 1BFB703D23882E4900BF7F07 /* SampleContentExtension */; targetProxy = 1BFB704B23882E4A00BF7F07 /* PBXContainerItemProxy */; }; + 3CE5598426F14B5B00FBCBA5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = AirshipBasement; + targetProxy = 3CE5598326F14B5B00FBCBA5 /* PBXContainerItemProxy */; + }; + 3CE5599026F14B6400FBCBA5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = AirshipBasement; + targetProxy = 3CE5598F26F14B6400FBCBA5 /* PBXContainerItemProxy */; + }; 3CF3DE9224EB0768000CF516 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = AirshipAccengage; diff --git a/SwiftSample/SwiftSample.xcodeproj/project.pbxproj b/SwiftSample/SwiftSample.xcodeproj/project.pbxproj index e8cfa6245..48018b94a 100644 --- a/SwiftSample/SwiftSample.xcodeproj/project.pbxproj +++ b/SwiftSample/SwiftSample.xcodeproj/project.pbxproj @@ -29,6 +29,11 @@ 1BF9B0E523A24E5D00E68DBE /* AirshipAccengage.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6E6CC347239A2FB9003D583C /* AirshipAccengage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3C0D070B26250093002337B0 /* AirshipChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C0D06B72624F232002337B0 /* AirshipChat.framework */; }; 3C0D070C26250093002337B0 /* AirshipChat.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3C0D06B72624F232002337B0 /* AirshipChat.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 3CE5591F26F11EBF00FBCBA5 /* AirshipBasement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB1B41326EAA531000421B9 /* AirshipBasement.framework */; }; + 3CE5592026F11EBF00FBCBA5 /* AirshipBasement.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6EB1B41326EAA531000421B9 /* AirshipBasement.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 3CE5592326F11ECD00FBCBA5 /* AirshipBasement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB1B41326EAA531000421B9 /* AirshipBasement.framework */; }; + 3CE5592426F11ECD00FBCBA5 /* AirshipBasement.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB1B41326EAA531000421B9 /* AirshipBasement.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 3CE5597C26F14B2D00FBCBA5 /* AirshipBasement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB1B41326EAA531000421B9 /* AirshipBasement.framework */; }; 3CF3DDC924E74F9B000CF516 /* MessageCenterStyle.plist in Resources */ = {isa = PBXBuildFile; fileRef = 45BE0C9222834F6B008302F1 /* MessageCenterStyle.plist */; }; 3CF3DDCA24E74F9B000CF516 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 619A0D401BE81D7B00D9E863 /* Images.xcassets */; }; 3CF3DDCB24E74F9B000CF516 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CCDA35B11B8D233A00950AD5 /* LaunchScreen.storyboard */; }; @@ -142,6 +147,20 @@ remoteGlobalIDString = 6E7C067A26127557006D0E84; remoteInfo = AirshipChat; }; + 3CE5597F26F14B4300FBCBA5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E65D56A2396E99D00AF2D1A /* Airship.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 6E431F6B26EA814F009228AB; + remoteInfo = AirshipBasement; + }; + 3CE5598126F14B4A00FBCBA5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E65D56A2396E99D00AF2D1A /* Airship.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 6E431F6B26EA814F009228AB; + remoteInfo = AirshipBasement; + }; 3CF3DE9F24EB0787000CF516 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 6E65D56A2396E99D00AF2D1A /* Airship.xcodeproj */; @@ -396,6 +415,7 @@ 3CF3DE8024E76ED6000CF516 /* AirshipLocation.framework in Embed Frameworks */, 3CF3DE7824E76ED6000CF516 /* AirshipAutomation.framework in Embed Frameworks */, 3CF3DE7A24E76ED6000CF516 /* AirshipCore.framework in Embed Frameworks */, + 3CE5592426F11ECD00FBCBA5 /* AirshipBasement.framework in Embed Frameworks */, 3CF3DE7E24E76ED6000CF516 /* AirshipExtendedActions.framework in Embed Frameworks */, 3CF3DE8224E76ED6000CF516 /* AirshipMessageCenter.framework in Embed Frameworks */, 3CF3DE7624E76ED6000CF516 /* AirshipAccengage.framework in Embed Frameworks */, @@ -434,6 +454,7 @@ 1BF9B0E523A24E5D00E68DBE /* AirshipAccengage.framework in CopyFiles */, 6E65D5BC2396ECC200AF2D1A /* AirshipAutomation.framework in CopyFiles */, 3C0D070C26250093002337B0 /* AirshipChat.framework in CopyFiles */, + 3CE5592026F11EBF00FBCBA5 /* AirshipBasement.framework in CopyFiles */, 6E65D5BA2396EAA600AF2D1A /* AirshipLocation.framework in CopyFiles */, 6E65D5C32396ECC200AF2D1A /* AirshipMessageCenter.framework in CopyFiles */, 6E65D5BE2396ECC200AF2D1A /* AirshipCore.framework in CopyFiles */, @@ -517,6 +538,7 @@ 3CF3DE7724E76ED6000CF516 /* AirshipAutomation.framework in Frameworks */, 3CF3DE7924E76ED6000CF516 /* AirshipCore.framework in Frameworks */, 3CF3DE7D24E76ED6000CF516 /* AirshipExtendedActions.framework in Frameworks */, + 3CE5592326F11ECD00FBCBA5 /* AirshipBasement.framework in Frameworks */, 3CF3DE8124E76ED6000CF516 /* AirshipMessageCenter.framework in Frameworks */, 3CF62FFE258849710007502B /* AirshipDebug.framework in Frameworks */, 3CF3DE7524E76ED6000CF516 /* AirshipAccengage.framework in Frameworks */, @@ -544,7 +566,9 @@ files = ( DFC3839E243E9F6200EA78FE /* AirshipAccengage.framework in Frameworks */, 6E65D5C12396ECC200AF2D1A /* AirshipLocation.framework in Frameworks */, + 3CE5597C26F14B2D00FBCBA5 /* AirshipBasement.framework in Frameworks */, 3C0D070B26250093002337B0 /* AirshipChat.framework in Frameworks */, + 3CE5591F26F11EBF00FBCBA5 /* AirshipBasement.framework in Frameworks */, 6E65D5BB2396ECC200AF2D1A /* AirshipAutomation.framework in Frameworks */, 6E65D5BD2396ECC200AF2D1A /* AirshipCore.framework in Frameworks */, 6E65D5BF2396ECC200AF2D1A /* AirshipExtendedActions.framework in Frameworks */, @@ -626,7 +650,7 @@ isa = PBXGroup; children = ( 6EB1B41326EAA531000421B9 /* AirshipBasement.framework */, - 6EB1B41526EAA531000421B9 /* AirshipBasement tvOS.framework */, + 6EB1B41526EAA531000421B9 /* AirshipBasement.framework */, 6E65D57C2396E99D00AF2D1A /* AirshipCore.framework */, 6E65D57E2396E99D00AF2D1A /* AirshipCore.framework */, 6E65D5802396E99D00AF2D1A /* AirshipTests.xctest */, @@ -760,6 +784,7 @@ buildRules = ( ); dependencies = ( + 3CE5598226F14B4A00FBCBA5 /* PBXTargetDependency */, 3CF3DEA024EB0787000CF516 /* PBXTargetDependency */, 3CF3DEA224EB0787000CF516 /* PBXTargetDependency */, 3CF3DEA424EB0787000CF516 /* PBXTargetDependency */, @@ -824,6 +849,7 @@ buildRules = ( ); dependencies = ( + 3CE5598026F14B4300FBCBA5 /* PBXTargetDependency */, 6EAD7CD726B2003700B88EA7 /* PBXTargetDependency */, 3C0D06F02624FB75002337B0 /* PBXTargetDependency */, 6E6CC340239A2FB9003D583C /* PBXTargetDependency */, @@ -1060,10 +1086,10 @@ remoteRef = 6EB1B41226EAA531000421B9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 6EB1B41526EAA531000421B9 /* AirshipBasement tvOS.framework */ = { + 6EB1B41526EAA531000421B9 /* AirshipBasement.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = "AirshipBasement tvOS.framework"; + path = AirshipBasement.framework; remoteRef = 6EB1B41426EAA531000421B9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1244,6 +1270,16 @@ name = AirshipChat; targetProxy = 3C0D06EF2624FB75002337B0 /* PBXContainerItemProxy */; }; + 3CE5598026F14B4300FBCBA5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = AirshipBasement; + targetProxy = 3CE5597F26F14B4300FBCBA5 /* PBXContainerItemProxy */; + }; + 3CE5598226F14B4A00FBCBA5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = AirshipBasement; + targetProxy = 3CE5598126F14B4A00FBCBA5 /* PBXContainerItemProxy */; + }; 3CF3DEA024EB0787000CF516 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = AirshipAccengage; diff --git a/tvOSSample/tvOSSample.xcodeproj/project.pbxproj b/tvOSSample/tvOSSample.xcodeproj/project.pbxproj index d3e7afae7..daf30dca7 100644 --- a/tvOSSample/tvOSSample.xcodeproj/project.pbxproj +++ b/tvOSSample/tvOSSample.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 3CE5594226F1208C00FBCBA5 /* AirshipBasement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EB1B40626EAA526000421B9 /* AirshipBasement.framework */; }; 6E698DE4267825A200654DB2 /* AirshipCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E65D55D2396E99A00AF2D1A /* AirshipCore.framework */; }; 996A03D31EF1BA6A003424E0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DFEB1BD71E7A142100437516 /* Main.storyboard */; }; 99B3F4FF1ED641A1008F7C16 /* PushSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCDA35AA1B8D233A00950AD5 /* PushSettingsViewController.swift */; }; @@ -47,6 +48,13 @@ remoteGlobalIDString = 1BB4C02A239FE5E50000559B; remoteInfo = AirshipAccengageTests; }; + 3CE5599126F14B7D00FBCBA5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E65D5492396E99A00AF2D1A /* Airship.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 6E43204A26EA8199009228AB; + remoteInfo = "AirshipBasement tvOS"; + }; 6E65D55A2396E99A00AF2D1A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 6E65D5492396E99A00AF2D1A /* Airship.xcodeproj */; @@ -164,16 +172,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DFB8785C22860B8D001C4F94 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -211,6 +209,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3CE5594226F1208C00FBCBA5 /* AirshipBasement.framework in Frameworks */, 6E698DE4267825A200654DB2 /* AirshipCore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -259,7 +258,7 @@ isa = PBXGroup; children = ( 6EB1B40426EAA526000421B9 /* AirshipBasement.framework */, - 6EB1B40626EAA526000421B9 /* AirshipBasement tvOS.framework */, + 6EB1B40626EAA526000421B9 /* AirshipBasement.framework */, 6E65D55B2396E99A00AF2D1A /* AirshipCore.framework */, 6E65D55D2396E99A00AF2D1A /* AirshipCore.framework */, 6E65D55F2396E99A00AF2D1A /* AirshipTests.xctest */, @@ -334,11 +333,11 @@ DFEB1BCC1E7A142100437516 /* Frameworks */, DFEB1BCD1E7A142100437516 /* Resources */, DF508A972285F9020011D9C7 /* CopyFiles */, - DFB8785C22860B8D001C4F94 /* Embed Frameworks */, ); buildRules = ( ); dependencies = ( + 3CE5599226F14B7D00FBCBA5 /* PBXTargetDependency */, 6E698DE32678258300654DB2 /* PBXTargetDependency */, ); name = tvOSSample; @@ -496,10 +495,10 @@ remoteRef = 6EB1B40326EAA526000421B9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 6EB1B40626EAA526000421B9 /* AirshipBasement tvOS.framework */ = { + 6EB1B40626EAA526000421B9 /* AirshipBasement.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = "AirshipBasement tvOS.framework"; + path = AirshipBasement.framework; remoteRef = 6EB1B40526EAA526000421B9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -562,6 +561,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 3CE5599226F14B7D00FBCBA5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "AirshipBasement tvOS"; + targetProxy = 3CE5599126F14B7D00FBCBA5 /* PBXContainerItemProxy */; + }; 6E698DE32678258300654DB2 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "AirshipCore tvOS";