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

Swift3 #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Swift3 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
093ef05
migration to Swift3
Coeur Apr 21, 2017
05a71b3
more swift syntax
Coeur Apr 21, 2017
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
36 changes: 6 additions & 30 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,17 @@
# Xcode
#
build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
xcuserdata/
*.xccheckout
*.moved-aside
DerivedData
*.hmap
*.ipa
*.xcuserstate
*.xcscmblueprint

# Filesystem
# AppCode
#
*.swp
.DS_Store
.idea/

# Carthage
#
md5/
Carthage/

# Protoc
# CocoaPods
#
*.pb.*
web-resources/node_modules/
web-resources/.sass-cache/
web-resources/bin/index.html
web-resources/bin/css/
web-resources/bin/images/
web-resources/bin/js/
web-resources/*.log

Tonic-Connect-Dashboard.sublime-workspace
Pods/
2 changes: 1 addition & 1 deletion JSONSerializerSwift(OSX)Tests/JSONSerializerSwift_OSX_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class JSONSerializerSwift_OSX_Tests: XCTestCase {

func testPerformanceExample() {
// This is an example of a performance test case.
self.measureBlock() {
self.measure() {
// Put the code you want to measure the time of here.
}
}
Expand Down
27 changes: 24 additions & 3 deletions JSONSerializerSwift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,20 +314,24 @@
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0700;
LastUpgradeCheck = 0830;
ORGANIZATIONNAME = TonicDesign;
TargetAttributes = {
BC17DD871B04E609003F3DD4 = {
CreatedOnToolsVersion = 6.2;
LastSwiftMigration = 0830;
};
BC17DD921B04E609003F3DD4 = {
CreatedOnToolsVersion = 6.2;
LastSwiftMigration = 0830;
};
BC9DD4851B176D0300BB199C = {
CreatedOnToolsVersion = 6.3.2;
LastSwiftMigration = 0830;
};
BC9DD48F1B176D0300BB199C = {
CreatedOnToolsVersion = 6.3.2;
LastSwiftMigration = 0830;
};
};
};
Expand Down Expand Up @@ -453,9 +457,11 @@
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_UNREACHABLE_CODE = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
Expand All @@ -464,6 +470,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 @@ -500,16 +507,19 @@
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_UNREACHABLE_CODE = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
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 @@ -519,6 +529,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;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -530,6 +541,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -541,13 +553,15 @@
PRODUCT_NAME = JSONSerializerSwift;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
BC17DDA01B04E609003F3DD4 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -558,6 +572,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = JSONSerializerSwift;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -573,6 +588,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = JSONSerializerSwiftTests;
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -584,6 +600,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = JSONSerializerSwiftTests;
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -610,6 +627,7 @@
PRODUCT_NAME = JSONSerializerSwift;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -632,6 +650,7 @@
PRODUCT_NAME = JSONSerializerSwift;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -655,6 +674,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = JSONSerializerSwiftTests;
SDKROOT = macosx;
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -674,6 +694,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = JSONSerializerSwiftTests;
SDKROOT = macosx;
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion JSONSerializerSwift.xcodeproj/xcshareddata/xcschemes/JSONGenSwift(OSX).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0700"
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion JSONSerializerSwift.xcodeproj/xcshareddata/xcschemes/JSONSerializerSwift.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0700"
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Loading