Skip to content

Commit 8515156

Browse files
author
Alexis Oyama
committed
Revert "fix(tvos): fixing tvos build (#61)"
This reverts commit 371153e.
1 parent 7fed0be commit 8515156

File tree

7 files changed

+31
-126
lines changed

7 files changed

+31
-126
lines changed

‎Example/Leanplum-SDK.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
07E5C8F41F052DD000A4B092 /* SingleMessage.json in Resources */ = {isa = PBXBuildFile; fileRef = 07E5C8A81F052B7800A4B092 /* SingleMessage.json */; };
7575
07E5C8F51F052DD000A4B092 /* TiedPriorities1.json in Resources */ = {isa = PBXBuildFile; fileRef = 07E5C8A91F052B7800A4B092 /* TiedPriorities1.json */; };
7676
07E5C8F61F052DD000A4B092 /* TiedPriorities2.json in Resources */ = {isa = PBXBuildFile; fileRef = 07E5C8AA1F052B7800A4B092 /* TiedPriorities2.json */; };
77-
0ADAE7C0E4626C7508D4F51F /* Pods_Leanplum_SDK_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6AF083E55AE0487017CBBD40 /* Pods_Leanplum_SDK_Tests.framework */; };
7877
6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
7978
6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
8079
6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
@@ -87,17 +86,18 @@
8786
6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
8887
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
8988
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
89+
7EB62201F9933A5796D4A2FE /* Pods_Leanplum_SDK_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66C5FAC1828A41289CE29EF5 /* Pods_Leanplum_SDK_Example.framework */; };
9090
873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
91-
943CD7A9FF2D3B6F5C05407D /* Pods_Leanplum_tvOS_SDK_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B7AA729189F43717597200B /* Pods_Leanplum_tvOS_SDK_Example.framework */; };
9291
9CB691DE1F15FFF5002D83D8 /* batch_response.json in Resources */ = {isa = PBXBuildFile; fileRef = 9CB691DD1F15FFF5002D83D8 /* batch_response.json */; };
9392
9CB691DF1F15FFFF002D83D8 /* batch_response.json in Resources */ = {isa = PBXBuildFile; fileRef = 9CB691DD1F15FFF5002D83D8 /* batch_response.json */; };
9493
9CB691E11F1601BA002D83D8 /* EventCallbackManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CB691E01F1601BA002D83D8 /* EventCallbackManagerTest.m */; };
94+
B08587C9AF0FCE5835E853EA /* Pods_Leanplum_SDK_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7849230A3D5C6DE5929ED1C8 /* Pods_Leanplum_SDK_Tests.framework */; };
9595
B5CCCA2D1D74B64D005ADEE1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B5CCCA2C1D74B64D005ADEE1 /* main.m */; };
9696
B5CCCA301D74B64D005ADEE1 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B5CCCA2F1D74B64D005ADEE1 /* AppDelegate.m */; };
9797
B5CCCA331D74B64D005ADEE1 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5CCCA321D74B64D005ADEE1 /* ViewController.m */; };
9898
B5CCCA361D74B64D005ADEE1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B5CCCA341D74B64D005ADEE1 /* Main.storyboard */; };
9999
B5CCCA381D74B64D005ADEE1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B5CCCA371D74B64D005ADEE1 /* Assets.xcassets */; };
100-
D5C6A8D65B481CDF4A0A2F18 /* Pods_Leanplum_SDK_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05E32100A0C2ED8AC080239C /* Pods_Leanplum_SDK_Example.framework */; };
100+
E1B1B1940FC870B25684ED7D /* Pods_Leanplum_tvOS_SDK_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EE2D840C30124E373ADF721 /* Pods_Leanplum_tvOS_SDK_Example.framework */; };
101101
/* End PBXBuildFile section */
102102

103103
/* Begin PBXContainerItemProxy section */
@@ -111,7 +111,6 @@
111111
/* End PBXContainerItemProxy section */
112112

113113
/* Begin PBXFileReference section */
114-
05E32100A0C2ED8AC080239C /* Pods_Leanplum_SDK_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Leanplum_SDK_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
115114
0723D6CA1ED8CCAA004AE3A5 /* Leanplum-iOS-SDK-source.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = "Leanplum-iOS-SDK-source.podspec"; path = "../Leanplum-iOS-SDK-source.podspec"; sourceTree = "<group>"; };
116115
0723D6CB1ED8CCAA004AE3A5 /* Leanplum-iOS-SDK.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = "Leanplum-iOS-SDK.podspec"; path = "../Leanplum-iOS-SDK.podspec"; sourceTree = "<group>"; };
117116
0723D6CC1ED8CCAA004AE3A5 /* Leanplum-tvOS-SDK.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = "Leanplum-tvOS-SDK.podspec"; path = "../Leanplum-tvOS-SDK.podspec"; sourceTree = "<group>"; };
@@ -164,7 +163,6 @@
164163
07E5C8A81F052B7800A4B092 /* SingleMessage.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = SingleMessage.json; sourceTree = "<group>"; };
165164
07E5C8A91F052B7800A4B092 /* TiedPriorities1.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = TiedPriorities1.json; sourceTree = "<group>"; };
166165
07E5C8AA1F052B7800A4B092 /* TiedPriorities2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = TiedPriorities2.json; sourceTree = "<group>"; };
167-
0B7AA729189F43717597200B /* Pods_Leanplum_tvOS_SDK_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Leanplum_tvOS_SDK_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
168166
1982CE36FE54461D3A24D6B5 /* Pods-Leanplum-tvOS-SDK_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Leanplum-tvOS-SDK_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Leanplum-tvOS-SDK_Example/Pods-Leanplum-tvOS-SDK_Example.debug.xcconfig"; sourceTree = "<group>"; };
169167
29ABF5FA9E1826C5BBE433C9 /* Pods-Leanplum-SDK_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Leanplum-SDK_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Leanplum-SDK_Tests/Pods-Leanplum-SDK_Tests.debug.xcconfig"; sourceTree = "<group>"; };
170168
6003F58A195388D20070C39A /* Leanplum-SDK_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Leanplum-SDK_Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -185,13 +183,15 @@
185183
6003F5B7195388D20070C39A /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
186184
6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
187185
606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
188-
6AF083E55AE0487017CBBD40 /* Pods_Leanplum_SDK_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Leanplum_SDK_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
186+
66C5FAC1828A41289CE29EF5 /* Pods_Leanplum_SDK_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Leanplum_SDK_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
189187
73B565AA61D6B6A4E92607C4 /* Pods-Leanplum-SDK_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Leanplum-SDK_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Leanplum-SDK_Tests/Pods-Leanplum-SDK_Tests.release.xcconfig"; sourceTree = "<group>"; };
190188
74C2EA3F2D53CAE77A03BFFA /* Pods-Leanplum-tvOS-SDK_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Leanplum-tvOS-SDK_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Leanplum-tvOS-SDK_Example/Pods-Leanplum-tvOS-SDK_Example.release.xcconfig"; sourceTree = "<group>"; };
189+
7849230A3D5C6DE5929ED1C8 /* Pods_Leanplum_SDK_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Leanplum_SDK_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
191190
84A3C33C701600A874B8C63F /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
192191
873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
193192
9CB691DD1F15FFF5002D83D8 /* batch_response.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = batch_response.json; sourceTree = "<group>"; };
194193
9CB691E01F1601BA002D83D8 /* EventCallbackManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EventCallbackManagerTest.m; sourceTree = "<group>"; };
194+
9EE2D840C30124E373ADF721 /* Pods_Leanplum_tvOS_SDK_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Leanplum_tvOS_SDK_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
195195
A54ACCFCB36AE8C874708A7F /* libPods-Leanplum-SDK_Example-Leanplum-SDK_Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Leanplum-SDK_Example-Leanplum-SDK_Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
196196
B5CCCA291D74B64D005ADEE1 /* Leanplum-tvOS-SDK_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Leanplum-tvOS-SDK_Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
197197
B5CCCA2C1D74B64D005ADEE1 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -215,7 +215,7 @@
215215
6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
216216
6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
217217
6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
218-
D5C6A8D65B481CDF4A0A2F18 /* Pods_Leanplum_SDK_Example.framework in Frameworks */,
218+
7EB62201F9933A5796D4A2FE /* Pods_Leanplum_SDK_Example.framework in Frameworks */,
219219
);
220220
runOnlyForDeploymentPostprocessing = 0;
221221
};
@@ -226,15 +226,15 @@
226226
6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */,
227227
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */,
228228
6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */,
229-
0ADAE7C0E4626C7508D4F51F /* Pods_Leanplum_SDK_Tests.framework in Frameworks */,
229+
B08587C9AF0FCE5835E853EA /* Pods_Leanplum_SDK_Tests.framework in Frameworks */,
230230
);
231231
runOnlyForDeploymentPostprocessing = 0;
232232
};
233233
B5CCCA261D74B64D005ADEE1 /* Frameworks */ = {
234234
isa = PBXFrameworksBuildPhase;
235235
buildActionMask = 2147483647;
236236
files = (
237-
943CD7A9FF2D3B6F5C05407D /* Pods_Leanplum_tvOS_SDK_Example.framework in Frameworks */,
237+
E1B1B1940FC870B25684ED7D /* Pods_Leanplum_tvOS_SDK_Example.framework in Frameworks */,
238238
);
239239
runOnlyForDeploymentPostprocessing = 0;
240240
};
@@ -384,10 +384,10 @@
384384
6003F58F195388D20070C39A /* CoreGraphics.framework */,
385385
6003F591195388D20070C39A /* UIKit.framework */,
386386
6003F5AF195388D20070C39A /* XCTest.framework */,
387+
7849230A3D5C6DE5929ED1C8 /* Pods_Leanplum_SDK_Tests.framework */,
387388
A54ACCFCB36AE8C874708A7F /* libPods-Leanplum-SDK_Example-Leanplum-SDK_Tests.a */,
388-
05E32100A0C2ED8AC080239C /* Pods_Leanplum_SDK_Example.framework */,
389-
6AF083E55AE0487017CBBD40 /* Pods_Leanplum_SDK_Tests.framework */,
390-
0B7AA729189F43717597200B /* Pods_Leanplum_tvOS_SDK_Example.framework */,
389+
66C5FAC1828A41289CE29EF5 /* Pods_Leanplum_SDK_Example.framework */,
390+
9EE2D840C30124E373ADF721 /* Pods_Leanplum_tvOS_SDK_Example.framework */,
391391
);
392392
name = Frameworks;
393393
sourceTree = "<group>";
@@ -1076,8 +1076,7 @@
10761076
MTL_ENABLE_DEBUG_INFO = YES;
10771077
PRODUCT_BUNDLE_IDENTIFIER = "com.leanplum.Leanplum-tvOS-SDK-Example";
10781078
PRODUCT_NAME = "$(TARGET_NAME)";
1079-
SDKROOT = appletvos;
1080-
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
1079+
SDKROOT = appletvos9.2;
10811080
TARGETED_DEVICE_FAMILY = 3;
10821081
TVOS_DEPLOYMENT_TARGET = 9.2;
10831082
};
@@ -1100,8 +1099,7 @@
11001099
MTL_ENABLE_DEBUG_INFO = NO;
11011100
PRODUCT_BUNDLE_IDENTIFIER = "com.leanplum.Leanplum-tvOS-SDK-Example";
11021101
PRODUCT_NAME = "$(TARGET_NAME)";
1103-
SDKROOT = appletvos;
1104-
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
1102+
SDKROOT = appletvos9.2;
11051103
TARGETED_DEVICE_FAMILY = 3;
11061104
TVOS_DEPLOYMENT_TARGET = 9.2;
11071105
};

‎Example/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ end
1919
target 'Leanplum-tvOS-SDK_Example' do
2020
platform :tvos, '8.0'
2121

22-
pod 'Leanplum-tvOS-SDK-source', :path => '../'
22+
pod 'Leanplum-tvOS-SDK', :path => '../'
2323
end

‎Leanplum-iOS-SDK-source.podspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Analytics.
2222
s.requires_arc = true
2323
s.source = { :git => 'https://github.com/Leanplum/Leanplum-SDK-Internal.git', :tag => s.version.to_s }
2424
s.ios.deployment_target = '7.0'
25+
s.tvos.deployment_target = '7.0'
2526
s.frameworks = 'CFNetwork', 'Foundation', 'Security', 'SystemConfiguration', 'UIKit'
2627
s.weak_frameworks = 'AdSupport', 'StoreKit'
2728
s.library = 'sqlite3'

‎Leanplum-iOS-SDK.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
77
s.license = { :type => 'Commercial', :text => 'See https://www.leanplum.com/tos' }
88
s.author = { 'Leanplum' => '[email protected]' }
99
s.social_media_url = 'https://twitter.com/leanplum'
10-
s.ios.deployment_target = '8.0'
10+
s.platform = :ios, '8.0'
1111
s.requires_arc = true
1212
s.source = { :git => 'https://github.com/Leanplum/Leanplum-iOS-SDK.git', :tag => s.version.to_s }
1313
s.frameworks = 'CFNetwork', 'Foundation', 'Security', 'SystemConfiguration', 'UIKit'

‎Leanplum-tvOS-SDK-source.podspec‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎Leanplum-tvOS-SDK.podspec‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
Pod::Spec.new do |s|
22
s.name = 'Leanplum-tvOS-SDK'
3-
s.version = '2.0.2'
3+
s.version = '1.7.0'
44
s.summary = 'Mobile Marketing Platform. Integrated. ROI Engine.'
5-
s.description = 'Leanplum delivers meaningful engagement across channels through Automation, Personalization, A/B Testing, and Analytics.'
5+
s.description = 'Leanplum’s integrated solution delivers meaningful engagement across messaging and the in-app experience. We offer Messaging, Automation, App Editing, Personalization, A/B Testing, and Analytics.'
66
s.homepage = 'https://www.leanplum.com'
77
s.license = { :type => 'Commercial', :text => 'See https://www.leanplum.com/tos' }
88
s.author = { 'Leanplum' => '[email protected]' }
99
s.social_media_url = 'https://twitter.com/leanplum'
10-
s.tvos.deployment_target = '8.0'
10+
s.platform = :tvos, '8.0'
1111
s.requires_arc = true
12-
s.source = { :git => 'https://github.com/Leanplum/Leanplum-tvOS-SDK.git', :tag => s.version.to_s }
12+
s.source = { :git => 'https://github.com/Leanplum/Leanplum-iOS-SDK.git', :tag => s.version.to_s }
1313
s.frameworks = 'CFNetwork', 'Foundation', 'Security', 'SystemConfiguration', 'UIKit'
1414
s.weak_frameworks = 'AdSupport', 'StoreKit'
15-
s.library = 'sqlite3'
1615
s.xcconfig = { 'OTHER_LDFLAGS' => '-ObjC' }
1716
s.preserve_paths = 'LeanplumTV.framework'
1817
s.documentation_url = 'https://www.leanplum.com/docs#/docs'

0 commit comments

Comments
 (0)