Skip to content

Swift 3 & Xcode 8 GM support #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lennet wants to merge 4 commits into
base: master
Choose a base branch
from
+230 −182
Open

Swift 3 & Xcode 8 GM support #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9a8804
migrated to swift 3 (shipped with Xcode 8 GM)
lennet Sep 7, 2016
ec945ea
replaced all AnyObject with Any
lennet Sep 7, 2016
03609f4
code improvements
lennet Sep 8, 2016
98f3bcf
updated travis osx_image to xcode8
lennet Sep 8, 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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: objective-c
osx_image: xcode61
osx_image: xcode8
xcodebuild: xctool -project youtube-parser.xcodeproj -scheme youtube-parser build
xcode_scheme: youtube-parserTests
18 changes: 9 additions & 9 deletions AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@ import UIKit
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?
func application(application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
let testURL = NSURL(string: "https://www.youtube.com/watch?v=swZJwZeMesk")!
func application(_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
let testURL = URL(string: "https://www.youtube.com/watch?v=swZJwZeMesk")!
Youtube.h264videosWithYoutubeURL(testURL) { (videoInfo, error) -> Void in
if let videoURLString = videoInfo?["url"] as? String,
videoTitle = videoInfo?["title"] as? String {
let videoTitle = videoInfo?["title"] as? String {
print("\(videoTitle)")
print("\(videoURLString)")
}
}
return true
}

func applicationWillResignActive(application: UIApplication) { }
func applicationWillResignActive(_ application: UIApplication) { }

func applicationDidEnterBackground(application: UIApplication) { }
func applicationDidEnterBackground(_ application: UIApplication) { }

func applicationWillEnterForeground(application: UIApplication) { }
func applicationWillEnterForeground(_ application: UIApplication) { }

func applicationDidBecomeActive(application: UIApplication) { }
func applicationDidBecomeActive(_ application: UIApplication) { }

func applicationWillTerminate(application: UIApplication) { }
func applicationWillTerminate(_ application: UIApplication) { }
}
29 changes: 21 additions & 8 deletions YoutubeSourceParserKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
B24965E31C3398310050DF64 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
C3A838771BB746A0000C5D33 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
C3FC20CD1B4996150000E818 /* YoutubeSourceParserKit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YoutubeSourceParserKit.app; sourceTree = BUILT_PRODUCTS_DIR; };
C3FC20E21B4996150000E818 /* YoutubeSourceParserKit.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = YoutubeSourceParserKit.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
C3FC20E21B4996150000E818 /* YoutubeSourceParserKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = YoutubeSourceParserKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -88,7 +88,7 @@
isa = PBXGroup;
children = (
C3FC20CD1B4996150000E818 /* YoutubeSourceParserKit.app */,
C3FC20E21B4996150000E818 /* YoutubeSourceParserKit.xctest */,
C3FC20E21B4996150000E818 /* YoutubeSourceParserKitTests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -128,7 +128,7 @@
);
name = YoutubeSourceParserKitTests;
productName = "youtube-parserTests";
productReference = C3FC20E21B4996150000E818 /* YoutubeSourceParserKit.xctest */;
productReference = C3FC20E21B4996150000E818 /* YoutubeSourceParserKitTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
Expand All @@ -139,14 +139,16 @@
attributes = {
LastSwiftMigration = 0710;
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0710;
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = "Toygar Dündaralp";
TargetAttributes = {
C3FC20CC1B4996150000E818 = {
CreatedOnToolsVersion = 6.4;
LastSwiftMigration = 0800;
};
C3FC20E11B4996150000E818 = {
CreatedOnToolsVersion = 6.4;
LastSwiftMigration = 0800;
TestTargetID = C3FC20CC1B4996150000E818;
};
};
Expand Down Expand Up @@ -231,13 +233,16 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand Down Expand Up @@ -277,13 +282,16 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand All @@ -297,6 +305,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand All @@ -312,6 +321,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.dundaralp.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = YoutubeSourceParserKit;
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -325,6 +335,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.dundaralp.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = YoutubeSourceParserKit;
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -337,10 +348,11 @@
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = "youtube-parserTests/Info.plist";
INFOPLIST_FILE = YoutubeSourceParserKitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.dundaralp.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = YoutubeSourceParserKit;
PRODUCT_NAME = YoutubeSourceParserKitTests;
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/YoutubeSourceParserKit.app/YoutubeSourceParserKit";
};
name = Debug;
Expand All @@ -350,10 +362,11 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = "";
INFOPLIST_FILE = "youtube-parserTests/Info.plist";
INFOPLIST_FILE = YoutubeSourceParserKitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.dundaralp.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = YoutubeSourceParserKit;
PRODUCT_NAME = YoutubeSourceParserKitTests;
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/YoutubeSourceParserKit.app/YoutubeSourceParserKit";
};
name = Release;
Expand Down
20 changes: 20 additions & 0 deletions YoutubeSourceParserKit/Images.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
Expand Down Expand Up @@ -30,6 +40,16 @@
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
Expand Down
Loading