Fixing nullability warnings and schemes for Carthage build

Author: emawby

iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/xcshareddata/xcschemes/OneSignalDevApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,9 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "37747F9219147D6500558FAD"
-               BuildableName = "libOneSignal.a"
-               BlueprintName = "OneSignal"
+               BlueprintIdentifier = "DE7D17F827026BA3002D3A5D"
+               BuildableName = "OneSignalExtension.framework"
+               BlueprintName = "OneSignalExtension"
                ReferencedContainer = "container:OneSignal.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -28,16 +28,6 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "911E2CB91E398AB3003112A4"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:OneSignal.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -50,15 +40,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "37747F9219147D6500558FAD"
-            BuildableName = "libOneSignal.a"
-            BlueprintName = "OneSignal"
-            ReferencedContainer = "container:OneSignal.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -69,9 +50,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "37747F9219147D6500558FAD"
-            BuildableName = "libOneSignal.a"
-            BlueprintName = "OneSignal"
+            BlueprintIdentifier = "DE7D17F827026BA3002D3A5D"
+            BuildableName = "OneSignalExtension.framework"
+            BlueprintName = "OneSignalExtension"
             ReferencedContainer = "container:OneSignal.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/OneSignal.xcscheme renamed to iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/OneSignalExtension.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DE68DA5624C7695900FC95A8"
-               BuildableName = "OneSignalExampleClip.app"
-               BlueprintName = "OneSignalExampleClip"
-               ReferencedContainer = "container:OneSignalExample.xcodeproj">
+               BlueprintIdentifier = "DE7D187F27037F43002D3A5D"
+               BuildableName = "OneSignalOutcomes.framework"
+               BlueprintName = "OneSignalOutcomes"
+               ReferencedContainer = "container:OneSignal.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -28,16 +28,6 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "911E2CB91E398AB3003112A4"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:../OneSignalSDK/OneSignal.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -50,40 +40,22 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DE68DA5624C7695900FC95A8"
-            BuildableName = "OneSignalExampleClip.app"
-            BlueprintName = "OneSignalExampleClip"
-            ReferencedContainer = "container:OneSignalExample.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "_XCAppClipURL"
-            value = "https://example.com"
-            isEnabled = "NO">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DE68DA5624C7695900FC95A8"
-            BuildableName = "OneSignalExampleClip.app"
-            BlueprintName = "OneSignalExampleClip"
-            ReferencedContainer = "container:OneSignalExample.xcodeproj">
+            BlueprintIdentifier = "DE7D187F27037F43002D3A5D"
+            BuildableName = "OneSignalOutcomes.framework"
+            BlueprintName = "OneSignalOutcomes"
+            ReferencedContainer = "container:OneSignal.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/xcshareddata/xcschemes/OneSignalDevAppClip.xcscheme renamed to iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/OneSignalOutcomes.xcscheme

@@ -57,4 +57,4 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType)  {
 // Convert the class into a NSDictionary
 - (NSDictionary *_Nonnull)jsonRepresentation;
 
-@end;
+@end

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OSNotificationClasses.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 
 @interface OSInfluenceDataRepository : NSObject
 
-+ (OSInfluenceDataRepository *)sharedInfluenceDataRepository;
++ (OSInfluenceDataRepository * _Nonnull)sharedInfluenceDataRepository;
 
 - (void)cacheNotificationInfluenceType:(OSInfluenceType) influenceType;
 - (OSInfluenceType)notificationCachedInfluenceType;

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSInfluenceDataRepository.h

@@ -33,7 +33,7 @@ THE SOFTWARE.
 
 @interface OSTrackerFactory : NSObject
 
-+ (OSTrackerFactory*)sharedTrackerFactory;
++ (OSTrackerFactory* _Nonnull)sharedTrackerFactory;
 
 - (id _Nonnull)initWithRepository:(OSInfluenceDataRepository * _Nonnull)dataRepository;
 - (void)saveInfluenceParams:(NSDictionary * _Nonnull)params;

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/Influence/OSTrackerFactory.h

@@ -65,4 +65,4 @@
 @end
 
 /*Block for handling outcome event being sent successfully*/
-typedef void (^OSSendOutcomeSuccess)(OSOutcomeEvent* outcome);
+typedef void (^OSSendOutcomeSuccess)(OSOutcomeEvent* _Nonnull outcome);

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Model/V1/OSOutcomeEvent.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 @interface OSOutcomeEventsCache : NSObject
 
-+ (OSOutcomeEventsCache *)sharedOutcomeEventsCache;
++ (OSOutcomeEventsCache * _Nonnull)sharedOutcomeEventsCache;
 
 - (BOOL)isOutcomesV2ServiceEnabled;
 - (void)saveOutcomesV2ServiceEnabled:(BOOL)isEnabled;

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSOutcomeEventsCache.h

@@ -36,7 +36,7 @@
 
 @interface OSSessionManager : NSObject
 
-+ (OSSessionManager *)sharedSessionManager;
++ (OSSessionManager * _Nonnull)sharedSessionManager;
 
 + (void)resetSharedSessionManager;