Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattdonnelly
mattdonnelly committed Jun 28, 2014
2 parents 929573f + 7ad47bd commit 5241c9e
Show file tree
Hide file tree
Showing 34 changed files with 39 additions and 127 deletions.
82 changes: 27 additions & 55 deletions Swifter.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
8B5EFF08195F064400B354F9 /* AuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B5EFF04195F064400B354F9 /* AuthViewController.swift */; };
8B5EFF09195F064400B354F9 /* TweetsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B5EFF05195F064400B354F9 /* TweetsViewController.swift */; };
8B5EFF0A195F064400B354F9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8B5EFF06195F064400B354F9 /* Main.storyboard */; };
8B9F50F41944A5AB00894629 /* SwifteriOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B9F50F31944A5AB00894629 /* SwifteriOS.h */; settings = {ATTRIBUTES = (Public, ); }; };
8B9F51181944A61D00894629 /* SwifterMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B9F51171944A61D00894629 /* SwifterMac.h */; settings = {ATTRIBUTES = (Public, ); }; };
8B5EFF15195F09F600B354F9 /* Swifter.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B5EFF14195F09F600B354F9 /* Swifter.h */; settings = {ATTRIBUTES = (Public, ); }; };
8B5EFF16195F09F600B354F9 /* Swifter.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B5EFF14195F09F600B354F9 /* Swifter.h */; settings = {ATTRIBUTES = (Public, ); }; };
8B9F514D1944A8DC00894629 /* Dictionary+Swifter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B9F51471944A8DC00894629 /* Dictionary+Swifter.swift */; };
8B9F514E1944A8DC00894629 /* Dictionary+Swifter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B9F51471944A8DC00894629 /* Dictionary+Swifter.swift */; };
8B9F51531944A8DC00894629 /* String+Swifter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B9F514A1944A8DC00894629 /* String+Swifter.swift */; };
Expand Down Expand Up @@ -140,12 +140,10 @@
8B5EFF04195F064400B354F9 /* AuthViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthViewController.swift; sourceTree = "<group>"; };
8B5EFF05195F064400B354F9 /* TweetsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TweetsViewController.swift; sourceTree = "<group>"; };
8B5EFF06195F064400B354F9 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
8B5EFF11195F087000B354F9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8B5EFF14195F09F600B354F9 /* Swifter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Swifter.h; sourceTree = "<group>"; };
8B9F50EE1944A5AB00894629 /* SwifteriOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwifteriOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8B9F50F21944A5AB00894629 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8B9F50F31944A5AB00894629 /* SwifteriOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwifteriOS.h; sourceTree = "<group>"; };
8B9F51131944A61D00894629 /* SwifterMac.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwifterMac.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8B9F51161944A61D00894629 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8B9F51171944A61D00894629 /* SwifterMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwifterMac.h; sourceTree = "<group>"; };
8B9F51471944A8DC00894629 /* Dictionary+Swifter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Dictionary+Swifter.swift"; sourceTree = "<group>"; };
8B9F514A1944A8DC00894629 /* String+Swifter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Swifter.swift"; sourceTree = "<group>"; };
8B9F514B1944A8DC00894629 /* Swifter-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Swifter-Bridging-Header.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -251,14 +249,20 @@
name = "Supporting Files";
sourceTree = "<group>";
};
8B5EFF10195F085B00B354F9 /* Supporting Files */ = {
isa = PBXGroup;
children = (
8B5EFF11195F087000B354F9 /* Info.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
8B9F50E41944A5AB00894629 = {
isa = PBXGroup;
children = (
8B9F51461944A8DC00894629 /* Swifter */,
8B300C201944AA1A00993175 /* SwifterDemoiOS */,
8B300C481944AECB00993175 /* SwifterDemoMac */,
8B9F51461944A8DC00894629 /* SwifterCommon */,
8B9F50F01944A5AB00894629 /* SwifteriOS */,
8B9F51141944A61D00894629 /* SwifterMac */,
8B9F50EF1944A5AB00894629 /* Products */,
);
sourceTree = "<group>";
Expand All @@ -275,43 +279,10 @@
name = Products;
sourceTree = "<group>";
};
8B9F50F01944A5AB00894629 /* SwifteriOS */ = {
isa = PBXGroup;
children = (
8B9F50F31944A5AB00894629 /* SwifteriOS.h */,
8B9F50F11944A5AB00894629 /* Supporting Files */,
);
path = SwifteriOS;
sourceTree = "<group>";
};
8B9F50F11944A5AB00894629 /* Supporting Files */ = {
isa = PBXGroup;
children = (
8B9F50F21944A5AB00894629 /* Info.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
8B9F51141944A61D00894629 /* SwifterMac */ = {
isa = PBXGroup;
children = (
8B9F51171944A61D00894629 /* SwifterMac.h */,
8B9F51151944A61D00894629 /* Supporting Files */,
);
path = SwifterMac;
sourceTree = "<group>";
};
8B9F51151944A61D00894629 /* Supporting Files */ = {
isa = PBXGroup;
children = (
8B9F51161944A61D00894629 /* Info.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
8B9F51461944A8DC00894629 /* SwifterCommon */ = {
8B9F51461944A8DC00894629 /* Swifter */ = {
isa = PBXGroup;
children = (
8B5EFF14195F09F600B354F9 /* Swifter.h */,
8B9F514B1944A8DC00894629 /* Swifter-Bridging-Header.h */,
8B9F514C1944A8DC00894629 /* Swifter.swift */,
8BF1D6871948C11E00E3AA64 /* SwifterCredential.swift */,
Expand All @@ -338,8 +309,9 @@
8B116AF0194601970019A4DC /* SwifterHTTPRequest.swift */,
8B33CA3E19587C6D00739FCB /* JSON.swift */,
8B9F51591944A8E100894629 /* Extensions */,
8B5EFF10195F085B00B354F9 /* Supporting Files */,
);
path = SwifterCommon;
path = Swifter;
sourceTree = "<group>";
};
8B9F51591944A8E100894629 /* Extensions */ = {
Expand All @@ -359,17 +331,17 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
8B9F50F41944A5AB00894629 /* SwifteriOS.h in Headers */,
8B9F51551944A8DC00894629 /* Swifter-Bridging-Header.h in Headers */,
8B5EFF15195F09F600B354F9 /* Swifter.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
8B9F51101944A61D00894629 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
8B9F51181944A61D00894629 /* SwifterMac.h in Headers */,
8B9F51561944A8DC00894629 /* Swifter-Bridging-Header.h in Headers */,
8B5EFF16195F09F600B354F9 /* Swifter.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -887,12 +859,12 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = SwifteriOS/Info.plist;
INFOPLIST_FILE = "$(SRCROOT)/Swifter/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OBJC_BRIDGING_HEADER = "SwifterCommon/Swifter-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "Swifter/Swifter-Bridging-Header.h";
};
name = Debug;
};
Expand All @@ -903,12 +875,12 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = SwifteriOS/Info.plist;
INFOPLIST_FILE = "$(SRCROOT)/Swifter/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OBJC_BRIDGING_HEADER = "SwifterCommon/Swifter-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "Swifter/Swifter-Bridging-Header.h";
};
name = Release;
};
Expand All @@ -925,15 +897,15 @@
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = SwifterMac/Info.plist;
INFOPLIST_FILE = "$(SRCROOT)/Swifter/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
METAL_ENABLE_DEBUG_INFO = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_OBJC_BRIDGING_HEADER = "SwifterCommon/Swifter-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "Swifter/Swifter-Bridging-Header.h";
};
name = Debug;
};
Expand All @@ -947,15 +919,15 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = SwifterMac/Info.plist;
INFOPLIST_FILE = "$(SRCROOT)/Swifter/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
METAL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_OBJC_BRIDGING_HEADER = "SwifterCommon/Swifter-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "Swifter/Swifter-Bridging-Header.h";
};
name = Release;
};
Expand Down
0 SwifterCommon/Dictionary+Swifter.swift → Swifter/Dictionary+Swifter.swift
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion SwifteriOS/Info.plist → Swifter/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${CURRENT_PROJECT_VERSION}</string>
<string>1.0</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
0 SwifterCommon/JSON.swift → Swifter/JSON.swift
View file
File renamed without changes.
0 SwifterCommon/NSURL+Swifter.swift → Swifter/NSURL+Swifter.swift
View file
File renamed without changes.
0 SwifterCommon/String+Swifter.swift → Swifter/String+Swifter.swift
View file
File renamed without changes.
0 SwifterCommon/Swifter-Bridging-Header.h → Swifter/Swifter-Bridging-Header.h
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions SwifteriOS/SwifteriOS.h → Swifter/Swifter.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// SwifteriOS.h
// SwifteriOS
// Swifter.h
// Swifter
//
// Copyright (c) 2014 Matt Donnelly.
//
Expand All @@ -25,6 +25,6 @@

#import <UIKit/UIKit.h>

FOUNDATION_EXPORT double SwifteriOSVersionNumber;
FOUNDATION_EXPORT double SwifterVersionNumber;

FOUNDATION_EXPORT const unsigned char SwifteriOSVersionString[];
FOUNDATION_EXPORT const unsigned char SwifterVersionString[];
6 changes: 0 additions & 6 deletions SwifterCommon/Swifter.swift → Swifter/Swifter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@
import Foundation
import Accounts

#if os(iOS)
import UIKit
#else
import AppKit
#endif

class Swifter {

typealias JSONSuccessHandler = (json: JSON, response: NSHTTPURLResponse) -> Void
Expand Down
0 SwifterCommon/SwifterAccountsClient.swift → Swifter/SwifterAccountsClient.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterAppOnlyClient.swift → Swifter/SwifterAppOnlyClient.swift
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions SwifterCommon/SwifterAuth.swift → Swifter/SwifterAuth.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@

import Foundation

#if os(iOS)
import UIKit
#else
import AppKit
#endif

extension Swifter {

typealias TokenSuccessHandler = (accessToken: SwifterCredential.OAuthAccessToken?, response: NSURLResponse) -> Void
Expand Down
0 SwifterCommon/SwifterClientProtocol.swift → Swifter/SwifterClientProtocol.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterCredential.swift → Swifter/SwifterCredential.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterFavorites.swift → Swifter/SwifterFavorites.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterFollowers.swift → Swifter/SwifterFollowers.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterHTTPRequest.swift → Swifter/SwifterHTTPRequest.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterHelp.swift → Swifter/SwifterHelp.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterLists.swift → Swifter/SwifterLists.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterMessages.swift → Swifter/SwifterMessages.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterOAuthClient.swift → Swifter/SwifterOAuthClient.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterPlaces.swift → Swifter/SwifterPlaces.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterSavedSearches.swift → Swifter/SwifterSavedSearches.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterSearch.swift → Swifter/SwifterSearch.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterSpam.swift → Swifter/SwifterSpam.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterStreaming.swift → Swifter/SwifterStreaming.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterSuggested.swift → Swifter/SwifterSuggested.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterTimelines.swift → Swifter/SwifterTimelines.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterTrends.swift → Swifter/SwifterTrends.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterTweets.swift → Swifter/SwifterTweets.swift
View file
File renamed without changes.
0 SwifterCommon/SwifterUsers.swift → Swifter/SwifterUsers.swift
View file
File renamed without changes.
3 changes: 1 addition & 2 deletions SwifterDemoiOS/AuthViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ class AuthViewController: UIViewController
// Successfully fetched timeline, so lets create and push the table view
let tweetsViewController = self.storyboard.instantiateViewControllerWithIdentifier("TweetsViewController") as TweetsViewController

if statuses
{
if statuses {
tweetsViewController.tweets = statuses!
self.presentViewController(tweetsViewController, animated: true, completion: nil)
}
Expand Down
28 changes: 0 additions & 28 deletions SwifterMac/Info.plist
View file

This file was deleted.

31 changes: 0 additions & 31 deletions SwifterMac/SwifterMac.h
View file

This file was deleted.

0 comments on commit 5241c9e

Please sign in to comment.