Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

[Carthage] fix travis build error #1804

Merged
merged 11 commits into from
Jun 23, 2016
Merged

[Carthage] fix travis build error #1804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d96beb2
Merge remote-tracking branch 'facebook/master'
hannahmbanana Jun 17, 2016
08349b6
Merge remote-tracking branch 'facebook/master'
hannahmbanana Jun 17, 2016
e013515
Merge remote-tracking branch 'facebook/master'
hannahmbanana Jun 18, 2016
e15fa0d
Merge remote-tracking branch 'facebook/master'
hannahmbanana Jun 22, 2016
e86250a
[Carthage] Add cartfile, update example
hannahmbanana Jun 22, 2016
2a3bbf8
[Carthage] fix travis build issue
hannahmbanana Jun 23, 2016
4a2d9f0
Merge remote-tracking branch 'facebook/master' into carthage
hannahmbanana Jun 23, 2016
d8a81e3
[Carthage] fix cartfile for travis build error
hannahmbanana Jun 23, 2016
aaf29a0
Merge remote-tracking branch 'facebook/master' into carthage
hannahmbanana Jun 23, 2016
e59ec6a
Merge remote-tracking branch 'origin/carthage' into carthage
hannahmbanana Jun 23, 2016
2342348
capitalization fix
hannahmbanana Jun 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/CarthageBuildTest/Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
git "file:///Users/scottg/code/AsyncDisplayKit" "master"
github "facebook/AsyncDisplayKit" "master"
6 changes: 3 additions & 3 deletions examples/CarthageBuildTest/CarthageExample/Base.lproj/LaunchScreen.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand All @@ -15,7 +16,6 @@
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
</viewController>
Expand Down
7 changes: 4 additions & 3 deletions examples/CarthageBuildTest/CarthageExample/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
<viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
Expand Down