Skip to content

Commit

Permalink
Rearranges project structure to be compatible with CocoaPods and Cart…
Browse files Browse the repository at this point in the history
…hage.
  • Loading branch information
kzaher committed Sep 18, 2016
1 parent 010b930 commit 19509a2
Show file tree
Hide file tree
Showing 48 changed files with 771 additions and 485 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -34,6 +34,7 @@ xcuserdata
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
Pods/
RxAlamofire/Pods/

# Carthage
#
Expand Down
2 changes: 0 additions & 2 deletions RxAlamofire-iOS/Info.plist
Expand Up @@ -16,8 +16,6 @@
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
Expand Up @@ -2,8 +2,8 @@
// RxAlamofire-iOS.h
// RxAlamofire-iOS
//
// Created by Krunoslav Zaher on 10/28/15.
// Copyright © 2015 Bonto.ch. All rights reserved.
// Created by Krunoslav Zaher on 9/18/16.
// Copyright © 2016 RxSwiftCommunity. All rights reserved.
//

#import <UIKit/UIKit.h>
Expand Down
2 changes: 0 additions & 2 deletions RxAlamofire-tvOS/Info.plist
Expand Up @@ -16,8 +16,6 @@
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
Expand Up @@ -2,8 +2,8 @@
// RxAlamofire-tvOS.h
// RxAlamofire-tvOS
//
// Created by David Bonnet on 19/01/2016.
// Copyright © 2016 Bonto.ch. All rights reserved.
// Created by Krunoslav Zaher on 9/18/16.
// Copyright © 2016 RxSwiftCommunity. All rights reserved.
//

#import <UIKit/UIKit.h>
Expand Down
101 changes: 0 additions & 101 deletions RxAlamofire.xcodeproj/xcshareddata/xcschemes/RxAlamofire.xcscheme

This file was deleted.

26 changes: 0 additions & 26 deletions RxAlamofire/Carthage-Info.plist

This file was deleted.

2 changes: 1 addition & 1 deletion Podfile → RxAlamofire/Podfile
Expand Up @@ -26,7 +26,7 @@ target 'RxAlamofireTests' do
#common
pod 'OHHTTPStubs', :git => 'https://github.com/AliSoftware/OHHTTPStubs.git', :branch => 'swift-3.0'
pod 'OHHTTPStubs/Swift', :git => 'https://github.com/AliSoftware/OHHTTPStubs.git', :branch => 'swift-3.0'
pod 'RxBlocking', :git => 'https://github.com/ReactiveX/RxSwift.git', :tag => '3.0.0.alpha.1'
pod 'RxBlocking', '~> 3.0.0-beta.1'
end

target 'RxAlamofire-tvOS' do
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" initialViewController="i4o-5g-osw">
<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="i4o-5g-osw">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Tab Bar Controller-->
Expand All @@ -11,19 +12,20 @@
<tabBar key="tabBar" contentMode="scaleToFill" id="01m-sk-FrF">
<rect key="frame" x="0.0" y="0.0" width="1920" height="0.0"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</tabBar>
<connections>
<segue destination="xNx-kC-6nC" kind="relationship" relationship="viewControllers" id="AAJ-6I-eKC"/>
</connections>
</tabBarController>
<placeholder placeholderIdentifier="IBFirstResponder" id="v7Z-N4-YOD" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-536" y="144"/>
</scene>
<!--Basic-->
<scene sceneID="CwH-f5-0nz">
<objects>
<viewController id="xNx-kC-6nC" customClass="MasterViewController" customModule="RxAlamofiretvOSExample" customModuleProvider="target" sceneMemberID="viewController">
<viewController id="xNx-kC-6nC" customClass="MasterViewController" customModule="RxAlamofire_tvOS_Example" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="mmN-DM-CRu"/>
<viewControllerLayoutGuide type="bottom" id="YwZ-N6-fEF"/>
Expand All @@ -33,49 +35,58 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="EUR" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ydw-Ew-Cgx">
<rect key="frame" x="500" y="233" width="74" height="25"/>
<frame key="frameInset" minX="500" minY="233" width="74" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="30"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="from" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="eHr-0l-de1">
<rect key="frame" x="500" y="277" width="422" height="46"/>
<frame key="frameInset" minX="500" minY="277" width="422" height="46"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
<textInputTraits key="textInputTraits"/>
<connections>
<outlet property="delegate" destination="xNx-kC-6nC" id="r97-c9-TTs"/>
</connections>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="USD" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yxj-pp-Dht">
<rect key="frame" x="999" y="233" width="74" height="36"/>
<frame key="frameInset" minX="999" minY="233" width="74" height="36"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="30"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="to" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HFA-7V-U1k">
<rect key="frame" x="999" y="277" width="422" height="46"/>
<frame key="frameInset" minX="999" minY="277" width="422" height="46"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
<textInputTraits key="textInputTraits"/>
<connections>
<outlet property="delegate" destination="xNx-kC-6nC" id="pQr-S1-sgB"/>
</connections>
</textField>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dJS-au-0Tu">
<rect key="frame" x="837" y="363" width="247" height="86"/>
<frame key="frameInset" minX="837" minY="363" width="247" height="86"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
<state key="normal" title="Convert"/>
<connections>
<action selector="convertPressed:" destination="xNx-kC-6nC" eventType="primaryActionTriggered" id="zIl-Jm-Y7u"/>
</connections>
</button>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="scaleToFill" fixedFrame="YES" editable="NO" text="NO DATA!" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zdx-z4-fYW">
<rect key="frame" x="500" y="516" width="921" height="400"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<frame key="frameInset" minX="500" minY="516" width="921" height="400"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ngS-eH-1t3">
<rect key="frame" x="775" y="945" width="372" height="86"/>
<frame key="frameInset" minX="775" minY="945" width="372" height="86"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
<state key="normal" title="Get Dummy Data"/>
<connections>
Expand All @@ -95,7 +106,12 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="8ar-95-7dP" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="157" y="-743"/>
<point key="canvasLocation" x="1881" y="71"/>
</scene>
</scenes>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<nil key="statusBar"/>
<simulatedOrientationMetrics key="orientation" orientation="landscapeRight"/>
<simulatedScreenMetrics key="destination"/>
</simulatedMetricsContainer>
</document>
File renamed without changes.

0 comments on commit 19509a2

Please sign in to comment.