Skip to content

Commit 3a88db4

Browse files
authored
Merge pull request #115 from morganchen12/dylibs
Change static library targets to dynamic framework targets
2 parents f6f7b34 + 76c4c2d commit 3a88db4

File tree

111 files changed

+2213
-1322
lines changed

Some content is hidden

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

111 files changed

+2213
-1322
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ xcode_workspace: FirebaseUI.xcworkspace
44
xcode_scheme: FirebaseUITests
55

66
script: xcodebuild -workspace FirebaseUI.xcworkspace
7-
-scheme FirebaseUITests
7+
-scheme FirebaseUI
88
-sdk iphonesimulator
9-
-destination 'platform=iOS Simulator,name=iPhone 6s'
10-
build
9+
-destination 'platform=iOS Simulator,name=iPhone 6s'
1110
test
12-
ONLY_ACTIVE_ARCH=NO
11+
ONLY_ACTIVE_ARCH=YES
1312
CODE_SIGN_IDENTITY=""
1413
CODE_SIGNING_REQUIRED=NO
1514

File renamed without changes.
File renamed without changes.

FirebaseUI/Auth/AuthUI/Source/FIRAuthPickerViewController.xib renamed to FirebaseAuthUI/FIRAuthPickerViewController.xib

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
33
<dependencies>
4+
<deployment identifier="iOS"/>
45
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
56
</dependencies>
67
<objects>
@@ -13,7 +14,7 @@
1314
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="6M3-cT-Snp">
1415
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
1516
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
16-
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
17+
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
1718
<connections>
1819
<outlet property="dataSource" destination="-1" id="FJp-im-BNA"/>
1920
<outlet property="delegate" destination="-1" id="HF2-jh-s3F"/>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

FirebaseUI/Auth/AuthUI/Source/FIRAuthUIBaseViewController.m renamed to FirebaseAuthUI/FIRAuthUIBaseViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ - (void)incrementActivity {
261261

262262
// Delay the display of acitivty indiactor for a short period of time.
263263
dispatch_after(dispatch_time(DISPATCH_TIME_NOW,
264-
(int64_t)(kActivityIndiactorAnimationDelay * NSEC_PER_SEC)),
264+
(int64_t)(kActivityIndiactorAnimationDelay * NSEC_PER_SEC)),
265265
dispatch_get_main_queue(), ^{
266266
if (_activityCount > 0) {
267267
[_activityIndicator startAnimating];
File renamed without changes.

0 commit comments

Comments
 (0)