Skip to content

Commit

Permalink
Update to Swift3
Browse files Browse the repository at this point in the history
  • Loading branch information
RivailleAckerman authored and RivailleAckerman committed Sep 19, 2016
1 parent 5464fee commit d7f4ca2
Show file tree
Hide file tree
Showing 56 changed files with 362 additions and 245 deletions.
Empty file modified CHANGELOG.md
100644 → 100755
View file
Empty file.
12 changes: 11 additions & 1 deletion JSONExport.xcodeproj/project.pbxproj
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,12 @@
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0700;
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = "Ahmed Ali";
TargetAttributes = {
E2FA87B41A059AC100648EB6 = {
CreatedOnToolsVersion = 6.1;
LastSwiftMigration = 0800;
};
};
};
Expand Down Expand Up @@ -358,8 +359,10 @@
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 = "-";
Expand All @@ -368,6 +371,7 @@
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand Down Expand Up @@ -401,8 +405,10 @@
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 = "-";
Expand All @@ -411,6 +417,7 @@
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All @@ -420,6 +427,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
};
name = Release;
};
Expand All @@ -435,6 +443,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "JSONExport/JSONExport-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -449,6 +458,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "ahmed.ali.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "JSONExport/JSONExport-Bridging-Header.h";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
Empty file modified JSONExport.xcodeproj/project.xcworkspace/contents.xcworkspacedata
100644 → 100755
View file
Empty file.
Empty file modified ...proj/project.xcworkspace/xcuserdata/lawlincoln.xcuserdatad/UserInterfaceState.xcuserstate
100644 → 100755
View file
Empty file.
Binary file added ...j/project.xcworkspace/xcuserdata/zhangrunliang.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
Empty file modified JSONExport.xcodeproj/xcuserdata/ahmed.xcuserdatad/xcschemes/JSONExport.xcscheme
100644 → 100755
View file
Empty file.
Empty file modified JSONExport.xcodeproj/xcuserdata/ahmed.xcuserdatad/xcschemes/xcschememanagement.plist
100644 → 100755
View file
Empty file.
Empty file modified JSONExport.xcodeproj/xcuserdata/lawlincoln.xcuserdatad/xcschemes/JSONExport.xcscheme
100644 → 100755
View file
Empty file.
Empty file modified JSONExport.xcodeproj/xcuserdata/lawlincoln.xcuserdatad/xcschemes/xcschememanagement.plist
100644 → 100755
View file
Empty file.
5 changes: 5 additions & 0 deletions ...xport.xcodeproj/xcuserdata/zhangrunliang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "1"
version = "2.0">
</Bucket>
91 changes: 91 additions & 0 deletions JSONExport.xcodeproj/xcuserdata/zhangrunliang.xcuserdatad/xcschemes/JSONExport.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E2FA87B41A059AC100648EB6"
BuildableName = "JSONExport.app"
BlueprintName = "JSONExport"
ReferencedContainer = "container:JSONExport.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E2FA87B41A059AC100648EB6"
BuildableName = "JSONExport.app"
BlueprintName = "JSONExport"
ReferencedContainer = "container:JSONExport.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E2FA87B41A059AC100648EB6"
BuildableName = "JSONExport.app"
BlueprintName = "JSONExport"
ReferencedContainer = "container:JSONExport.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E2FA87B41A059AC100648EB6"
BuildableName = "JSONExport.app"
BlueprintName = "JSONExport"
ReferencedContainer = "container:JSONExport.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
22 changes: 22 additions & 0 deletions JSONExport.xcodeproj/xcuserdata/zhangrunliang.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>JSONExport.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>E2FA87B41A059AC100648EB6</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
4 changes: 2 additions & 2 deletions JSONExport/AppDelegate.swift
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {



func applicationDidFinishLaunching(aNotification: NSNotification) {
func applicationDidFinishLaunching(_ aNotification: Notification) {
// Insert code here to initialize your application
}

func applicationWillTerminate(aNotification: NSNotification) {
func applicationWillTerminate(_ aNotification: Notification) {
// Insert code here to tear down your application
}

Expand Down
16 changes: 8 additions & 8 deletions JSONExport/Author.swift
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,28 +48,28 @@ class Author : NSObject, NSCoding{
*/
@objc required init(coder aDecoder: NSCoder)
{
website = aDecoder.decodeObjectForKey("website") as? String
email = aDecoder.decodeObjectForKey("email") as? String
name = aDecoder.decodeObjectForKey("name") as? String
website = aDecoder.decodeObject(forKey: "website") as? String
email = aDecoder.decodeObject(forKey: "email") as? String
name = aDecoder.decodeObject(forKey: "name") as? String

}

/**
* NSCoding required method.
* Encodes mode properties into the decoder
*/
@objc func encodeWithCoder(aCoder: NSCoder)
@objc func encode(with aCoder: NSCoder)
{
if website != nil{
aCoder.encodeObject(website, forKey: "website")
aCoder.encode(website, forKey: "website")
}
if email != nil{
aCoder.encodeObject(email, forKey: "email")
aCoder.encode(email, forKey: "email")
}
if name != nil{
aCoder.encodeObject(name, forKey: "name")
aCoder.encode(name, forKey: "name")
}

}

}
}
Empty file modified JSONExport/Base.lproj/Main.storyboard
100644 → 100755
View file
Empty file.
Empty file modified JSONExport/Constructor.swift
100644 → 100755
View file
Empty file.
Empty file modified JSONExport/DataType.swift
100644 → 100755
View file
Empty file.
Loading

0 comments on commit d7f4ca2

Please sign in to comment.