Skip to content
This repository was archived by the owner on Jan 4, 2024. It is now read-only.

Swift4.2 #1

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

Swift4.2 #1

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
56e725c
feat: dynamic member lookup JSON
FrainL Jun 18, 2018
da92a95
remove collection
FrainL Jun 18, 2018
f74fc5d
fix typo
FrainL Jun 18, 2018
27b8a79
chore: improve playground description
FrainL Oct 3, 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
4 changes: 2 additions & 2 deletions FxJSON.playground/Pages/Using Protocols.xcplaygroundpage/Contents.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class BasicClass: JSONDecodable, JSONEncodable {
signUpTime = try json["signUpTime"]<
}

func encode(mapper: JSON.Mapper) {
func encode(mapper: JSON.Wrapper) {
mapper["userID"] << userID
mapper["name"] << name
mapper["admin"] << admin
Expand All @@ -85,7 +85,7 @@ class UserClass: BasicClass {
try super.init(decode: json)
}

override func encode(mapper: JSON.Mapper) {
override func encode(mapper: JSON.Wrapper) {
mapper[ignoreIfNull: "website"] << website
mapper["friends"] << friends
super.encode(mapper: mapper)
Expand Down
63 changes: 44 additions & 19 deletions FxJSON.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
F323F5EB1DA8DB87009D824E /* JSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = F323F5E61DA8DB87009D824E /* JSON.swift */; };
F323F5EE1DA8DB87009D824E /* Protocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = F323F5E81DA8DB87009D824E /* Protocols.swift */; };
F323F5EF1DA8DB87009D824E /* Protocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = F323F5E81DA8DB87009D824E /* Protocols.swift */; };
F323F5F01DA8DB87009D824E /* Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = F323F5E91DA8DB87009D824E /* Collection.swift */; };
F323F5F11DA8DB87009D824E /* Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = F323F5E91DA8DB87009D824E /* Collection.swift */; };
F323F5F01DA8DB87009D824E /* Subscript.swift in Sources */ = {isa = PBXBuildFile; fileRef = F323F5E91DA8DB87009D824E /* Subscript.swift */; };
F323F5F11DA8DB87009D824E /* Subscript.swift in Sources */ = {isa = PBXBuildFile; fileRef = F323F5E91DA8DB87009D824E /* Subscript.swift */; };
F356E77E20D659CB00B4B9C1 /* JSONWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F356E77D20D659CB00B4B9C1 /* JSONWrapper.swift */; };
F371ED181DAF826A005EE24D /* MapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F371ED171DAF826A005EE24D /* MapperTests.swift */; };
F39DBD401DAE24E70055ED01 /* Implements.swift in Sources */ = {isa = PBXBuildFile; fileRef = F39DBD3F1DAE24E70055ED01 /* Implements.swift */; };
F39DBD411DAE24E70055ED01 /* Implements.swift in Sources */ = {isa = PBXBuildFile; fileRef = F39DBD3F1DAE24E70055ED01 /* Implements.swift */; };
Expand Down Expand Up @@ -45,13 +46,14 @@
F323F5D01DA8DB31009D824E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F323F5D51DA8DB32009D824E /* FxJSONTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FxJSONTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
F323F5DC1DA8DB32009D824E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F323F5E61DA8DB87009D824E /* JSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSON.swift; sourceTree = "<group>"; };
F323F5E81DA8DB87009D824E /* Protocols.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Protocols.swift; sourceTree = "<group>"; };
F323F5E91DA8DB87009D824E /* Collection.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = Collection.swift; sourceTree = "<group>"; tabWidth = 2; wrapsLines = 1; };
F323F5E61DA8DB87009D824E /* JSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = JSON.swift; sourceTree = "<group>"; tabWidth = 2; };
F323F5E81DA8DB87009D824E /* Protocols.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = Protocols.swift; sourceTree = "<group>"; tabWidth = 2; };
F323F5E91DA8DB87009D824E /* Subscript.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = Subscript.swift; sourceTree = "<group>"; tabWidth = 2; wrapsLines = 1; };
F356E77D20D659CB00B4B9C1 /* JSONWrapper.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = JSONWrapper.swift; sourceTree = "<group>"; tabWidth = 2; };
F371ED171DAF826A005EE24D /* MapperTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapperTests.swift; sourceTree = "<group>"; };
F39DBD3F1DAE24E70055ED01 /* Implements.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Implements.swift; sourceTree = "<group>"; };
F39DBD3F1DAE24E70055ED01 /* Implements.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = Implements.swift; sourceTree = "<group>"; tabWidth = 2; };
F3C1289C1DBB9AFD001EA4B3 /* ProtocolTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProtocolTests.swift; sourceTree = "<group>"; };
F3C1289E1DBDD600001EA4B3 /* PerformanceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PerformanceTests.swift; sourceTree = "<group>"; };
F3C1289E1DBDD600001EA4B3 /* PerformanceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = PerformanceTests.swift; sourceTree = "<group>"; tabWidth = 2; };
F3C1289F1DBDD600001EA4B3 /* SerializeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SerializeTests.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -96,7 +98,8 @@
isa = PBXGroup;
children = (
F323F5E61DA8DB87009D824E /* JSON.swift */,
F323F5E91DA8DB87009D824E /* Collection.swift */,
F356E77D20D659CB00B4B9C1 /* JSONWrapper.swift */,
F323F5E91DA8DB87009D824E /* Subscript.swift */,
F323F5E81DA8DB87009D824E /* Protocols.swift */,
F39DBD3F1DAE24E70055ED01 /* Implements.swift */,
F323F5CF1DA8DB31009D824E /* FxJSON.h */,
Expand Down Expand Up @@ -177,17 +180,18 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0800;
LastUpgradeCheck = 0810;
LastUpgradeCheck = 1000;
ORGANIZATIONNAME = com.frain;
TargetAttributes = {
F323F5CB1DA8DB31009D824E = {
CreatedOnToolsVersion = 8.0;
LastSwiftMigration = 0800;
LastSwiftMigration = 1000;
ProvisioningStyle = Automatic;
};
F323F5D41DA8DB32009D824E = {
CreatedOnToolsVersion = 8.0;
DevelopmentTeam = NYY93G8LZ7;
DevelopmentTeam = 38U8W94Y3Q;
LastSwiftMigration = 1000;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -234,7 +238,8 @@
buildActionMask = 2147483647;
files = (
F323F5EA1DA8DB87009D824E /* JSON.swift in Sources */,
F323F5F01DA8DB87009D824E /* Collection.swift in Sources */,
F323F5F01DA8DB87009D824E /* Subscript.swift in Sources */,
F356E77E20D659CB00B4B9C1 /* JSONWrapper.swift in Sources */,
F39DBD401DAE24E70055ED01 /* Implements.swift in Sources */,
F323F5EE1DA8DB87009D824E /* Protocols.swift in Sources */,
);
Expand All @@ -247,7 +252,7 @@
F31A4D141DACDE6C0001FB1B /* InitTests.swift in Sources */,
F323F5EB1DA8DB87009D824E /* JSON.swift in Sources */,
F39DBD411DAE24E70055ED01 /* Implements.swift in Sources */,
F323F5F11DA8DB87009D824E /* Collection.swift in Sources */,
F323F5F11DA8DB87009D824E /* Subscript.swift in Sources */,
F323F5EF1DA8DB87009D824E /* Protocols.swift in Sources */,
F31A4D161DACE0DD0001FB1B /* SubscriptTests.swift in Sources */,
F3C128A11DBDD600001EA4B3 /* SerializeTests.swift in Sources */,
Expand Down Expand Up @@ -277,15 +282,23 @@
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_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
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_IMPLICIT_RETAIN_SELF = 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_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
Expand Down Expand Up @@ -331,15 +344,23 @@
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_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
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_IMPLICIT_RETAIN_SELF = 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_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
Expand Down Expand Up @@ -388,7 +409,8 @@
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -410,33 +432,36 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Release;
};
F323F5E41DA8DB32009D824E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
DEVELOPMENT_TEAM = NYY93G8LZ7;
DEVELOPMENT_TEAM = 38U8W94Y3Q;
INFOPLIST_FILE = FxJSONTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.frain.FxJSONTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
F323F5E51DA8DB32009D824E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
DEVELOPMENT_TEAM = NYY93G8LZ7;
DEVELOPMENT_TEAM = 38U8W94Y3Q;
INFOPLIST_FILE = FxJSONTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.frain.FxJSONTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion FxJSON.xcodeproj/xcshareddata/xcschemes/FxJSON.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 = "0810"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
3 changes: 3 additions & 0 deletions FxJSON.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading