Skip to content

Commit 0c04abf

Browse files
kellyroach-optimizelykellyroach-optimizely
authored
Kroach/oasis 1985 xcode91 (#191)
* Add Icon-1024.png * pod update * 'Pods project' 'Update to recommended settings' * pod update * OASIS-1985 [iOS] Upgrade to Xcode 9.1 Summary: Upgrade to Xcode 9.1 via adding 1024x1024 app store icon and pod update Add Icon-1024.png pod update 'Pods project' 'Update to recommended settings' pod update tvOS 10.2 --> 10.1 in local_travis.sh & rebuilt universal frameworks Test Plan: * sh ./Scripts/build_all.sh PASSED * sh ./Scripts/local_travis.sh PASSED * Manually test both demo apps from IDE PASSED * 2 Xcode 9.1 introduced yellow compiler warnings gone PASSED Reviewers: alda, josh.wang JIRA Issues: OASIS-1985 Differential Revision: https://phabricator.optimizely.com/D18160
1 parent 544febd commit 0c04abf

File tree

118 files changed

+4431
-4278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+4431
-4278
lines changed

‎OptimizelyDemoApp/OptimizelyDemoApp.xcodeproj/project.pbxproj

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,13 +499,16 @@
499499
files = (
500500
);
501501
inputPaths = (
502+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
503+
"${PODS_ROOT}/Manifest.lock",
502504
);
503505
name = "[CP] Check Pods Manifest.lock";
504506
outputPaths = (
507+
"$(DERIVED_FILE_DIR)/Pods-OptimizelyTVOSDemoApp-checkManifestLockResult.txt",
505508
);
506509
runOnlyForDeploymentPostprocessing = 0;
507510
shellPath = /bin/sh;
508-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
511+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
509512
showEnvVarsInLog = 0;
510513
};
511514
EA7000131E552EBD00590BEF /* [CP] Embed Pods Frameworks */ = {
@@ -544,13 +547,16 @@
544547
files = (
545548
);
546549
inputPaths = (
550+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
551+
"${PODS_ROOT}/Manifest.lock",
547552
);
548553
name = "[CP] Check Pods Manifest.lock";
549554
outputPaths = (
555+
"$(DERIVED_FILE_DIR)/Pods-OptimizelyiOSDemoApp-checkManifestLockResult.txt",
550556
);
551557
runOnlyForDeploymentPostprocessing = 0;
552558
shellPath = /bin/sh;
553-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
559+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
554560
showEnvVarsInLog = 0;
555561
};
556562
EA70FFF61E552E9E00590BEF /* [CP] Embed Pods Frameworks */ = {
@@ -559,9 +565,18 @@
559565
files = (
560566
);
561567
inputPaths = (
568+
"${SRCROOT}/../Pods/Target Support Files/Pods-OptimizelyiOSDemoApp/Pods-OptimizelyiOSDemoApp-frameworks.sh",
569+
"${BUILT_PRODUCTS_DIR}/Amplitude-iOS/Amplitude_iOS.framework",
570+
"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
571+
"${PODS_ROOT}/Localytics/Localytics-iOS-4.4.1/Localytics.framework",
572+
"${BUILT_PRODUCTS_DIR}/Mixpanel-swift/Mixpanel.framework",
562573
);
563574
name = "[CP] Embed Pods Frameworks";
564575
outputPaths = (
576+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Amplitude_iOS.framework",
577+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
578+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Localytics.framework",
579+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mixpanel.framework",
565580
);
566581
runOnlyForDeploymentPostprocessing = 0;
567582
shellPath = /bin/sh;

‎OptimizelyDemoApp/OptimizelyDemoApp.xcodeproj/xcshareddata/xcschemes/OptimizelyTVOSDemoApp.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎OptimizelyDemoApp/OptimizelyDemoApp.xcodeproj/xcshareddata/xcschemes/OptimizelyiOSDemoApp.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎OptimizelyDemoApp/OptimizelyiOSDemoApp/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,12 @@
143143
"idiom" : "ipad",
144144
"filename" : "Icon-83.5@2x.png",
145145
"scale" : "2x"
146+
},
147+
{
148+
"size" : "1024x1024",
149+
"idiom" : "ios-marketing",
150+
"filename" : "Icon-1024.png",
151+
"scale" : "1x"
146152
}
147153
],
148154
"info" : {

‎OptimizelyDemoApp/OptimizelyiOSDemoApp/Assets.xcassets/AppIcon.appiconset/Icon-1024.png

267 KB
Loading

‎OptimizelySDKCore/OptimizelySDKCore.xcodeproj/project.pbxproj

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,9 +1595,14 @@
15951595
files = (
15961596
);
15971597
inputPaths = (
1598+
"${SRCROOT}/../Pods/Target Support Files/Pods-OptimizelySDKCoreiOSTests/Pods-OptimizelySDKCoreiOSTests-frameworks.sh",
1599+
"${BUILT_PRODUCTS_DIR}/OCMock-iOS/OCMock.framework",
1600+
"${BUILT_PRODUCTS_DIR}/OHHTTPStubs-iOS/OHHTTPStubs.framework",
15981601
);
15991602
name = "[CP] Embed Pods Frameworks";
16001603
outputPaths = (
1604+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework",
1605+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OHHTTPStubs.framework",
16011606
);
16021607
runOnlyForDeploymentPostprocessing = 0;
16031608
shellPath = /bin/sh;
@@ -1610,13 +1615,16 @@
16101615
files = (
16111616
);
16121617
inputPaths = (
1618+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
1619+
"${PODS_ROOT}/Manifest.lock",
16131620
);
16141621
name = "[CP] Check Pods Manifest.lock";
16151622
outputPaths = (
1623+
"$(DERIVED_FILE_DIR)/Pods-OptimizelySDKCoreiOSTests-checkManifestLockResult.txt",
16161624
);
16171625
runOnlyForDeploymentPostprocessing = 0;
16181626
shellPath = /bin/sh;
1619-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
1627+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
16201628
showEnvVarsInLog = 0;
16211629
};
16221630
38A610DE7FA3981A6C09C0B1 /* [CP] Copy Pods Resources */ = {
@@ -1640,13 +1648,16 @@
16401648
files = (
16411649
);
16421650
inputPaths = (
1651+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
1652+
"${PODS_ROOT}/Manifest.lock",
16431653
);
16441654
name = "[CP] Check Pods Manifest.lock";
16451655
outputPaths = (
1656+
"$(DERIVED_FILE_DIR)/Pods-OptimizelySDKCoreTVOSTests-checkManifestLockResult.txt",
16461657
);
16471658
runOnlyForDeploymentPostprocessing = 0;
16481659
shellPath = /bin/sh;
1649-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
1660+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
16501661
showEnvVarsInLog = 0;
16511662
};
16521663
8857BE90A44CFBEDA6B9CD96 /* [CP] Copy Pods Resources */ = {
@@ -1670,9 +1681,14 @@
16701681
files = (
16711682
);
16721683
inputPaths = (
1684+
"${SRCROOT}/../Pods/Target Support Files/Pods-OptimizelySDKCoreTVOSTests/Pods-OptimizelySDKCoreTVOSTests-frameworks.sh",
1685+
"${BUILT_PRODUCTS_DIR}/OCMock-tvOS/OCMock.framework",
1686+
"${BUILT_PRODUCTS_DIR}/OHHTTPStubs-tvOS/OHHTTPStubs.framework",
16731687
);
16741688
name = "[CP] Embed Pods Frameworks";
16751689
outputPaths = (
1690+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework",
1691+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OHHTTPStubs.framework",
16761692
);
16771693
runOnlyForDeploymentPostprocessing = 0;
16781694
shellPath = /bin/sh;

‎OptimizelySDKCore/OptimizelySDKCore.xcodeproj/xcshareddata/xcschemes/OptimizelySDKCoreTVOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎OptimizelySDKCore/OptimizelySDKCore.xcodeproj/xcshareddata/xcschemes/OptimizelySDKCoreiOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager.xcodeproj/project.pbxproj

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,9 +610,14 @@
610610
files = (
611611
);
612612
inputPaths = (
613+
"${SRCROOT}/../Pods/Target Support Files/Pods-OptimizelySDKDatafileManageriOSTests/Pods-OptimizelySDKDatafileManageriOSTests-frameworks.sh",
614+
"${BUILT_PRODUCTS_DIR}/OCMock-iOS/OCMock.framework",
615+
"${BUILT_PRODUCTS_DIR}/OHHTTPStubs-iOS/OHHTTPStubs.framework",
613616
);
614617
name = "[CP] Embed Pods Frameworks";
615618
outputPaths = (
619+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework",
620+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OHHTTPStubs.framework",
616621
);
617622
runOnlyForDeploymentPostprocessing = 0;
618623
shellPath = /bin/sh;
@@ -625,9 +630,14 @@
625630
files = (
626631
);
627632
inputPaths = (
633+
"${SRCROOT}/../Pods/Target Support Files/Pods-OptimizelySDKDatafileManagerTVOSTests/Pods-OptimizelySDKDatafileManagerTVOSTests-frameworks.sh",
634+
"${BUILT_PRODUCTS_DIR}/OCMock-tvOS/OCMock.framework",
635+
"${BUILT_PRODUCTS_DIR}/OHHTTPStubs-tvOS/OHHTTPStubs.framework",
628636
);
629637
name = "[CP] Embed Pods Frameworks";
630638
outputPaths = (
639+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework",
640+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OHHTTPStubs.framework",
631641
);
632642
runOnlyForDeploymentPostprocessing = 0;
633643
shellPath = /bin/sh;
@@ -655,13 +665,16 @@
655665
files = (
656666
);
657667
inputPaths = (
668+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
669+
"${PODS_ROOT}/Manifest.lock",
658670
);
659671
name = "[CP] Check Pods Manifest.lock";
660672
outputPaths = (
673+
"$(DERIVED_FILE_DIR)/Pods-OptimizelySDKDatafileManageriOSTests-checkManifestLockResult.txt",
661674
);
662675
runOnlyForDeploymentPostprocessing = 0;
663676
shellPath = /bin/sh;
664-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
677+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
665678
showEnvVarsInLog = 0;
666679
};
667680
BB42F74DD1F94B66458EC143 /* [CP] Copy Pods Resources */ = {
@@ -685,13 +698,16 @@
685698
files = (
686699
);
687700
inputPaths = (
701+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
702+
"${PODS_ROOT}/Manifest.lock",
688703
);
689704
name = "[CP] Check Pods Manifest.lock";
690705
outputPaths = (
706+
"$(DERIVED_FILE_DIR)/Pods-OptimizelySDKDatafileManagerTVOSTests-checkManifestLockResult.txt",
691707
);
692708
runOnlyForDeploymentPostprocessing = 0;
693709
shellPath = /bin/sh;
694-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
710+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
695711
showEnvVarsInLog = 0;
696712
};
697713
/* End PBXShellScriptBuildPhase section */

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager.xcodeproj/xcshareddata/xcschemes/OptimizelySDKDatafileManagerTVOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)