Skip to content
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

Swift 2 To Swift 3 Migration #137

Merged
merged 8 commits into from
Oct 1, 2018
Merged

Swift 2 To Swift 3 Migration #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9714a18
Clean up Task class
muandrew Dec 18, 2017
aab7c1f
Clean up warnings
muandrew Dec 26, 2017
06cceb9
Automated Swift 2 to 3 Conversion by XCode 8.3.3
muandrew Dec 26, 2017
5264870
Add @escaping when needed.
muandrew Jan 10, 2018
5377794
Fix compilation warning/errors from Swift 2 to 3 automated migration.
muandrew Jan 10, 2018
d7f8f93
Use Recommended Project Configurations
muandrew Jan 10, 2018
1b8c694
Fix deprecation Warning
muandrew Jan 10, 2018
b727c76
Fix Crash when there is no device brand.
muandrew Jan 10, 2018
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
25 changes: 24 additions & 1 deletion AndroidTool.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,15 +418,17 @@
attributes = {
LastSwiftMigration = 0710;
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0710;
LastUpgradeCheck = 0920;
ORGANIZATIONNAME = "Morten Just Petersen";
TargetAttributes = {
C8B5145F1AE85D610071C86A = {
CreatedOnToolsVersion = 6.3;
DevelopmentTeam = UDGLB23X37;
LastSwiftMigration = 0830;
};
C8B5146F1AE85D610071C86A = {
CreatedOnToolsVersion = 6.3;
LastSwiftMigration = 0830;
TestTargetID = C8B5145F1AE85D610071C86A;
};
};
Expand Down Expand Up @@ -585,13 +587,21 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
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_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
Expand Down Expand Up @@ -630,13 +640,21 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
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_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
Expand All @@ -655,6 +673,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
};
name = Release;
};
Expand All @@ -674,6 +693,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.mortenjust.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -693,6 +713,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.mortenjust.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -713,6 +734,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.mortenjust.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AndroidTool.app/Contents/MacOS/AndroidTool";
};
name = Debug;
Expand All @@ -730,6 +752,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.mortenjust.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AndroidTool.app/Contents/MacOS/AndroidTool";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion AndroidTool/Apk.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Apk: NSObject {
parseRawInfo(rawAaptBadgingData)
}

func parseRawInfo(rawdata:String) {
func parseRawInfo(_ rawdata:String) {
print(">>apkparskeapkinfo")
let u = Util()
let apk = self
Expand Down
18 changes: 9 additions & 9 deletions AndroidTool/ApkHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import Cocoa

protocol ApkHandlerDelegate {
func apkHandlerDidStart()
func apkHandlerDidGetInfo(apk:Apk)
func apkHandlerDidUpdate(update:String)
func apkHandlerDidGetInfo(_ apk:Apk)
func apkHandlerDidUpdate(_ update:String)
func apkHandlerDidFinish()
}

Expand All @@ -33,7 +33,7 @@ class ApkHandler: NSObject {
self.device = device
}

func installAndLaunch(complete:()->Void){
func installAndLaunch(_ complete:@escaping ()->Void){
delegate?.apkHandlerDidStart()
print(">>apkhandle")

Expand All @@ -46,7 +46,7 @@ class ApkHandler: NSObject {
}
}

func install(completion:()->Void){
func install(_ completion:@escaping ()->Void){
print(">>apkinstall")
delegate?.apkHandlerDidUpdate("Installing...")

Expand All @@ -59,7 +59,7 @@ class ApkHandler: NSObject {
}
}

func uninstallPackageWithName(packageName:String, completion:()->Void){
func uninstallPackageWithName(_ packageName:String, completion:@escaping ()->Void){
print(">>Uninstall")
delegate?.apkHandlerDidUpdate("Uninstalling app")
let s = ShellTasker(scriptFile: "uninstallPackageOnDevice")
Expand All @@ -71,7 +71,7 @@ class ApkHandler: NSObject {

}

func getInfoFromApk(complete:(Apk) -> Void){
func getInfoFromApk(_ complete:@escaping (Apk) -> Void){
print(">>apkgetinfofromapk")
delegate?.apkHandlerDidUpdate("Getting info...")

Expand All @@ -86,7 +86,7 @@ class ApkHandler: NSObject {
iconShell.run(arguments: [self.filepath]) { (output) -> Void in
print("Ready to add nsurl path to apk object: \(output)")

apk.localIconPath = (output as String).stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet())
apk.localIconPath = (output as String).trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)


complete(apk)
Expand All @@ -96,11 +96,11 @@ class ApkHandler: NSObject {
}


func launch(apk:Apk){
func launch(_ apk:Apk){
print(">>apklaunch")
delegate?.apkHandlerDidUpdate("Launching...")

if let packageName = apk.packageName, launcherActivity = apk.launcherActivity {
if let packageName = apk.packageName, let launcherActivity = apk.launcherActivity {

let ac = "\(packageName)/\(launcherActivity)"

Expand Down
Loading