From 7ad47bdf934a08d0809a3b9cd2c3a1832d3f702a Mon Sep 17 00:00:00 2001 From: mattdonnelly Date: Sat, 28 Jun 2014 15:35:27 +0100 Subject: [PATCH] Updated project structure, removed redundant SwifteriOS and SwifterMac groups --- Swifter.xcodeproj/project.pbxproj | 82 ++++++------------- .../Dictionary+Swifter.swift | 0 {SwifteriOS => Swifter}/Info.plist | 2 +- {SwifterCommon => Swifter}/JSON.swift | 0 .../NSURL+Swifter.swift | 0 .../String+Swifter.swift | 0 .../Swifter-Bridging-Header.h | 0 SwifteriOS/SwifteriOS.h => Swifter/Swifter.h | 8 +- {SwifterCommon => Swifter}/Swifter.swift | 6 -- .../SwifterAccountsClient.swift | 0 .../SwifterAppOnlyClient.swift | 0 {SwifterCommon => Swifter}/SwifterAuth.swift | 6 ++ .../SwifterClientProtocol.swift | 0 .../SwifterCredential.swift | 0 .../SwifterFavorites.swift | 0 .../SwifterFollowers.swift | 0 .../SwifterHTTPRequest.swift | 0 {SwifterCommon => Swifter}/SwifterHelp.swift | 0 {SwifterCommon => Swifter}/SwifterLists.swift | 0 .../SwifterMessages.swift | 0 .../SwifterOAuthClient.swift | 0 .../SwifterPlaces.swift | 0 .../SwifterSavedSearches.swift | 0 .../SwifterSearch.swift | 0 {SwifterCommon => Swifter}/SwifterSpam.swift | 0 .../SwifterStreaming.swift | 0 .../SwifterSuggested.swift | 0 .../SwifterTimelines.swift | 0 .../SwifterTrends.swift | 0 .../SwifterTweets.swift | 0 {SwifterCommon => Swifter}/SwifterUsers.swift | 0 SwifterDemoiOS/AuthViewController.swift | 3 +- SwifterMac/Info.plist | 28 ------- SwifterMac/SwifterMac.h | 31 ------- 34 files changed, 39 insertions(+), 127 deletions(-) rename {SwifterCommon => Swifter}/Dictionary+Swifter.swift (100%) rename {SwifteriOS => Swifter}/Info.plist (94%) rename {SwifterCommon => Swifter}/JSON.swift (100%) rename {SwifterCommon => Swifter}/NSURL+Swifter.swift (100%) rename {SwifterCommon => Swifter}/String+Swifter.swift (100%) rename {SwifterCommon => Swifter}/Swifter-Bridging-Header.h (100%) rename SwifteriOS/SwifteriOS.h => Swifter/Swifter.h (88%) rename {SwifterCommon => Swifter}/Swifter.swift (99%) rename {SwifterCommon => Swifter}/SwifterAccountsClient.swift (100%) rename {SwifterCommon => Swifter}/SwifterAppOnlyClient.swift (100%) rename {SwifterCommon => Swifter}/SwifterAuth.swift (99%) rename {SwifterCommon => Swifter}/SwifterClientProtocol.swift (100%) rename {SwifterCommon => Swifter}/SwifterCredential.swift (100%) rename {SwifterCommon => Swifter}/SwifterFavorites.swift (100%) rename {SwifterCommon => Swifter}/SwifterFollowers.swift (100%) rename {SwifterCommon => Swifter}/SwifterHTTPRequest.swift (100%) rename {SwifterCommon => Swifter}/SwifterHelp.swift (100%) rename {SwifterCommon => Swifter}/SwifterLists.swift (100%) rename {SwifterCommon => Swifter}/SwifterMessages.swift (100%) rename {SwifterCommon => Swifter}/SwifterOAuthClient.swift (100%) rename {SwifterCommon => Swifter}/SwifterPlaces.swift (100%) rename {SwifterCommon => Swifter}/SwifterSavedSearches.swift (100%) rename {SwifterCommon => Swifter}/SwifterSearch.swift (100%) rename {SwifterCommon => Swifter}/SwifterSpam.swift (100%) rename {SwifterCommon => Swifter}/SwifterStreaming.swift (100%) rename {SwifterCommon => Swifter}/SwifterSuggested.swift (100%) rename {SwifterCommon => Swifter}/SwifterTimelines.swift (100%) rename {SwifterCommon => Swifter}/SwifterTrends.swift (100%) rename {SwifterCommon => Swifter}/SwifterTweets.swift (100%) rename {SwifterCommon => Swifter}/SwifterUsers.swift (100%) delete mode 100644 SwifterMac/Info.plist delete mode 100644 SwifterMac/SwifterMac.h diff --git a/Swifter.xcodeproj/project.pbxproj b/Swifter.xcodeproj/project.pbxproj index 8f9465e2..cb21522b 100644 --- a/Swifter.xcodeproj/project.pbxproj +++ b/Swifter.xcodeproj/project.pbxproj @@ -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 */; }; @@ -140,12 +140,10 @@ 8B5EFF04195F064400B354F9 /* AuthViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthViewController.swift; sourceTree = ""; }; 8B5EFF05195F064400B354F9 /* TweetsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TweetsViewController.swift; sourceTree = ""; }; 8B5EFF06195F064400B354F9 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; + 8B5EFF11195F087000B354F9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 8B5EFF14195F09F600B354F9 /* Swifter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Swifter.h; sourceTree = ""; }; 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 = ""; }; - 8B9F50F31944A5AB00894629 /* SwifteriOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwifteriOS.h; sourceTree = ""; }; 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 = ""; }; - 8B9F51171944A61D00894629 /* SwifterMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwifterMac.h; sourceTree = ""; }; 8B9F51471944A8DC00894629 /* Dictionary+Swifter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Dictionary+Swifter.swift"; sourceTree = ""; }; 8B9F514A1944A8DC00894629 /* String+Swifter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Swifter.swift"; sourceTree = ""; }; 8B9F514B1944A8DC00894629 /* Swifter-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Swifter-Bridging-Header.h"; sourceTree = ""; }; @@ -251,14 +249,20 @@ name = "Supporting Files"; sourceTree = ""; }; + 8B5EFF10195F085B00B354F9 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 8B5EFF11195F087000B354F9 /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; 8B9F50E41944A5AB00894629 = { isa = PBXGroup; children = ( + 8B9F51461944A8DC00894629 /* Swifter */, 8B300C201944AA1A00993175 /* SwifterDemoiOS */, 8B300C481944AECB00993175 /* SwifterDemoMac */, - 8B9F51461944A8DC00894629 /* SwifterCommon */, - 8B9F50F01944A5AB00894629 /* SwifteriOS */, - 8B9F51141944A61D00894629 /* SwifterMac */, 8B9F50EF1944A5AB00894629 /* Products */, ); sourceTree = ""; @@ -275,43 +279,10 @@ name = Products; sourceTree = ""; }; - 8B9F50F01944A5AB00894629 /* SwifteriOS */ = { - isa = PBXGroup; - children = ( - 8B9F50F31944A5AB00894629 /* SwifteriOS.h */, - 8B9F50F11944A5AB00894629 /* Supporting Files */, - ); - path = SwifteriOS; - sourceTree = ""; - }; - 8B9F50F11944A5AB00894629 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 8B9F50F21944A5AB00894629 /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 8B9F51141944A61D00894629 /* SwifterMac */ = { - isa = PBXGroup; - children = ( - 8B9F51171944A61D00894629 /* SwifterMac.h */, - 8B9F51151944A61D00894629 /* Supporting Files */, - ); - path = SwifterMac; - sourceTree = ""; - }; - 8B9F51151944A61D00894629 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 8B9F51161944A61D00894629 /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 8B9F51461944A8DC00894629 /* SwifterCommon */ = { + 8B9F51461944A8DC00894629 /* Swifter */ = { isa = PBXGroup; children = ( + 8B5EFF14195F09F600B354F9 /* Swifter.h */, 8B9F514B1944A8DC00894629 /* Swifter-Bridging-Header.h */, 8B9F514C1944A8DC00894629 /* Swifter.swift */, 8BF1D6871948C11E00E3AA64 /* SwifterCredential.swift */, @@ -338,8 +309,9 @@ 8B116AF0194601970019A4DC /* SwifterHTTPRequest.swift */, 8B33CA3E19587C6D00739FCB /* JSON.swift */, 8B9F51591944A8E100894629 /* Extensions */, + 8B5EFF10195F085B00B354F9 /* Supporting Files */, ); - path = SwifterCommon; + path = Swifter; sourceTree = ""; }; 8B9F51591944A8E100894629 /* Extensions */ = { @@ -359,8 +331,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 8B9F50F41944A5AB00894629 /* SwifteriOS.h in Headers */, 8B9F51551944A8DC00894629 /* Swifter-Bridging-Header.h in Headers */, + 8B5EFF15195F09F600B354F9 /* Swifter.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -368,8 +340,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 8B9F51181944A61D00894629 /* SwifterMac.h in Headers */, 8B9F51561944A8DC00894629 /* Swifter-Bridging-Header.h in Headers */, + 8B5EFF16195F09F600B354F9 /* Swifter.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -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; }; @@ -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; }; @@ -925,7 +897,7 @@ "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; @@ -933,7 +905,7 @@ 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; }; @@ -947,7 +919,7 @@ 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; @@ -955,7 +927,7 @@ 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; }; diff --git a/SwifterCommon/Dictionary+Swifter.swift b/Swifter/Dictionary+Swifter.swift similarity index 100% rename from SwifterCommon/Dictionary+Swifter.swift rename to Swifter/Dictionary+Swifter.swift diff --git a/SwifteriOS/Info.plist b/Swifter/Info.plist similarity index 94% rename from SwifteriOS/Info.plist rename to Swifter/Info.plist index d207e1ab..6a602ffe 100644 --- a/SwifteriOS/Info.plist +++ b/Swifter/Info.plist @@ -19,7 +19,7 @@ CFBundleSignature ???? CFBundleVersion - ${CURRENT_PROJECT_VERSION} + 1.0 NSPrincipalClass diff --git a/SwifterCommon/JSON.swift b/Swifter/JSON.swift similarity index 100% rename from SwifterCommon/JSON.swift rename to Swifter/JSON.swift diff --git a/SwifterCommon/NSURL+Swifter.swift b/Swifter/NSURL+Swifter.swift similarity index 100% rename from SwifterCommon/NSURL+Swifter.swift rename to Swifter/NSURL+Swifter.swift diff --git a/SwifterCommon/String+Swifter.swift b/Swifter/String+Swifter.swift similarity index 100% rename from SwifterCommon/String+Swifter.swift rename to Swifter/String+Swifter.swift diff --git a/SwifterCommon/Swifter-Bridging-Header.h b/Swifter/Swifter-Bridging-Header.h similarity index 100% rename from SwifterCommon/Swifter-Bridging-Header.h rename to Swifter/Swifter-Bridging-Header.h diff --git a/SwifteriOS/SwifteriOS.h b/Swifter/Swifter.h similarity index 88% rename from SwifteriOS/SwifteriOS.h rename to Swifter/Swifter.h index 801b4cfa..8e19f7aa 100644 --- a/SwifteriOS/SwifteriOS.h +++ b/Swifter/Swifter.h @@ -1,6 +1,6 @@ // -// SwifteriOS.h -// SwifteriOS +// Swifter.h +// Swifter // // Copyright (c) 2014 Matt Donnelly. // @@ -25,6 +25,6 @@ #import -FOUNDATION_EXPORT double SwifteriOSVersionNumber; +FOUNDATION_EXPORT double SwifterVersionNumber; -FOUNDATION_EXPORT const unsigned char SwifteriOSVersionString[]; +FOUNDATION_EXPORT const unsigned char SwifterVersionString[]; diff --git a/SwifterCommon/Swifter.swift b/Swifter/Swifter.swift similarity index 99% rename from SwifterCommon/Swifter.swift rename to Swifter/Swifter.swift index fc67520d..62cc2fb6 100644 --- a/SwifterCommon/Swifter.swift +++ b/Swifter/Swifter.swift @@ -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 diff --git a/SwifterCommon/SwifterAccountsClient.swift b/Swifter/SwifterAccountsClient.swift similarity index 100% rename from SwifterCommon/SwifterAccountsClient.swift rename to Swifter/SwifterAccountsClient.swift diff --git a/SwifterCommon/SwifterAppOnlyClient.swift b/Swifter/SwifterAppOnlyClient.swift similarity index 100% rename from SwifterCommon/SwifterAppOnlyClient.swift rename to Swifter/SwifterAppOnlyClient.swift diff --git a/SwifterCommon/SwifterAuth.swift b/Swifter/SwifterAuth.swift similarity index 99% rename from SwifterCommon/SwifterAuth.swift rename to Swifter/SwifterAuth.swift index 5991cbfe..ae187787 100644 --- a/SwifterCommon/SwifterAuth.swift +++ b/Swifter/SwifterAuth.swift @@ -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 diff --git a/SwifterCommon/SwifterClientProtocol.swift b/Swifter/SwifterClientProtocol.swift similarity index 100% rename from SwifterCommon/SwifterClientProtocol.swift rename to Swifter/SwifterClientProtocol.swift diff --git a/SwifterCommon/SwifterCredential.swift b/Swifter/SwifterCredential.swift similarity index 100% rename from SwifterCommon/SwifterCredential.swift rename to Swifter/SwifterCredential.swift diff --git a/SwifterCommon/SwifterFavorites.swift b/Swifter/SwifterFavorites.swift similarity index 100% rename from SwifterCommon/SwifterFavorites.swift rename to Swifter/SwifterFavorites.swift diff --git a/SwifterCommon/SwifterFollowers.swift b/Swifter/SwifterFollowers.swift similarity index 100% rename from SwifterCommon/SwifterFollowers.swift rename to Swifter/SwifterFollowers.swift diff --git a/SwifterCommon/SwifterHTTPRequest.swift b/Swifter/SwifterHTTPRequest.swift similarity index 100% rename from SwifterCommon/SwifterHTTPRequest.swift rename to Swifter/SwifterHTTPRequest.swift diff --git a/SwifterCommon/SwifterHelp.swift b/Swifter/SwifterHelp.swift similarity index 100% rename from SwifterCommon/SwifterHelp.swift rename to Swifter/SwifterHelp.swift diff --git a/SwifterCommon/SwifterLists.swift b/Swifter/SwifterLists.swift similarity index 100% rename from SwifterCommon/SwifterLists.swift rename to Swifter/SwifterLists.swift diff --git a/SwifterCommon/SwifterMessages.swift b/Swifter/SwifterMessages.swift similarity index 100% rename from SwifterCommon/SwifterMessages.swift rename to Swifter/SwifterMessages.swift diff --git a/SwifterCommon/SwifterOAuthClient.swift b/Swifter/SwifterOAuthClient.swift similarity index 100% rename from SwifterCommon/SwifterOAuthClient.swift rename to Swifter/SwifterOAuthClient.swift diff --git a/SwifterCommon/SwifterPlaces.swift b/Swifter/SwifterPlaces.swift similarity index 100% rename from SwifterCommon/SwifterPlaces.swift rename to Swifter/SwifterPlaces.swift diff --git a/SwifterCommon/SwifterSavedSearches.swift b/Swifter/SwifterSavedSearches.swift similarity index 100% rename from SwifterCommon/SwifterSavedSearches.swift rename to Swifter/SwifterSavedSearches.swift diff --git a/SwifterCommon/SwifterSearch.swift b/Swifter/SwifterSearch.swift similarity index 100% rename from SwifterCommon/SwifterSearch.swift rename to Swifter/SwifterSearch.swift diff --git a/SwifterCommon/SwifterSpam.swift b/Swifter/SwifterSpam.swift similarity index 100% rename from SwifterCommon/SwifterSpam.swift rename to Swifter/SwifterSpam.swift diff --git a/SwifterCommon/SwifterStreaming.swift b/Swifter/SwifterStreaming.swift similarity index 100% rename from SwifterCommon/SwifterStreaming.swift rename to Swifter/SwifterStreaming.swift diff --git a/SwifterCommon/SwifterSuggested.swift b/Swifter/SwifterSuggested.swift similarity index 100% rename from SwifterCommon/SwifterSuggested.swift rename to Swifter/SwifterSuggested.swift diff --git a/SwifterCommon/SwifterTimelines.swift b/Swifter/SwifterTimelines.swift similarity index 100% rename from SwifterCommon/SwifterTimelines.swift rename to Swifter/SwifterTimelines.swift diff --git a/SwifterCommon/SwifterTrends.swift b/Swifter/SwifterTrends.swift similarity index 100% rename from SwifterCommon/SwifterTrends.swift rename to Swifter/SwifterTrends.swift diff --git a/SwifterCommon/SwifterTweets.swift b/Swifter/SwifterTweets.swift similarity index 100% rename from SwifterCommon/SwifterTweets.swift rename to Swifter/SwifterTweets.swift diff --git a/SwifterCommon/SwifterUsers.swift b/Swifter/SwifterUsers.swift similarity index 100% rename from SwifterCommon/SwifterUsers.swift rename to Swifter/SwifterUsers.swift diff --git a/SwifterDemoiOS/AuthViewController.swift b/SwifterDemoiOS/AuthViewController.swift index 8c281e25..f76c7fca 100755 --- a/SwifterDemoiOS/AuthViewController.swift +++ b/SwifterDemoiOS/AuthViewController.swift @@ -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) } diff --git a/SwifterMac/Info.plist b/SwifterMac/Info.plist deleted file mode 100644 index d4b0aae2..00000000 --- a/SwifterMac/Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - com.mattdonnelly.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSHumanReadableCopyright - Copyright © 2014 Matt Donnelly. All rights reserved. - NSPrincipalClass - - - diff --git a/SwifterMac/SwifterMac.h b/SwifterMac/SwifterMac.h deleted file mode 100644 index 3f193f6e..00000000 --- a/SwifterMac/SwifterMac.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// SwifterMac.h -// SwifterMac -// -// Copyright (c) 2014 Matt Donnelly. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// - -#import - -FOUNDATION_EXPORT double SwifterMacVersionNumber; - -FOUNDATION_EXPORT const unsigned char SwifterMacVersionString[]; -