Skip to content

Commit 6cb3bd7

Browse files
kellyroach-optimizelykellyroach-optimizely
authored
Kroach/oasis 1567 thirdparty (#170)
* Update Podfile * pod update + Localytics -> 4.4.1 * FMDB and JSONModel files lose Pod status and go into OptimizelySDKCore and OptimizelySDKShared * Fix 'fatal: no submodule mapping found in .gitmodules for path' errors * Fix 2 OptimizelyiOSDemoApp linker warnings * Update README.md * Add empty FMDBTests target to OptimizelySDKShared project. * Add tests to FMDBTests target. * Add 'Modifications to FMDB by Optimizely' copyrights. * Add 'Modifications to JSONModel by Optimizely' copyrights. * Improved FMDBTempDBTests.m and testing for 2 xcscheme's . * Add OptimizelySDKUserProfileServiceTVOS as target dependency to OptimizelySDKTVOS . * Remove FMDB and JSONModel dependencies from podspec's. * Massive FMDB --> OPDB rename. * Edit OPDB README.md . * Massive JSONModel --> OPJMModel rename. * Edit OPJMModel README.md . * Rebuild the 2 universal frameworks. * Delete unused deprecated OPJMModelNetworking files. * Drop OPDBDatabasePool . * Drop OPDBDatabaseAdditions . * OPDBTests empty InfoPlist.strings --> outer space * FMDBTests-Prefix.pch --> outer space * Add OPJMModeliOSTests * Rename directory OPJMModeliOSTests --> OPJMModelTests * Add OPJMModelTVOSTests * Improve visibility of dependencies' tests and 2 other test lint items * OPJM and OPDB headers need to be 'Public' * Make OPTLYDecisionService.h be 'Public' in 2 OptimizelySDKCore target 'Build Phases' * Regenerated unexported_symbols.txt * OASIS-1567 and OASIS-1568 Remove dependency on FMDB and JSONModel Summary: Remove dependency on FMDB and JSONModel Update Podfile pod update + Localytics -> 4.4.1 FMDB and JSONModel files lose Pod status and go into OptimizelySDKCore and OptimizelySDKShared Fix 'fatal: no submodule mapping found in .gitmodules for path' errors Fix 2 OptimizelyiOSDemoApp linker warnings Update README.md Add empty FMDBTests target to OptimizelySDKShared project. Add tests to FMDBTests target. Add 'Modifications to FMDB by Optimizely' copyrights. Add 'Modifications to JSONModel by Optimizely' copyrights. Improved FMDBTempDBTests.m and testing for 2 xcscheme's . Add OptimizelySDKUserProfileServiceTVOS as target dependency to OptimizelySDKTVOS . Remove FMDB and JSONModel dependencies from podspec's. Massive FMDB --> OPDB rename. Edit OPDB README.md . Massive JSONModel --> OPJMModel rename. Edit OPJMModel README.md . Rebuild the 2 universal frameworks. Delete unused deprecated OPJMModelNetworking files. Drop OPDBDatabasePool . Drop OPDBDatabaseAdditions . OPDBTests empty InfoPlist.strings --> outer space FMDBTests-Prefix.pch --> outer space Add OPJMModeliOSTests Rename directory OPJMModeliOSTests --> OPJMModelTests Add OPJMModelTVOSTests Improve visibility of dependencies' tests and 2 other test lint items OPJM and OPDB headers need to be 'Public' Make OPTLYDecisionService.h be 'Public' in 2 OptimizelySDKCore target 'Build Phases' Regenerated unexported_symbols.txt Rebuild 2 universal frameworks Test Plan: * 8 iOS test suites PASSED * OptimizelySDKiOSUniversalTests PASSED * OptimizelyiOSDemoApp PASSED * 7 tvOS test suites PASSED * OptimizelySDKTVOSUniversalTests PASSED * OptimizelyTVOSDemoApp PASSED * OptimizelyiOSDemoApp / "Generic iOS Device" / Team = "Kelly Roach" / Product > Archive PASSED Validate... is FLAKEY (unsure) * OptimizelySDKiOS Product > Analyze Build succeeded / No issues PASSED * Above includes OPDBTests and OPJMModeliOSTests Reviewers: alda JIRA Issues: OASIS-1567, OASIS-1568 Differential Revision: https://phabricator.optimizely.com/D17266 * 1.1.9 CHANGELOG.md * Reinstall Localytics (4.4.1) * OPDB --> OPTLYFMDB * OPJM --> OPTLYJSON * Add Scripts Xcode Project Navigator group to workspace for easy access * Update unexported_symbols.awk * Make *.md, LICENSE, and Podfile visible for easy access in workspace * Remove Podfile targets which no longer depend on pods * pod install * Update build_all.sh * Make 'Oops' text view in 2 demo app *.storyboard's be un-Editable * Change 'Deployment Target' of 3 new tests to iOS 8.0 / tvOS 9.0 * 4 OPTLYJSONModelTests methods are effectively NOP'ed out for iOS <9.0 * Revert "4 OPTLYJSONModelTests methods are effectively NOP'ed out for iOS <9.0" This reverts commit 1f828dc. * Change 8.4 to 9.0 in local_travis.sh * Update README.md with use_frameworks * 'iPad Retina' --> 'iPad Air' in local_travis.sh
1 parent aae8752 commit 6cb3bd7

File tree

800 files changed

+21355
-33577
lines changed

Some content is hidden

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

800 files changed

+21355
-33577
lines changed

‎OptimizelyDemoApp/OptimizelyDemoApp.xcodeproj/project.pbxproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
EA299EEC1E55313B00931399 /* OPTLYVariationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE51E55313B00931399 /* OPTLYVariationViewController.swift */; };
4343
EA299EED1E55313B00931399 /* OPTLYVariationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA299EE51E55313B00931399 /* OPTLYVariationViewController.swift */; };
4444
EA299EEF1E55316300931399 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA299EEE1E55316300931399 /* Assets.xcassets */; };
45-
EA299F081E55335300931399 /* Pods_OptimizelySDKiOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA299F071E55335300931399 /* Pods_OptimizelySDKiOS.framework */; };
4645
EA299F0A1E55336700931399 /* OptimizelySDKTVOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA70FFBD1E550EAC00590BEF /* OptimizelySDKTVOS.framework */; };
4746
EA299F0B1E55336700931399 /* OptimizelySDKTVOS.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EA70FFBD1E550EAC00590BEF /* OptimizelySDKTVOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4847
EA299F0F1E55336D00931399 /* Pods_OptimizelyTVOSDemoApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA299F0E1E55336D00931399 /* Pods_OptimizelyTVOSDemoApp.framework */; };
@@ -213,7 +212,6 @@
213212
EA1E4B661E65074E00BDDABD /* OptimizelySDKiOS.framework in Frameworks */,
214213
EA1E4B591E65065500BDDABD /* OptimizelySDKShared.framework in Frameworks */,
215214
EA1E4B5B1E65065500BDDABD /* OptimizelySDKCore.framework in Frameworks */,
216-
EA299F081E55335300931399 /* Pods_OptimizelySDKiOS.framework in Frameworks */,
217215
7AAAE45EFBB4C7742E4D93B7 /* Pods_OptimizelyiOSDemoApp.framework in Frameworks */,
218216
EA1E4B5D1E65065500BDDABD /* OptimizelySDKEventDispatcher.framework in Frameworks */,
219217
EA1E4B5F1E65065500BDDABD /* OptimizelySDKDatafileManager.framework in Frameworks */,
@@ -501,7 +499,7 @@
501499
);
502500
runOnlyForDeploymentPostprocessing = 0;
503501
shellPath = /bin/sh;
504-
shellScript = "diff \"${PODS_ROOT}/../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";
502+
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";
505503
showEnvVarsInLog = 0;
506504
};
507505
EA7000131E552EBD00590BEF /* [CP] Embed Pods Frameworks */ = {
@@ -546,7 +544,7 @@
546544
);
547545
runOnlyForDeploymentPostprocessing = 0;
548546
shellPath = /bin/sh;
549-
shellScript = "diff \"${PODS_ROOT}/../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";
547+
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";
550548
showEnvVarsInLog = 0;
551549
};
552550
EA70FFF61E552E9E00590BEF /* [CP] Embed Pods Frameworks */ = {
@@ -811,14 +809,12 @@
811809
FRAMEWORK_SEARCH_PATHS = (
812810
"$(inherited)",
813811
"\"$PODS_CONFIGURATION_BUILD_DIR/Amplitude-iOS\"",
814-
"\"$PODS_CONFIGURATION_BUILD_DIR/FMDB\"",
815812
"\"$PODS_CONFIGURATION_BUILD_DIR/GoogleToolboxForMac\"",
816-
"\"$PODS_CONFIGURATION_BUILD_DIR/JSONModel-iOS\"",
817813
"\"${PODS_ROOT}/FirebaseAnalytics/Frameworks\"",
818814
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
819815
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
820816
"\"${PODS_ROOT}/Google/Frameworks\"",
821-
"\"${PODS_ROOT}/Localytics/Localytics-iOS-4.3.2\"",
817+
"\"${PODS_ROOT}/Localytics/Localytics-iOS-4.4.1\"",
822818
);
823819
INFOPLIST_FILE = "$(SRCROOT)/OptimizelyiOSDemoApp/OptimizelyiOSDemoApp-Info.plist";
824820
IPHONEOS_DEPLOYMENT_TARGET = 9.0;

‎OptimizelyDemoApp/OptimizelyTVOSDemoApp/Base.lproj/tvOSMain.storyboard

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="11762" systemVersion="15G1212" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
33
<device id="appleTV" orientation="landscape">
44
<adaptation id="light"/>
55
</device>
66
<dependencies>
7-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
7+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
88
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1010
</dependencies>
@@ -61,7 +61,7 @@
6161
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" restorationIdentifier="FailureImageView" image="background_error" translatesAutoresizingMaskIntoConstraints="NO" id="QKm-lz-bUE">
6262
<rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
6363
</imageView>
64-
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="Oops! Let's try this again." textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="iKU-z4-P8h">
64+
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="Oops! Let's try this again." textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="iKU-z4-P8h">
6565
<rect key="frame" x="569" y="489" width="782" height="102"/>
6666
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
6767
<constraints>

‎OptimizelyDemoApp/OptimizelyiOSDemoApp/Base.lproj/iOSMain.storyboard

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1212" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
7-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
7+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>
1010
<customFonts key="customFonts">
@@ -60,8 +60,8 @@
6060
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" restorationIdentifier="FailureImageView" image="background_error" translatesAutoresizingMaskIntoConstraints="NO" id="QKm-lz-bUE">
6161
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
6262
</imageView>
63-
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" text="Oops! Let's try this again." textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="iKU-z4-P8h">
64-
<rect key="frame" x="82.5" y="315" width="211" height="58"/>
63+
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" editable="NO" text="Oops! Let's try this again." textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="iKU-z4-P8h">
64+
<rect key="frame" x="82" y="315" width="211" height="58"/>
6565
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
6666
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
6767
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -98,21 +98,21 @@
9898
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
9999
</imageView>
100100
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="A" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GuL-M1-dn2">
101-
<rect key="frame" x="123.5" y="253.5" width="128" height="125"/>
101+
<rect key="frame" x="123" y="253" width="128" height="125"/>
102102
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
103103
<fontDescription key="fontDescription" name="ProximaNova-Regular" family="Proxima Nova" pointSize="144"/>
104104
<nil key="textColor"/>
105105
<nil key="highlightedColor"/>
106106
</label>
107107
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="VARIATION" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8CQ-8i-O97">
108-
<rect key="frame" x="126.5" y="371" width="123" height="21"/>
108+
<rect key="frame" x="126" y="371" width="123" height="21"/>
109109
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
110110
<fontDescription key="fontDescription" name="ProximaNova-Regular" family="Proxima Nova" pointSize="24"/>
111111
<nil key="textColor"/>
112112
<nil key="highlightedColor"/>
113113
</label>
114114
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eHj-DU-rky">
115-
<rect key="frame" x="106.5" y="424.5" width="162" height="36"/>
115+
<rect key="frame" x="106" y="424" width="162" height="36"/>
116116
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
117117
<color key="backgroundColor" red="0.97647058819999999" green="0.039215686270000001" blue="0.054901960780000002" alpha="1" colorSpace="calibratedRGB"/>
118118
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="14"/>
@@ -160,7 +160,7 @@
160160
<rect key="frame" x="1" y="0.0" width="375" height="667"/>
161161
</imageView>
162162
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qje-MN-IfM">
163-
<rect key="frame" x="152.5" y="493.5" width="70" height="36"/>
163+
<rect key="frame" x="152" y="493" width="70" height="36"/>
164164
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
165165
<color key="backgroundColor" red="0.97647058819999999" green="0.039215686270000001" blue="0.054901960780000002" alpha="1" colorSpace="calibratedRGB"/>
166166
<fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="14"/>
@@ -172,7 +172,7 @@
172172
</connections>
173173
</button>
174174
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" editable="NO" text="Conversion event recorded to Optimizely." textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CRh-TJ-NCw">
175-
<rect key="frame" x="97.5" y="295" width="181" height="156"/>
175+
<rect key="frame" x="97" y="295" width="181" height="156"/>
176176
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
177177
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
178178
<color key="textColor" red="0.019607843137254902" green="0.16862745098039217" blue="0.25490196078431371" alpha="1" colorSpace="calibratedRGB"/>

‎OptimizelySDK.xcworkspace/contents.xcworkspacedata

Lines changed: 60 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OptimizelySDKCore.podspec

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,4 @@ Pod::Spec.new do |s|
1818
s.framework = "Foundation"
1919
s.requires_arc = true
2020
s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "OPTIMIZELY_SDK_CORE_VERSION=@\\\"#{s.version}\\\"" }
21-
s.subspec "JSONModel" do |ss|
22-
ss.dependency 'JSONModel', '= 1.3.0'
23-
ss.xcconfig = { "FRAMEWORK_SEARCH_PATHS" => "$(PODS_ROOT)/JSONModel" }
24-
end
25-
2621
end

‎OptimizelySDKShared/Pods/JSONModel/LICENSE renamed to ‎OptimizelySDKCore/OPTLYJSONModel/LICENSE

File renamed without changes.

0 commit comments

Comments
 (0)