diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m index d3061a94a..717622caf 100644 --- a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m +++ b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m @@ -90,11 +90,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( #define ONESIGNAL_APP_ID_KEY_FOR_TESTING @"YOUR_APP_ID_HERE" + (NSString*)getOneSignalAppId { - NSString* userDefinedAppId = [[NSUserDefaults standardUserDefaults] objectForKey:ONESIGNAL_APP_ID_KEY_FOR_TESTING]; - if (userDefinedAppId) { - return userDefinedAppId; - } - return ONESIGNAL_APP_ID_DEFAULT; + // Prevent exposing our test app IDs, manually enter your app ID + return @"INSERT_YOUR_STAGING_APP_ID"; } + (void) setOneSignalAppId:(NSString*)onesignalAppId { diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/Info.plist b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/Info.plist index 7ac3fdb50..bc595bc29 100644 --- a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/Info.plist +++ b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/Info.plist @@ -2,16 +2,10 @@ - NSSupportsLiveActivities - - ITSAppUsesNonExemptEncryption - - UIUserInterfaceStyle - Light CFBundleDevelopmentRegion en CFBundleDisplayName - OneSignalExample + OneSignalStaging CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -26,6 +20,8 @@ $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) + ITSAppUsesNonExemptEncryption + LSRequiresIPhoneOS NSAppTransportSecurity @@ -33,14 +29,16 @@ NSAllowsArbitraryLoads + NSLocationAlwaysAndWhenInUseUsageDescription + test always and when in use NSLocationAlwaysUsageDescription Test Location NSLocationUsageDescription Test Location NSLocationWhenInUseUsageDescription Test Location2 - NSLocationAlwaysAndWhenInUseUsageDescription - test always and when in use + NSSupportsLiveActivities + OneSignal_disable_badge_clearing OneSignal_require_privacy_consent @@ -71,5 +69,7 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UIUserInterfaceStyle + Light diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/OneSignalDevApp.entitlements b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/OneSignalDevApp.entitlements index 28007cfd9..5388fb2fe 100644 --- a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/OneSignalDevApp.entitlements +++ b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/OneSignalDevApp.entitlements @@ -11,7 +11,7 @@ com.apple.security.application-groups - group.com.onesignal.example.onesignal + group.com.onesignal.example.staging.onesignal diff --git a/iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/project.pbxproj b/iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/project.pbxproj index 5be2fb614..80014fffc 100644 --- a/iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/project.pbxproj +++ b/iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/project.pbxproj @@ -49,32 +49,6 @@ DE12F3F8289B2B7F002F63AA /* OneSignalOSCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE12F3F6289B2B7F002F63AA /* OneSignalOSCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; DE61E483294810B900CD12F1 /* OneSignalFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E482294810B900CD12F1 /* OneSignalFramework.framework */; }; DE61E484294810B900CD12F1 /* OneSignalFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E482294810B900CD12F1 /* OneSignalFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DE61E4852948117000CD12F1 /* OneSignalExampleClip.app in Embed App Clips */ = {isa = PBXBuildFile; fileRef = DE68DA5724C7695900FC95A8 /* OneSignalExampleClip.app */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - DE61E48A2948117A00CD12F1 /* OneSignalCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E4892948117A00CD12F1 /* OneSignalCore.framework */; }; - DE61E48B2948117A00CD12F1 /* OneSignalCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E4892948117A00CD12F1 /* OneSignalCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DE61E48E2948117D00CD12F1 /* OneSignalExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E48D2948117D00CD12F1 /* OneSignalExtension.framework */; }; - DE61E48F2948117D00CD12F1 /* OneSignalExtension.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E48D2948117D00CD12F1 /* OneSignalExtension.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DE61E4912948118200CD12F1 /* OneSignalFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E4902948118200CD12F1 /* OneSignalFramework.framework */; }; - DE61E4922948118200CD12F1 /* OneSignalFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E4902948118200CD12F1 /* OneSignalFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DE61E4942948118500CD12F1 /* OneSignalNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E4932948118500CD12F1 /* OneSignalNotifications.framework */; }; - DE61E4952948118500CD12F1 /* OneSignalNotifications.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E4932948118500CD12F1 /* OneSignalNotifications.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DE61E4972948118900CD12F1 /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E4962948118900CD12F1 /* OneSignalOSCore.framework */; }; - DE61E4982948118900CD12F1 /* OneSignalOSCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E4962948118900CD12F1 /* OneSignalOSCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DE61E49A2948118C00CD12F1 /* OneSignalOutcomes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E4992948118C00CD12F1 /* OneSignalOutcomes.framework */; }; - DE61E49B2948118D00CD12F1 /* OneSignalOutcomes.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E4992948118C00CD12F1 /* OneSignalOutcomes.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DE61E49D2948119100CD12F1 /* OneSignalUser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E49C2948119100CD12F1 /* OneSignalUser.framework */; }; - DE61E49E2948119100CD12F1 /* OneSignalUser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE61E49C2948119100CD12F1 /* OneSignalUser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - DE68DA5B24C7695900FC95A8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DE68DA5A24C7695900FC95A8 /* AppDelegate.m */; }; - DE68DA5E24C7695900FC95A8 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DE68DA5D24C7695900FC95A8 /* SceneDelegate.m */; }; - DE68DA6124C7695900FC95A8 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DE68DA6024C7695900FC95A8 /* ViewController.m */; }; - DE68DA6424C7695900FC95A8 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DE68DA6224C7695900FC95A8 /* Main.storyboard */; }; - DE68DA6624C7695A00FC95A8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DE68DA6524C7695A00FC95A8 /* Assets.xcassets */; }; - DE68DA6924C7695A00FC95A8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DE68DA6724C7695A00FC95A8 /* LaunchScreen.storyboard */; }; - DE68DA6C24C7695A00FC95A8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DE68DA6B24C7695A00FC95A8 /* main.m */; }; - DE68DA7724C769F200FC95A8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03432CDB1EBD426A0071FC48 /* CoreLocation.framework */; }; - DE68DA7824C769F900FC95A8 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9112E8A61E724EE00022A1CB /* SystemConfiguration.framework */; }; - DE68DA7924C76A0300FC95A8 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91B6EA051E83215000B5CF01 /* UserNotifications.framework */; }; - DE68DA7A24C76A1800FC95A8 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACBAAB5218A7136000ACAA5 /* WebKit.framework */; }; DE7D180727026BB5002D3A5D /* OneSignalCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D180627026BB5002D3A5D /* OneSignalCore.framework */; }; DE7D180827026BB5002D3A5D /* OneSignalCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D180627026BB5002D3A5D /* OneSignalCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; DE7D180927026BC5002D3A5D /* OneSignalCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D180627026BB5002D3A5D /* OneSignalCore.framework */; }; @@ -109,13 +83,6 @@ remoteGlobalIDString = 945C59DB296CF2A00097041D; remoteInfo = OneSignalWidgetExtensionExtension; }; - DE61E4862948117000CD12F1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9112E87A1E724C320022A1CB /* Project object */; - proxyType = 1; - remoteGlobalIDString = DE68DA5624C7695900FC95A8; - remoteInfo = OneSignalExampleClip; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -137,28 +104,10 @@ dstPath = "$(CONTENTS_FOLDER_PATH)/AppClips"; dstSubfolderSpec = 16; files = ( - DE61E4852948117000CD12F1 /* OneSignalExampleClip.app in Embed App Clips */, ); name = "Embed App Clips"; runOnlyForDeploymentPostprocessing = 0; }; - DE61E48C2948117A00CD12F1 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - DE61E4952948118500CD12F1 /* OneSignalNotifications.framework in Embed Frameworks */, - DE61E49E2948119100CD12F1 /* OneSignalUser.framework in Embed Frameworks */, - DE61E4922948118200CD12F1 /* OneSignalFramework.framework in Embed Frameworks */, - DE61E48B2948117A00CD12F1 /* OneSignalCore.framework in Embed Frameworks */, - DE61E48F2948117D00CD12F1 /* OneSignalExtension.framework in Embed Frameworks */, - DE61E49B2948118D00CD12F1 /* OneSignalOutcomes.framework in Embed Frameworks */, - DE61E4982948118900CD12F1 /* OneSignalOSCore.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; DEA226FA261F74060092FF58 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -236,7 +185,6 @@ DE61E4962948118900CD12F1 /* OneSignalOSCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignalOSCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DE61E4992948118C00CD12F1 /* OneSignalOutcomes.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignalOutcomes.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DE61E49C2948119100CD12F1 /* OneSignalUser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OneSignalUser.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - DE68DA5724C7695900FC95A8 /* OneSignalExampleClip.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OneSignalExampleClip.app; sourceTree = BUILT_PRODUCTS_DIR; }; DE68DA5924C7695900FC95A8 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; DE68DA5A24C7695900FC95A8 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; DE68DA5C24C7695900FC95A8 /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = ""; }; @@ -313,24 +261,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DE68DA5424C7695900FC95A8 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DE61E48A2948117A00CD12F1 /* OneSignalCore.framework in Frameworks */, - DE61E4912948118200CD12F1 /* OneSignalFramework.framework in Frameworks */, - DE61E4972948118900CD12F1 /* OneSignalOSCore.framework in Frameworks */, - DE61E48E2948117D00CD12F1 /* OneSignalExtension.framework in Frameworks */, - DE61E49A2948118C00CD12F1 /* OneSignalOutcomes.framework in Frameworks */, - DE61E49D2948119100CD12F1 /* OneSignalUser.framework in Frameworks */, - DE68DA7A24C76A1800FC95A8 /* WebKit.framework in Frameworks */, - DE61E4942948118500CD12F1 /* OneSignalNotifications.framework in Frameworks */, - DE68DA7924C76A0300FC95A8 /* UserNotifications.framework in Frameworks */, - DE68DA7724C769F200FC95A8 /* CoreLocation.framework in Frameworks */, - DE68DA7824C769F900FC95A8 /* SystemConfiguration.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -362,7 +292,6 @@ children = ( 9112E8821E724C320022A1CB /* OneSignalExample.app */, 9150E7721E73BEDC00C5D46A /* OneSignalNotificationServiceExtension.appex */, - DE68DA5724C7695900FC95A8 /* OneSignalExampleClip.app */, 945C59DC296CF2A00097041D /* OneSignalWidgetExtensionExtension.appex */, ); name = Products; @@ -505,7 +434,6 @@ ); dependencies = ( 9150E7791E73BEDD00C5D46A /* PBXTargetDependency */, - DE61E4872948117000CD12F1 /* PBXTargetDependency */, 945C59EF296CF2A10097041D /* PBXTargetDependency */, ); name = OneSignalExample; @@ -551,26 +479,6 @@ productReference = 945C59DC296CF2A00097041D /* OneSignalWidgetExtensionExtension.appex */; productType = "com.apple.product-type.app-extension"; }; - DE68DA5624C7695900FC95A8 /* OneSignalExampleClip */ = { - isa = PBXNativeTarget; - buildConfigurationList = DE68DA7424C7695A00FC95A8 /* Build configuration list for PBXNativeTarget "OneSignalExampleClip" */; - buildPhases = ( - DE68DA5324C7695900FC95A8 /* Sources */, - DE68DA5424C7695900FC95A8 /* Frameworks */, - DE68DA5524C7695900FC95A8 /* Resources */, - DE61E48C2948117A00CD12F1 /* Embed Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = OneSignalExampleClip; - packageProductDependencies = ( - ); - productName = OneSignalDevAppClip; - productReference = DE68DA5724C7695900FC95A8 /* OneSignalExampleClip.app */; - productType = "com.apple.product-type.application.on-demand-install-capable"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -611,9 +519,6 @@ 945C59DB296CF2A00097041D = { CreatedOnToolsVersion = 14.1; }; - DE68DA5624C7695900FC95A8 = { - CreatedOnToolsVersion = 12.0; - }; }; }; buildConfigurationList = 9112E87D1E724C320022A1CB /* Build configuration list for PBXProject "OneSignalExample" */; @@ -634,7 +539,6 @@ targets = ( 9112E8811E724C320022A1CB /* OneSignalExample */, 9150E7711E73BEDC00C5D46A /* OneSignalNotificationServiceExtension */, - DE68DA5624C7695900FC95A8 /* OneSignalExampleClip */, 945C59DB296CF2A00097041D /* OneSignalWidgetExtensionExtension */, ); }; @@ -672,16 +576,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DE68DA5524C7695900FC95A8 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DE68DA6924C7695A00FC95A8 /* LaunchScreen.storyboard in Resources */, - DE68DA6624C7695A00FC95A8 /* Assets.xcassets in Resources */, - DE68DA6424C7695900FC95A8 /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -719,17 +613,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DE68DA5324C7695900FC95A8 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DE68DA6124C7695900FC95A8 /* ViewController.m in Sources */, - DE68DA5B24C7695900FC95A8 /* AppDelegate.m in Sources */, - DE68DA6C24C7695A00FC95A8 /* main.m in Sources */, - DE68DA5E24C7695900FC95A8 /* SceneDelegate.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -744,12 +627,6 @@ target = 945C59DB296CF2A00097041D /* OneSignalWidgetExtensionExtension */; targetProxy = 945C59EE296CF2A10097041D /* PBXContainerItemProxy */; }; - DE61E4872948117000CD12F1 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - platformFilter = ios; - target = DE68DA5624C7695900FC95A8 /* OneSignalExampleClip */; - targetProxy = DE61E4862948117000CD12F1 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -887,7 +764,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = OneSignalDevApp/OneSignalDevApp.entitlements; - CURRENT_PROJECT_VERSION = 1.4.4; + CURRENT_PROJECT_VERSION = 1; DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES; DEVELOPMENT_TEAM = 99SW8E36CT; "DYLIB_INSTALL_NAME_BASE[arch=*]" = "@rpath"; @@ -896,14 +773,15 @@ "$(PROJECT_DIR)", ); INFOPLIST_FILE = OneSignalDevApp/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = OneSignalStaging; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.4.4; + MARKETING_VERSION = 5.2.7; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example; + PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging; PRODUCT_NAME = OneSignalExample; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "OneSignalDevApp/OneSignalExample-Bridging-Header.h"; @@ -919,7 +797,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = OneSignalDevApp/OneSignalDevApp.entitlements; - CURRENT_PROJECT_VERSION = 1.4.4; + CURRENT_PROJECT_VERSION = 1; DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES; DEVELOPMENT_TEAM = 99SW8E36CT; "DYLIB_INSTALL_NAME_BASE[arch=*]" = "@rpath"; @@ -928,14 +806,15 @@ "$(PROJECT_DIR)", ); INFOPLIST_FILE = OneSignalDevApp/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = OneSignalStaging; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.4.4; + MARKETING_VERSION = 5.2.7; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example; + PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging; PRODUCT_NAME = OneSignalExample; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "OneSignalDevApp/OneSignalExample-Bridging-Header.h"; @@ -948,7 +827,7 @@ buildSettings = { CLANG_WARN_STRICT_PROTOTYPES = NO; CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements; - CURRENT_PROJECT_VERSION = 1.4.4; + CURRENT_PROJECT_VERSION = 1; DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES; DEVELOPMENT_TEAM = 99SW8E36CT; FRAMEWORK_SEARCH_PATHS = ( @@ -961,9 +840,9 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.4.4; + MARKETING_VERSION = 1.0; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA; + PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging.OneSignalNotificationServiceExtensionA; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SUPPORTS_MACCATALYST = YES; @@ -975,7 +854,7 @@ buildSettings = { CLANG_WARN_STRICT_PROTOTYPES = NO; CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements; - CURRENT_PROJECT_VERSION = 1.4.4; + CURRENT_PROJECT_VERSION = 1; DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES; DEVELOPMENT_TEAM = 99SW8E36CT; FRAMEWORK_SEARCH_PATHS = ( @@ -989,9 +868,9 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.4.4; + MARKETING_VERSION = 1.0; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA; + PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging.OneSignalNotificationServiceExtensionA; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SUPPORTS_MACCATALYST = YES; @@ -1034,7 +913,7 @@ MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalWidgetExtension; + PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging.OneSignalWidgetExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SUPPORTS_MACCATALYST = YES; @@ -1081,7 +960,7 @@ ); MARKETING_VERSION = 1.0; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalWidgetExtension; + PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging.OneSignalWidgetExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SUPPORTS_MACCATALYST = YES; @@ -1093,88 +972,6 @@ }; name = Release; }; - DE68DA7224C7695A00FC95A8 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = OneSignalDevAppClip/OneSignalDevAppClip.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.4.4; - DEVELOPMENT_TEAM = 99SW8E36CT; - "DYLIB_INSTALL_NAME_BASE[arch=*]" = "@rpath"; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - OS_APP_CLIP, - ); - INFOPLIST_FILE = OneSignalDevAppClip/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.4.4; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.Clip; - PRODUCT_NAME = OneSignalExampleClip; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - DE68DA7324C7695A00FC95A8 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = OneSignalDevAppClip/OneSignalDevAppClip.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.4.4; - DEVELOPMENT_TEAM = 99SW8E36CT; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_PREPROCESSOR_DEFINITIONS = OS_APP_CLIP; - INFOPLIST_FILE = OneSignalDevAppClip/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.4.4; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.Clip; - PRODUCT_NAME = OneSignalExampleClip; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1214,15 +1011,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DE68DA7424C7695A00FC95A8 /* Build configuration list for PBXNativeTarget "OneSignalExampleClip" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DE68DA7224C7695A00FC95A8 /* Debug */, - DE68DA7324C7695A00FC95A8 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 9112E87A1E724C320022A1CB /* Project object */; diff --git a/iOS_SDK/OneSignalDevApp/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements b/iOS_SDK/OneSignalDevApp/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements index c70461e82..fa1031a37 100644 --- a/iOS_SDK/OneSignalDevApp/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements +++ b/iOS_SDK/OneSignalDevApp/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements @@ -4,7 +4,7 @@ com.apple.security.application-groups - group.com.onesignal.example.onesignal + group.com.onesignal.example.staging.onesignal diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h index ab169de85..92114abcb 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h +++ b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h @@ -33,8 +33,8 @@ // Networking #define OS_API_VERSION @"1" #define OS_API_ACCEPT_HEADER @"application/vnd.onesignal.v" OS_API_VERSION @"+json" -#define OS_API_SERVER_URL @"https://api.onesignal.com/" -#define OS_IAM_WEBVIEW_BASE_URL @"https://onesignal.com/" +#define OS_API_SERVER_URL @"https://api.staging.onesignal.com/" +#define OS_IAM_WEBVIEW_BASE_URL @"https://staging.onesignal.com/" // OneSignalUserDefault keys // String values start with "OSUD_" to maintain a level of uniqueness from other libs and app code