Fix SPM file references + compilation errors (#408)

JonathanDowning · web-flow · commit 215c30726d43 · 2020-10-27T11:42:47.000+01:00
* Fix SPM aliases

* Fix compile errors
diff --git a/Leanplum-SDK/Classes/LPMessageTemplates.m b/Leanplum-SDK/Classes/LPMessageTemplates.m
@@ -31,7 +31,7 @@
 #import <StoreKit/StoreKit.h>
 #import "LPCountAggregator.h"
 #import "LPOpenUrlMessageTemplate.h"
-#import "LPPushAsktoAskMessageTemplate.h"
+#import "LPPushAskToAskMessageTemplate.h"
 #import "LPRegisterForPushMessageTemplate.h"
 #import "LPCenterPopupMessageTemplate.h"
 #import "LPInterstitialMessageTemplate.h"
diff --git a/Leanplum-SDK/Classes/MessageTemplates/ViewControllers/LPInterstitialViewController.m b/Leanplum-SDK/Classes/MessageTemplates/ViewControllers/LPInterstitialViewController.m
@@ -17,7 +17,7 @@ @implementation LPInterstitialViewController
 
 +(LPInterstitialViewController *)instantiateFromStoryboard
 {
-#if SWIFTPM_MODULE_BUNDLE
+#ifdef SWIFTPM_MODULE_BUNDLE
     NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;
 #else
     NSBundle *bundle = [NSBundle bundleForClass:[Leanplum class]];
diff --git a/Leanplum-SDK/Classes/MessageTemplates/ViewControllers/LPPopupViewController.m b/Leanplum-SDK/Classes/MessageTemplates/ViewControllers/LPPopupViewController.m
@@ -20,7 +20,7 @@ @implementation LPPopupViewController
 
 +(LPPopupViewController *)instantiateFromStoryboard
 {
-#if SWIFTPM_MODULE_BUNDLE
+#ifdef SWIFTPM_MODULE_BUNDLE
     NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;
 #else
     NSBundle *bundle = [NSBundle bundleForClass:[Leanplum class]];
diff --git a/Leanplum-SDK/Classes/MessageTemplates/ViewControllers/LPWebInterstitialViewController.m b/Leanplum-SDK/Classes/MessageTemplates/ViewControllers/LPWebInterstitialViewController.m
@@ -22,7 +22,7 @@ @implementation LPWebInterstitialViewController
 
 +(LPWebInterstitialViewController *)instantiateFromStoryboard
 {
-#if SWIFTPM_MODULE_BUNDLE
+#ifdef SWIFTPM_MODULE_BUNDLE
     NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;
 #else
     NSBundle *bundle = [NSBundle bundleForClass:[Leanplum class]];
diff --git a/Leanplum-SDK/include/LPDeferMessageManager.h b/Leanplum-SDK/include/LPDeferMessageManager.h
@@ -0,0 +1 @@
+../Classes/Managers/LPDeferMessageManager.h
diff --git a/Leanplum-SDK/include/LPLogManager.h b/Leanplum-SDK/include/LPLogManager.h
@@ -0,0 +1 @@
+../Classes/Managers/LPLogManager.h
diff --git a/Leanplum-SDK/include/LPNetworkConstants.h b/Leanplum-SDK/include/LPNetworkConstants.h
@@ -0,0 +1 @@
+../Classes/Managers/Networking/LPNetworkConstants.h
diff --git a/Leanplum-SDK/include/LPPushMessageTemplate.h b/Leanplum-SDK/include/LPPushMessageTemplate.h
@@ -0,0 +1 @@
+../Classes/MessageTemplates/LPPushMessageTemplate.h
diff --git a/Leanplum-SDK/include/LPRequestSenderTimer.h b/Leanplum-SDK/include/LPRequestSenderTimer.h
@@ -0,0 +1 @@
+../Classes/Managers/Networking/LPRequestSenderTimer.h
diff --git a/Leanplum-SDK/include/LPRequesting.h b/Leanplum-SDK/include/LPRequesting.h
diff --git a/Leanplum-SDK/include/LeanplumRequest.h b/Leanplum-SDK/include/LeanplumRequest.h
diff --git a/Package.swift b/Package.swift
@@ -20,4 +20,4 @@ let package = Package(
             publicHeadersPath: "include"
         )
     ]
-)
+)
diff --git a/Tools/spm.sh b/Tools/spm.sh

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ @implementation LPInterstitialViewController`
`17`	`17`
`18`	`18`	`+(LPInterstitialViewController *)instantiateFromStoryboard`
`19`	`19`	`{`
`20`		`-#if SWIFTPM_MODULE_BUNDLE`
	`20`	`+#ifdef SWIFTPM_MODULE_BUNDLE`
`21`	`21`	`NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;`
`22`	`22`	`#else`
`23`	`23`	`NSBundle *bundle = [NSBundle bundleForClass:[Leanplum class]];`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ @implementation LPPopupViewController`
`20`	`20`
`21`	`21`	`+(LPPopupViewController *)instantiateFromStoryboard`
`22`	`22`	`{`
`23`		`-#if SWIFTPM_MODULE_BUNDLE`
	`23`	`+#ifdef SWIFTPM_MODULE_BUNDLE`
`24`	`24`	`NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;`
`25`	`25`	`#else`
`26`	`26`	`NSBundle *bundle = [NSBundle bundleForClass:[Leanplum class]];`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ @implementation LPWebInterstitialViewController`
`22`	`22`
`23`	`23`	`+(LPWebInterstitialViewController *)instantiateFromStoryboard`
`24`	`24`	`{`
`25`		`-#if SWIFTPM_MODULE_BUNDLE`
	`25`	`+#ifdef SWIFTPM_MODULE_BUNDLE`
`26`	`26`	`NSBundle *bundle = SWIFTPM_MODULE_BUNDLE;`
`27`	`27`	`#else`
`28`	`28`	`NSBundle *bundle = [NSBundle bundleForClass:[Leanplum class]];`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../Classes/Managers/LPDeferMessageManager.h`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../Classes/Managers/Networking/LPNetworkConstants.h`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../Classes/MessageTemplates/LPPushMessageTemplate.h`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../Classes/Managers/Networking/LPRequestSenderTimer.h`