Skip to content

Commit

Permalink
Merge pull request #46 from isair/1.7.0
Browse files Browse the repository at this point in the history 
1.7.0
  • Loading branch information
@isair
isair committed Dec 1, 2015
2 parents ddac749 + 14b0646 commit 5bda89e
Show file tree
Hide file tree
Showing 9 changed files with 282 additions and 31 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
language: objective-c
osx_image: xcode61
script:
- xctool -project JSONHelper.xcodeproj -scheme JSONHelper-iOS build
- xctool -project JSONHelper.xcodeproj -scheme JSONHelper-Mac build
osx_image: xcode7.1
2 changes: 1 addition & 1 deletion JSONHelper.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'JSONHelper'
s.version = '1.6.1'
s.version = '1.7.0'
s.license = { :type => 'zlib', :file => 'LICENSE' }
s.summary = 'Lightning fast JSON deserialization and value conversion library for iOS & OS X written in Swift.'

Expand Down
152 changes: 139 additions & 13 deletions JSONHelper.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
5F928D991C0D469F00EF50C4 /* JSONHelper-tvOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F928D981C0D469F00EF50C4 /* JSONHelper-tvOS.h */; settings = {ATTRIBUTES = (Public, ); }; };
5F928D9E1C0D46BE00EF50C4 /* JSONHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FC4468E1A70F3750038EE4E /* JSONHelper.swift */; };
5FAD076A1A70F2FC00C4D09E /* JSONHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FAD07691A70F2FC00C4D09E /* JSONHelper.h */; settings = {ATTRIBUTES = (Public, ); }; };
5FAD07701A70F2FC00C4D09E /* JSONHelper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FAD07641A70F2FC00C4D09E /* JSONHelper.framework */; };
5FAD07771A70F2FC00C4D09E /* JSONHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FAD07761A70F2FC00C4D09E /* JSONHelperTests.swift */; };
Expand Down Expand Up @@ -47,6 +49,9 @@

/* Begin PBXFileReference section */
5F0E6F961ACDE06400D92679 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5F928D961C0D469F00EF50C4 /* JSONHelper_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JSONHelper_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5F928D981C0D469F00EF50C4 /* JSONHelper-tvOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JSONHelper-tvOS.h"; sourceTree = "<group>"; };
5F928D9A1C0D469F00EF50C4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5FAD07641A70F2FC00C4D09E /* JSONHelper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JSONHelper.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5FAD07681A70F2FC00C4D09E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5FAD07691A70F2FC00C4D09E /* JSONHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSONHelper.h; sourceTree = "<group>"; };
Expand All @@ -68,6 +73,13 @@
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
5F928D921C0D469F00EF50C4 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
5FAD07601A70F2FC00C4D09E /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -123,13 +135,22 @@
path = iOS;
sourceTree = "<group>";
};
5F928D9F1C0D478800EF50C4 /* tvOS */ = {
isa = PBXGroup;
children = (
5F928D9A1C0D469F00EF50C4 /* Info.plist */,
5F928D981C0D469F00EF50C4 /* JSONHelper-tvOS.h */,
);
path = tvOS;
sourceTree = "<group>";
};
5FAD075A1A70F2FC00C4D09E = {
isa = PBXGroup;
children = (
5FAD07661A70F2FC00C4D09E /* JSONHelper */,
5FAD07731A70F2FC00C4D09E /* JSONHelperTests */,
5FAD07851A70F31300C4D09E /* JSONHelperExample */,
5FAD079B1A70F31300C4D09E /* JSONHelperExampleTests */,
5FAD07731A70F2FC00C4D09E /* JSONHelperTests */,
5FAD07651A70F2FC00C4D09E /* Products */,
);
sourceTree = "<group>";
Expand All @@ -142,34 +163,36 @@
5FAD07841A70F31300C4D09E /* JSONHelperExample.app */,
5FAD07981A70F31300C4D09E /* JSONHelperExampleTests.xctest */,
D76C520A1ACD46B100B49735 /* JSONHelper.framework */,
5F928D961C0D469F00EF50C4 /* JSONHelper_tvOS.framework */,
);
name = Products;
sourceTree = "<group>";
};
5FAD07661A70F2FC00C4D09E /* JSONHelper */ = {
isa = PBXGroup;
children = (
5FAD07671A70F2FC00C4D09E /* Supporting Files */,
5FAD07691A70F2FC00C4D09E /* JSONHelper.h */,
5FC4468E1A70F3750038EE4E /* JSONHelper.swift */,
5FAD07671A70F2FC00C4D09E /* Supporting Files */,
);
path = JSONHelper;
sourceTree = "<group>";
};
5FAD07671A70F2FC00C4D09E /* Supporting Files */ = {
isa = PBXGroup;
children = (
5F0E6F981ACDE0C400D92679 /* iOS */,
5F0E6F971ACDE0BF00D92679 /* Mac */,
5F0E6F981ACDE0C400D92679 /* iOS */,
5F928D9F1C0D478800EF50C4 /* tvOS */,
);
path = "Supporting Files";
sourceTree = "<group>";
};
5FAD07731A70F2FC00C4D09E /* JSONHelperTests */ = {
isa = PBXGroup;
children = (
5FAD07761A70F2FC00C4D09E /* JSONHelperTests.swift */,
5FAD07741A70F2FC00C4D09E /* Supporting Files */,
5FAD07761A70F2FC00C4D09E /* JSONHelperTests.swift */,
);
path = JSONHelperTests;
sourceTree = "<group>";
Expand All @@ -185,12 +208,12 @@
5FAD07851A70F31300C4D09E /* JSONHelperExample */ = {
isa = PBXGroup;
children = (
5FAD07861A70F31300C4D09E /* Supporting Files */,
5FAD07881A70F31300C4D09E /* AppDelegate.swift */,
5FAD078A1A70F31300C4D09E /* ViewController.swift */,
5FAD078C1A70F31300C4D09E /* Main.storyboard */,
5FAD078F1A70F31300C4D09E /* Images.xcassets */,
5FAD07911A70F31300C4D09E /* LaunchScreen.xib */,
5FAD07861A70F31300C4D09E /* Supporting Files */,
5FAD078C1A70F31300C4D09E /* Main.storyboard */,
5FAD078A1A70F31300C4D09E /* ViewController.swift */,
);
path = JSONHelperExample;
sourceTree = "<group>";
Expand All @@ -206,8 +229,8 @@
5FAD079B1A70F31300C4D09E /* JSONHelperExampleTests */ = {
isa = PBXGroup;
children = (
5FAD079E1A70F31300C4D09E /* JSONHelperExampleTests.swift */,
5FAD079C1A70F31300C4D09E /* Supporting Files */,
5FAD079E1A70F31300C4D09E /* JSONHelperExampleTests.swift */,
);
path = JSONHelperExampleTests;
sourceTree = "<group>";
Expand All @@ -223,6 +246,14 @@
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
5F928D931C0D469F00EF50C4 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
5F928D991C0D469F00EF50C4 /* JSONHelper-tvOS.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5FAD07611A70F2FC00C4D09E /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -242,6 +273,24 @@
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
5F928D951C0D469F00EF50C4 /* JSONHelper_tvOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 5F928D9B1C0D469F00EF50C4 /* Build configuration list for PBXNativeTarget "JSONHelper_tvOS" */;
buildPhases = (
5F928D911C0D469F00EF50C4 /* Sources */,
5F928D921C0D469F00EF50C4 /* Frameworks */,
5F928D931C0D469F00EF50C4 /* Headers */,
5F928D941C0D469F00EF50C4 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = JSONHelper_tvOS;
productName = "JSONHelper-tvOS";
productReference = 5F928D961C0D469F00EF50C4 /* JSONHelper_tvOS.framework */;
productType = "com.apple.product-type.framework";
};
5FAD07631A70F2FC00C4D09E /* JSONHelper */ = {
isa = PBXNativeTarget;
buildConfigurationList = 5FAD077A1A70F2FC00C4D09E /* Build configuration list for PBXNativeTarget "JSONHelper" */;
Expand Down Expand Up @@ -314,9 +363,9 @@
productReference = 5FAD07981A70F31300C4D09E /* JSONHelperExampleTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
D76C52001ACD46B100B49735 /* JSONHelper-Mac */ = {
D76C52001ACD46B100B49735 /* JSONHelper_Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = D76C52071ACD46B100B49735 /* Build configuration list for PBXNativeTarget "JSONHelper-Mac" */;
buildConfigurationList = D76C52071ACD46B100B49735 /* Build configuration list for PBXNativeTarget "JSONHelper_Mac" */;
buildPhases = (
D76C52011ACD46B100B49735 /* Sources */,
D76C52031ACD46B100B49735 /* Frameworks */,
Expand All @@ -327,7 +376,7 @@
);
dependencies = (
);
name = "JSONHelper-Mac";
name = JSONHelper_Mac;
productName = JSONHelper;
productReference = D76C520A1ACD46B100B49735 /* JSONHelper.framework */;
productType = "com.apple.product-type.framework";
Expand All @@ -338,9 +387,13 @@
5FAD075B1A70F2FC00C4D09E /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0610;
ORGANIZATIONNAME = "Baris Sencan";
TargetAttributes = {
5F928D951C0D469F00EF50C4 = {
CreatedOnToolsVersion = 7.1.1;
};
5FAD07631A70F2FC00C4D09E = {
CreatedOnToolsVersion = 6.1.1;
};
Expand Down Expand Up @@ -370,7 +423,8 @@
projectRoot = "";
targets = (
5FAD07631A70F2FC00C4D09E /* JSONHelper */,
D76C52001ACD46B100B49735 /* JSONHelper-Mac */,
D76C52001ACD46B100B49735 /* JSONHelper_Mac */,
5F928D951C0D469F00EF50C4 /* JSONHelper_tvOS */,
5FAD076E1A70F2FC00C4D09E /* JSONHelperTests */,
5FAD07831A70F31300C4D09E /* JSONHelperExample */,
5FAD07971A70F31300C4D09E /* JSONHelperExampleTests */,
Expand All @@ -379,6 +433,13 @@
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
5F928D941C0D469F00EF50C4 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
5FAD07621A70F2FC00C4D09E /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -420,6 +481,14 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
5F928D911C0D469F00EF50C4 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5F928D9E1C0D46BE00EF50C4 /* JSONHelper.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5FAD075F1A70F2FC00C4D09E /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -503,6 +572,50 @@
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
5F928D9C1C0D469F00EF50C4 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "JSONHelper-tvOS/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.JSONHelper;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Debug;
};
5F928D9D1C0D469F00EF50C4 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "JSONHelper-tvOS/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.JSONHelper;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Release;
};
5FAD07781A70F2FC00C4D09E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -600,6 +713,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.JSONHelper;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -618,6 +732,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.JSONHelper;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
};
Expand Down Expand Up @@ -723,6 +838,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.JSONHelper;
PRODUCT_NAME = JSONHelper;
SDKROOT = macosx;
SKIP_INSTALL = YES;
Expand All @@ -742,6 +858,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.JSONHelper;
PRODUCT_NAME = JSONHelper;
SDKROOT = macosx;
SKIP_INSTALL = YES;
Expand All @@ -751,6 +868,15 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
5F928D9B1C0D469F00EF50C4 /* Build configuration list for PBXNativeTarget "JSONHelper_tvOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5F928D9C1C0D469F00EF50C4 /* Debug */,
5F928D9D1C0D469F00EF50C4 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
5FAD075E1A70F2FC00C4D09E /* Build configuration list for PBXProject "JSONHelper" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down Expand Up @@ -796,7 +922,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D76C52071ACD46B100B49735 /* Build configuration list for PBXNativeTarget "JSONHelper-Mac" */ = {
D76C52071ACD46B100B49735 /* Build configuration list for PBXNativeTarget "JSONHelper_Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D76C52081ACD46B100B49735 /* Debug */,
Expand Down
Loading

0 comments on commit 5bda89e

Please sign in to comment.