Skip to content

Commit 5bda89e

Browse files
isairisair
committed
Merge pull request #46 from isair/1.7.0
1.7.0
2 parents ddac749 + 14b0646 commit 5bda89e

File tree

9 files changed

+282
-31
lines changed

9 files changed

+282
-31
lines changed

‎.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
language: objective-c
2-
osx_image: xcode61
3-
script:
4-
- xctool -project JSONHelper.xcodeproj -scheme JSONHelper-iOS build
5-
- xctool -project JSONHelper.xcodeproj -scheme JSONHelper-Mac build
2+
osx_image: xcode7.1

‎JSONHelper.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'JSONHelper'
3-
s.version = '1.6.1'
3+
s.version = '1.7.0'
44
s.license = { :type => 'zlib', :file => 'LICENSE' }
55
s.summary = 'Lightning fast JSON deserialization and value conversion library for iOS & OS X written in Swift.'
66

‎JSONHelper.xcodeproj/project.pbxproj

Lines changed: 139 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

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

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

7075
/* Begin PBXFrameworksBuildPhase section */
76+
5F928D921C0D469F00EF50C4 /* Frameworks */ = {
77+
isa = PBXFrameworksBuildPhase;
78+
buildActionMask = 2147483647;
79+
files = (
80+
);
81+
runOnlyForDeploymentPostprocessing = 0;
82+
};
7183
5FAD07601A70F2FC00C4D09E /* Frameworks */ = {
7284
isa = PBXFrameworksBuildPhase;
7385
buildActionMask = 2147483647;
@@ -123,13 +135,22 @@
123135
path = iOS;
124136
sourceTree = "<group>";
125137
};
138+
5F928D9F1C0D478800EF50C4 /* tvOS */ = {
139+
isa = PBXGroup;
140+
children = (
141+
5F928D9A1C0D469F00EF50C4 /* Info.plist */,
142+
5F928D981C0D469F00EF50C4 /* JSONHelper-tvOS.h */,
143+
);
144+
path = tvOS;
145+
sourceTree = "<group>";
146+
};
126147
5FAD075A1A70F2FC00C4D09E = {
127148
isa = PBXGroup;
128149
children = (
129150
5FAD07661A70F2FC00C4D09E /* JSONHelper */,
130-
5FAD07731A70F2FC00C4D09E /* JSONHelperTests */,
131151
5FAD07851A70F31300C4D09E /* JSONHelperExample */,
132152
5FAD079B1A70F31300C4D09E /* JSONHelperExampleTests */,
153+
5FAD07731A70F2FC00C4D09E /* JSONHelperTests */,
133154
5FAD07651A70F2FC00C4D09E /* Products */,
134155
);
135156
sourceTree = "<group>";
@@ -142,34 +163,36 @@
142163
5FAD07841A70F31300C4D09E /* JSONHelperExample.app */,
143164
5FAD07981A70F31300C4D09E /* JSONHelperExampleTests.xctest */,
144165
D76C520A1ACD46B100B49735 /* JSONHelper.framework */,
166+
5F928D961C0D469F00EF50C4 /* JSONHelper_tvOS.framework */,
145167
);
146168
name = Products;
147169
sourceTree = "<group>";
148170
};
149171
5FAD07661A70F2FC00C4D09E /* JSONHelper */ = {
150172
isa = PBXGroup;
151173
children = (
174+
5FAD07671A70F2FC00C4D09E /* Supporting Files */,
152175
5FAD07691A70F2FC00C4D09E /* JSONHelper.h */,
153176
5FC4468E1A70F3750038EE4E /* JSONHelper.swift */,
154-
5FAD07671A70F2FC00C4D09E /* Supporting Files */,
155177
);
156178
path = JSONHelper;
157179
sourceTree = "<group>";
158180
};
159181
5FAD07671A70F2FC00C4D09E /* Supporting Files */ = {
160182
isa = PBXGroup;
161183
children = (
162-
5F0E6F981ACDE0C400D92679 /* iOS */,
163184
5F0E6F971ACDE0BF00D92679 /* Mac */,
185+
5F0E6F981ACDE0C400D92679 /* iOS */,
186+
5F928D9F1C0D478800EF50C4 /* tvOS */,
164187
);
165188
path = "Supporting Files";
166189
sourceTree = "<group>";
167190
};
168191
5FAD07731A70F2FC00C4D09E /* JSONHelperTests */ = {
169192
isa = PBXGroup;
170193
children = (
171-
5FAD07761A70F2FC00C4D09E /* JSONHelperTests.swift */,
172194
5FAD07741A70F2FC00C4D09E /* Supporting Files */,
195+
5FAD07761A70F2FC00C4D09E /* JSONHelperTests.swift */,
173196
);
174197
path = JSONHelperTests;
175198
sourceTree = "<group>";
@@ -185,12 +208,12 @@
185208
5FAD07851A70F31300C4D09E /* JSONHelperExample */ = {
186209
isa = PBXGroup;
187210
children = (
211+
5FAD07861A70F31300C4D09E /* Supporting Files */,
188212
5FAD07881A70F31300C4D09E /* AppDelegate.swift */,
189-
5FAD078A1A70F31300C4D09E /* ViewController.swift */,
190-
5FAD078C1A70F31300C4D09E /* Main.storyboard */,
191213
5FAD078F1A70F31300C4D09E /* Images.xcassets */,
192214
5FAD07911A70F31300C4D09E /* LaunchScreen.xib */,
193-
5FAD07861A70F31300C4D09E /* Supporting Files */,
215+
5FAD078C1A70F31300C4D09E /* Main.storyboard */,
216+
5FAD078A1A70F31300C4D09E /* ViewController.swift */,
194217
);
195218
path = JSONHelperExample;
196219
sourceTree = "<group>";
@@ -206,8 +229,8 @@
206229
5FAD079B1A70F31300C4D09E /* JSONHelperExampleTests */ = {
207230
isa = PBXGroup;
208231
children = (
209-
5FAD079E1A70F31300C4D09E /* JSONHelperExampleTests.swift */,
210232
5FAD079C1A70F31300C4D09E /* Supporting Files */,
233+
5FAD079E1A70F31300C4D09E /* JSONHelperExampleTests.swift */,
211234
);
212235
path = JSONHelperExampleTests;
213236
sourceTree = "<group>";
@@ -223,6 +246,14 @@
223246
/* End PBXGroup section */
224247

225248
/* Begin PBXHeadersBuildPhase section */
249+
5F928D931C0D469F00EF50C4 /* Headers */ = {
250+
isa = PBXHeadersBuildPhase;
251+
buildActionMask = 2147483647;
252+
files = (
253+
5F928D991C0D469F00EF50C4 /* JSONHelper-tvOS.h in Headers */,
254+
);
255+
runOnlyForDeploymentPostprocessing = 0;
256+
};
226257
5FAD07611A70F2FC00C4D09E /* Headers */ = {
227258
isa = PBXHeadersBuildPhase;
228259
buildActionMask = 2147483647;
@@ -242,6 +273,24 @@
242273
/* End PBXHeadersBuildPhase section */
243274

244275
/* Begin PBXNativeTarget section */
276+
5F928D951C0D469F00EF50C4 /* JSONHelper_tvOS */ = {
277+
isa = PBXNativeTarget;
278+
buildConfigurationList = 5F928D9B1C0D469F00EF50C4 /* Build configuration list for PBXNativeTarget "JSONHelper_tvOS" */;
279+
buildPhases = (
280+
5F928D911C0D469F00EF50C4 /* Sources */,
281+
5F928D921C0D469F00EF50C4 /* Frameworks */,
282+
5F928D931C0D469F00EF50C4 /* Headers */,
283+
5F928D941C0D469F00EF50C4 /* Resources */,
284+
);
285+
buildRules = (
286+
);
287+
dependencies = (
288+
);
289+
name = JSONHelper_tvOS;
290+
productName = "JSONHelper-tvOS";
291+
productReference = 5F928D961C0D469F00EF50C4 /* JSONHelper_tvOS.framework */;
292+
productType = "com.apple.product-type.framework";
293+
};
245294
5FAD07631A70F2FC00C4D09E /* JSONHelper */ = {
246295
isa = PBXNativeTarget;
247296
buildConfigurationList = 5FAD077A1A70F2FC00C4D09E /* Build configuration list for PBXNativeTarget "JSONHelper" */;
@@ -314,9 +363,9 @@
314363
productReference = 5FAD07981A70F31300C4D09E /* JSONHelperExampleTests.xctest */;
315364
productType = "com.apple.product-type.bundle.unit-test";
316365
};
317-
D76C52001ACD46B100B49735 /* JSONHelper-Mac */ = {
366+
D76C52001ACD46B100B49735 /* JSONHelper_Mac */ = {
318367
isa = PBXNativeTarget;
319-
buildConfigurationList = D76C52071ACD46B100B49735 /* Build configuration list for PBXNativeTarget "JSONHelper-Mac" */;
368+
buildConfigurationList = D76C52071ACD46B100B49735 /* Build configuration list for PBXNativeTarget "JSONHelper_Mac" */;
320369
buildPhases = (
321370
D76C52011ACD46B100B49735 /* Sources */,
322371
D76C52031ACD46B100B49735 /* Frameworks */,
@@ -327,7 +376,7 @@
327376
);
328377
dependencies = (
329378
);
330-
name = "JSONHelper-Mac";
379+
name = JSONHelper_Mac;
331380
productName = JSONHelper;
332381
productReference = D76C520A1ACD46B100B49735 /* JSONHelper.framework */;
333382
productType = "com.apple.product-type.framework";
@@ -338,9 +387,13 @@
338387
5FAD075B1A70F2FC00C4D09E /* Project object */ = {
339388
isa = PBXProject;
340389
attributes = {
390+
LastSwiftUpdateCheck = 0710;
341391
LastUpgradeCheck = 0610;
342392
ORGANIZATIONNAME = "Baris Sencan";
343393
TargetAttributes = {
394+
5F928D951C0D469F00EF50C4 = {
395+
CreatedOnToolsVersion = 7.1.1;
396+
};
344397
5FAD07631A70F2FC00C4D09E = {
345398
CreatedOnToolsVersion = 6.1.1;
346399
};
@@ -370,7 +423,8 @@
370423
projectRoot = "";
371424
targets = (
372425
5FAD07631A70F2FC00C4D09E /* JSONHelper */,
373-
D76C52001ACD46B100B49735 /* JSONHelper-Mac */,
426+
D76C52001ACD46B100B49735 /* JSONHelper_Mac */,
427+
5F928D951C0D469F00EF50C4 /* JSONHelper_tvOS */,
374428
5FAD076E1A70F2FC00C4D09E /* JSONHelperTests */,
375429
5FAD07831A70F31300C4D09E /* JSONHelperExample */,
376430
5FAD07971A70F31300C4D09E /* JSONHelperExampleTests */,
@@ -379,6 +433,13 @@
379433
/* End PBXProject section */
380434

381435
/* Begin PBXResourcesBuildPhase section */
436+
5F928D941C0D469F00EF50C4 /* Resources */ = {
437+
isa = PBXResourcesBuildPhase;
438+
buildActionMask = 2147483647;
439+
files = (
440+
);
441+
runOnlyForDeploymentPostprocessing = 0;
442+
};
382443
5FAD07621A70F2FC00C4D09E /* Resources */ = {
383444
isa = PBXResourcesBuildPhase;
384445
buildActionMask = 2147483647;
@@ -420,6 +481,14 @@
420481
/* End PBXResourcesBuildPhase section */
421482

422483
/* Begin PBXSourcesBuildPhase section */
484+
5F928D911C0D469F00EF50C4 /* Sources */ = {
485+
isa = PBXSourcesBuildPhase;
486+
buildActionMask = 2147483647;
487+
files = (
488+
5F928D9E1C0D46BE00EF50C4 /* JSONHelper.swift in Sources */,
489+
);
490+
runOnlyForDeploymentPostprocessing = 0;
491+
};
423492
5FAD075F1A70F2FC00C4D09E /* Sources */ = {
424493
isa = PBXSourcesBuildPhase;
425494
buildActionMask = 2147483647;
@@ -503,6 +572,50 @@
503572
/* End PBXVariantGroup section */
504573

505574
/* Begin XCBuildConfiguration section */
575+
5F928D9C1C0D469F00EF50C4 /* Debug */ = {
576+
isa = XCBuildConfiguration;
577+
buildSettings = {
578+
DEBUG_INFORMATION_FORMAT = dwarf;
579+
DEFINES_MODULE = YES;
580+
DYLIB_COMPATIBILITY_VERSION = 1;
581+
DYLIB_CURRENT_VERSION = 1;
582+
DYLIB_INSTALL_NAME_BASE = "@rpath";
583+
ENABLE_TESTABILITY = YES;
584+
GCC_NO_COMMON_BLOCKS = YES;
585+
INFOPLIST_FILE = "JSONHelper-tvOS/Info.plist";
586+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
587+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
588+
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.JSONHelper;
589+
PRODUCT_NAME = "$(TARGET_NAME)";
590+
SDKROOT = appletvos;
591+
SKIP_INSTALL = YES;
592+
TARGETED_DEVICE_FAMILY = 3;
593+
TVOS_DEPLOYMENT_TARGET = 9.0;
594+
};
595+
name = Debug;
596+
};
597+
5F928D9D1C0D469F00EF50C4 /* Release */ = {
598+
isa = XCBuildConfiguration;
599+
buildSettings = {
600+
COPY_PHASE_STRIP = NO;
601+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
602+
DEFINES_MODULE = YES;
603+
DYLIB_COMPATIBILITY_VERSION = 1;
604+
DYLIB_CURRENT_VERSION = 1;
605+
DYLIB_INSTALL_NAME_BASE = "@rpath";
606+
GCC_NO_COMMON_BLOCKS = YES;
607+
INFOPLIST_FILE = "JSONHelper-tvOS/Info.plist";
608+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
609+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
610+
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.JSONHelper;
611+
PRODUCT_NAME = "$(TARGET_NAME)";
612+
SDKROOT = appletvos;
613+
SKIP_INSTALL = YES;
614+
TARGETED_DEVICE_FAMILY = 3;
615+
TVOS_DEPLOYMENT_TARGET = 9.0;
616+
};
617+
name = Release;
618+
};
506619
5FAD07781A70F2FC00C4D09E /* Debug */ = {
507620
isa = XCBuildConfiguration;
508621
buildSettings = {
@@ -600,6 +713,7 @@
600713
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
601714
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
602715
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
716+
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.JSONHelper;
603717
PRODUCT_NAME = "$(TARGET_NAME)";
604718
SKIP_INSTALL = YES;
605719
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -618,6 +732,7 @@
618732
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
619733
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
620734
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
735+
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.JSONHelper;
621736
PRODUCT_NAME = "$(TARGET_NAME)";
622737
SKIP_INSTALL = YES;
623738
};
@@ -723,6 +838,7 @@
723838
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
724839
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
725840
MACOSX_DEPLOYMENT_TARGET = 10.9;
841+
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.JSONHelper;
726842
PRODUCT_NAME = JSONHelper;
727843
SDKROOT = macosx;
728844
SKIP_INSTALL = YES;
@@ -742,6 +858,7 @@
742858
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
743859
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
744860
MACOSX_DEPLOYMENT_TARGET = 10.9;
861+
PRODUCT_BUNDLE_IDENTIFIER = com.bsencan.JSONHelper;
745862
PRODUCT_NAME = JSONHelper;
746863
SDKROOT = macosx;
747864
SKIP_INSTALL = YES;
@@ -751,6 +868,15 @@
751868
/* End XCBuildConfiguration section */
752869

753870
/* Begin XCConfigurationList section */
871+
5F928D9B1C0D469F00EF50C4 /* Build configuration list for PBXNativeTarget "JSONHelper_tvOS" */ = {
872+
isa = XCConfigurationList;
873+
buildConfigurations = (
874+
5F928D9C1C0D469F00EF50C4 /* Debug */,
875+
5F928D9D1C0D469F00EF50C4 /* Release */,
876+
);
877+
defaultConfigurationIsVisible = 0;
878+
defaultConfigurationName = Release;
879+
};
754880
5FAD075E1A70F2FC00C4D09E /* Build configuration list for PBXProject "JSONHelper" */ = {
755881
isa = XCConfigurationList;
756882
buildConfigurations = (
@@ -796,7 +922,7 @@
796922
defaultConfigurationIsVisible = 0;
797923
defaultConfigurationName = Release;
798924
};
799-
D76C52071ACD46B100B49735 /* Build configuration list for PBXNativeTarget "JSONHelper-Mac" */ = {
925+
D76C52071ACD46B100B49735 /* Build configuration list for PBXNativeTarget "JSONHelper_Mac" */ = {
800926
isa = XCConfigurationList;
801927
buildConfigurations = (
802928
D76C52081ACD46B100B49735 /* Debug */,

0 commit comments

Comments
 (0)