Skip to content

Commit 739369e

Browse files
raymccraeraymccrae
authored
Merge pull request raymccrae#1 from cassianodialpad/master
Carthage compatibility.
2 parents cd703b7 + 9dc529a commit 739369e

5 files changed

Lines changed: 292 additions & 1 deletion

File tree

‎JSONPatch.xcodeproj/project.pbxproj‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,16 @@
3131
4DDA51EB219AAD8D00BA7704 /* NSArray+DeepCopy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DDA51EA219AAD8D00BA7704 /* NSArray+DeepCopy.swift */; };
3232
4DDA51ED219AADE000BA7704 /* NSDictionary+DeepCopy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DDA51EC219AADE000BA7704 /* NSDictionary+DeepCopy.swift */; };
3333
4DF8B18621B1C5E700CAABEE /* JSONPatchGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DF8B18521B1C5E700CAABEE /* JSONPatchGenerator.swift */; };
34+
F0224B96230EF8BA000279B8 /* JSONPatch.h in Headers */ = {isa = PBXBuildFile; fileRef = F0224B94230EF8BA000279B8 /* JSONPatch.h */; settings = {ATTRIBUTES = (Public, ); }; };
35+
F0E577A7230F474A001D1DD1 /* JSONElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AF30321987C0A00E7F86B /* JSONElement.swift */; };
36+
F0E577A8230F474F001D1DD1 /* JSONError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AF30121987BA100E7F86B /* JSONError.swift */; };
37+
F0E577A9230F4752001D1DD1 /* JSONPatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D22EB27219878DC00729769 /* JSONPatch.swift */; };
38+
F0E577AA230F4757001D1DD1 /* JSONPointer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D0AF30521987C8900E7F86B /* JSONPointer.swift */; };
39+
F0E577AB230F4757001D1DD1 /* JSONPatchGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DF8B18521B1C5E700CAABEE /* JSONPatchGenerator.swift */; };
40+
F0E577AC230F4757001D1DD1 /* NSArray+DeepCopy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DDA51EA219AAD8D00BA7704 /* NSArray+DeepCopy.swift */; };
41+
F0E577AD230F4757001D1DD1 /* NSDictionary+DeepCopy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DDA51EC219AADE000BA7704 /* NSDictionary+DeepCopy.swift */; };
42+
F0E577AE230F4757001D1DD1 /* JSONEquality.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D836964219C0909003A38FE /* JSONEquality.swift */; };
43+
F0E577AF230F4757001D1DD1 /* JSONPatchCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D42776721B28DE1007F4B70 /* JSONPatchCodable.swift */; };
3444
/* End PBXBuildFile section */
3545

3646
/* Begin PBXContainerItemProxy section */
@@ -82,6 +92,9 @@
8292
4DDA51EA219AAD8D00BA7704 /* NSArray+DeepCopy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSArray+DeepCopy.swift"; sourceTree = "<group>"; };
8393
4DDA51EC219AADE000BA7704 /* NSDictionary+DeepCopy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSDictionary+DeepCopy.swift"; sourceTree = "<group>"; };
8494
4DF8B18521B1C5E700CAABEE /* JSONPatchGenerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONPatchGenerator.swift; sourceTree = "<group>"; };
95+
F0224B92230EF8BA000279B8 /* JSONPatch.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JSONPatch.framework; sourceTree = BUILT_PRODUCTS_DIR; };
96+
F0224B94230EF8BA000279B8 /* JSONPatch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSONPatch.h; sourceTree = "<group>"; };
97+
F0224B95230EF8BA000279B8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8598
/* End PBXFileReference section */
8699

87100
/* Begin PBXFrameworksBuildPhase section */
@@ -100,6 +113,13 @@
100113
);
101114
runOnlyForDeploymentPostprocessing = 0;
102115
};
116+
F0224B8F230EF8BA000279B8 /* Frameworks */ = {
117+
isa = PBXFrameworksBuildPhase;
118+
buildActionMask = 2147483647;
119+
files = (
120+
);
121+
runOnlyForDeploymentPostprocessing = 0;
122+
};
103123
/* End PBXFrameworksBuildPhase section */
104124

105125
/* Begin PBXGroup section */
@@ -108,6 +128,7 @@
108128
children = (
109129
4D22EB26219878DC00729769 /* JSONPatch */,
110130
4D22EB33219879EF00729769 /* JSONPatchTests */,
131+
F0224B93230EF8BA000279B8 /* JSONPatchFramework */,
111132
4D22EB25219878DC00729769 /* Products */,
112133
);
113134
sourceTree = "<group>";
@@ -117,6 +138,7 @@
117138
children = (
118139
4D22EB24219878DC00729769 /* libJSONPatch.a */,
119140
4D22EB32219879EF00729769 /* JSONPatchTests.xctest */,
141+
F0224B92230EF8BA000279B8 /* JSONPatch.framework */,
120142
);
121143
name = Products;
122144
sourceTree = "<group>";
@@ -169,8 +191,28 @@
169191
name = TestData;
170192
sourceTree = "<group>";
171193
};
194+
F0224B93230EF8BA000279B8 /* JSONPatchFramework */ = {
195+
isa = PBXGroup;
196+
children = (
197+
F0224B94230EF8BA000279B8 /* JSONPatch.h */,
198+
F0224B95230EF8BA000279B8 /* Info.plist */,
199+
);
200+
path = JSONPatchFramework;
201+
sourceTree = "<group>";
202+
};
172203
/* End PBXGroup section */
173204

205+
/* Begin PBXHeadersBuildPhase section */
206+
F0224B8D230EF8BA000279B8 /* Headers */ = {
207+
isa = PBXHeadersBuildPhase;
208+
buildActionMask = 2147483647;
209+
files = (
210+
F0224B96230EF8BA000279B8 /* JSONPatch.h in Headers */,
211+
);
212+
runOnlyForDeploymentPostprocessing = 0;
213+
};
214+
/* End PBXHeadersBuildPhase section */
215+
174216
/* Begin PBXNativeTarget section */
175217
4D22EB23219878DC00729769 /* JSONPatch */ = {
176218
isa = PBXNativeTarget;
@@ -207,6 +249,24 @@
207249
productReference = 4D22EB32219879EF00729769 /* JSONPatchTests.xctest */;
208250
productType = "com.apple.product-type.bundle.unit-test";
209251
};
252+
F0224B91230EF8BA000279B8 /* JSONPatchFramework */ = {
253+
isa = PBXNativeTarget;
254+
buildConfigurationList = F0224B99230EF8BA000279B8 /* Build configuration list for PBXNativeTarget "JSONPatchFramework" */;
255+
buildPhases = (
256+
F0224B8D230EF8BA000279B8 /* Headers */,
257+
F0224B8E230EF8BA000279B8 /* Sources */,
258+
F0224B8F230EF8BA000279B8 /* Frameworks */,
259+
F0224B90230EF8BA000279B8 /* Resources */,
260+
);
261+
buildRules = (
262+
);
263+
dependencies = (
264+
);
265+
name = JSONPatchFramework;
266+
productName = JSONPatchFramework;
267+
productReference = F0224B92230EF8BA000279B8 /* JSONPatch.framework */;
268+
productType = "com.apple.product-type.framework";
269+
};
210270
/* End PBXNativeTarget section */
211271

212272
/* Begin PBXProject section */
@@ -223,6 +283,9 @@
223283
4D22EB31219879EF00729769 = {
224284
CreatedOnToolsVersion = 10.1;
225285
};
286+
F0224B91230EF8BA000279B8 = {
287+
CreatedOnToolsVersion = 10.3;
288+
};
226289
};
227290
};
228291
buildConfigurationList = 4D22EB1F219878DC00729769 /* Build configuration list for PBXProject "JSONPatch" */;
@@ -239,6 +302,7 @@
239302
targets = (
240303
4D22EB23219878DC00729769 /* JSONPatch */,
241304
4D22EB31219879EF00729769 /* JSONPatchTests */,
305+
F0224B91230EF8BA000279B8 /* JSONPatchFramework */,
242306
);
243307
};
244308
/* End PBXProject section */
@@ -257,6 +321,13 @@
257321
);
258322
runOnlyForDeploymentPostprocessing = 0;
259323
};
324+
F0224B90230EF8BA000279B8 /* Resources */ = {
325+
isa = PBXResourcesBuildPhase;
326+
buildActionMask = 2147483647;
327+
files = (
328+
);
329+
runOnlyForDeploymentPostprocessing = 0;
330+
};
260331
/* End PBXResourcesBuildPhase section */
261332

262333
/* Begin PBXSourcesBuildPhase section */
@@ -291,6 +362,22 @@
291362
);
292363
runOnlyForDeploymentPostprocessing = 0;
293364
};
365+
F0224B8E230EF8BA000279B8 /* Sources */ = {
366+
isa = PBXSourcesBuildPhase;
367+
buildActionMask = 2147483647;
368+
files = (
369+
F0E577AD230F4757001D1DD1 /* NSDictionary+DeepCopy.swift in Sources */,
370+
F0E577A8230F474F001D1DD1 /* JSONError.swift in Sources */,
371+
F0E577AC230F4757001D1DD1 /* NSArray+DeepCopy.swift in Sources */,
372+
F0E577AB230F4757001D1DD1 /* JSONPatchGenerator.swift in Sources */,
373+
F0E577A9230F4752001D1DD1 /* JSONPatch.swift in Sources */,
374+
F0E577AE230F4757001D1DD1 /* JSONEquality.swift in Sources */,
375+
F0E577A7230F474A001D1DD1 /* JSONElement.swift in Sources */,
376+
F0E577AF230F4757001D1DD1 /* JSONPatchCodable.swift in Sources */,
377+
F0E577AA230F4757001D1DD1 /* JSONPointer.swift in Sources */,
378+
);
379+
runOnlyForDeploymentPostprocessing = 0;
380+
};
294381
/* End PBXSourcesBuildPhase section */
295382

296383
/* Begin PBXTargetDependency section */
@@ -482,6 +569,62 @@
482569
};
483570
name = Release;
484571
};
572+
F0224B97230EF8BA000279B8 /* Debug */ = {
573+
isa = XCBuildConfiguration;
574+
buildSettings = {
575+
CODE_SIGN_IDENTITY = "";
576+
CODE_SIGN_STYLE = Automatic;
577+
CURRENT_PROJECT_VERSION = 1;
578+
DEFINES_MODULE = YES;
579+
DYLIB_COMPATIBILITY_VERSION = 1;
580+
DYLIB_CURRENT_VERSION = 1;
581+
DYLIB_INSTALL_NAME_BASE = "@rpath";
582+
INFOPLIST_FILE = JSONPatchFramework/Info.plist;
583+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
584+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
585+
LD_RUNPATH_SEARCH_PATHS = (
586+
"$(inherited)",
587+
"@executable_path/Frameworks",
588+
"@loader_path/Frameworks",
589+
);
590+
PRODUCT_BUNDLE_IDENTIFIER = scot.raymccrae.JSONPatch;
591+
PRODUCT_NAME = JSONPatch;
592+
SKIP_INSTALL = YES;
593+
SWIFT_VERSION = 5.0;
594+
TARGETED_DEVICE_FAMILY = "1,2";
595+
VERSIONING_SYSTEM = "apple-generic";
596+
VERSION_INFO_PREFIX = "";
597+
};
598+
name = Debug;
599+
};
600+
F0224B98230EF8BA000279B8 /* Release */ = {
601+
isa = XCBuildConfiguration;
602+
buildSettings = {
603+
CODE_SIGN_IDENTITY = "";
604+
CODE_SIGN_STYLE = Automatic;
605+
CURRENT_PROJECT_VERSION = 1;
606+
DEFINES_MODULE = YES;
607+
DYLIB_COMPATIBILITY_VERSION = 1;
608+
DYLIB_CURRENT_VERSION = 1;
609+
DYLIB_INSTALL_NAME_BASE = "@rpath";
610+
INFOPLIST_FILE = JSONPatchFramework/Info.plist;
611+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
612+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
613+
LD_RUNPATH_SEARCH_PATHS = (
614+
"$(inherited)",
615+
"@executable_path/Frameworks",
616+
"@loader_path/Frameworks",
617+
);
618+
PRODUCT_BUNDLE_IDENTIFIER = scot.raymccrae.JSONPatch;
619+
PRODUCT_NAME = JSONPatch;
620+
SKIP_INSTALL = YES;
621+
SWIFT_VERSION = 5.0;
622+
TARGETED_DEVICE_FAMILY = "1,2";
623+
VERSIONING_SYSTEM = "apple-generic";
624+
VERSION_INFO_PREFIX = "";
625+
};
626+
name = Release;
627+
};
485628
/* End XCBuildConfiguration section */
486629

487630
/* Begin XCConfigurationList section */
@@ -512,6 +655,15 @@
512655
defaultConfigurationIsVisible = 0;
513656
defaultConfigurationName = Release;
514657
};
658+
F0224B99230EF8BA000279B8 /* Build configuration list for PBXNativeTarget "JSONPatchFramework" */ = {
659+
isa = XCConfigurationList;
660+
buildConfigurations = (
661+
F0224B97230EF8BA000279B8 /* Debug */,
662+
F0224B98230EF8BA000279B8 /* Release */,
663+
);
664+
defaultConfigurationIsVisible = 0;
665+
defaultConfigurationName = Release;
666+
};
515667
/* End XCConfigurationList section */
516668
};
517669
rootObject = 4D22EB1C219878DC00729769 /* Project object */;

‎JSONPatch.xcodeproj/xcshareddata/xcschemes/JSONPatchFramework.xcscheme‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1030"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "F0224B91230EF8BA000279B8"
18+
BuildableName = "JSONPatch.framework"
19+
BlueprintName = "JSONPatchFramework"
20+
ReferencedContainer = "container:JSONPatch.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Debug"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "F0224B91230EF8BA000279B8"
49+
BuildableName = "JSONPatch.framework"
50+
BlueprintName = "JSONPatchFramework"
51+
ReferencedContainer = "container:JSONPatch.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
buildConfiguration = "Release"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "F0224B91230EF8BA000279B8"
67+
BuildableName = "JSONPatch.framework"
68+
BlueprintName = "JSONPatchFramework"
69+
ReferencedContainer = "container:JSONPatch.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

‎JSONPatchFramework/Info.plist‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>$(CURRENT_PROJECT_VERSION)</string>
21+
</dict>
22+
</plist>

‎JSONPatchFramework/JSONPatch.h‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
//
2+
// JSONPatch.h
3+
// JSONPatch
4+
//
5+
// Created by Cassiano Monteiro on 2019-08-22.
6+
// Copyright © 2019 Raymond McCrae.
7+
//
8+
// Licensed under the Apache License, Version 2.0 (the "License");
9+
// you may not use this file except in compliance with the License.
10+
// You may obtain a copy of the License at
11+
//
12+
// http://www.apache.org/licenses/LICENSE-2.0
13+
//
14+
// Unless required by applicable law or agreed to in writing, software
15+
// distributed under the License is distributed on an "AS IS" BASIS,
16+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
// See the License for the specific language governing permissions and
18+
// limitations under the License.
19+
//
20+
21+
#import <UIKit/UIKit.h>
22+
23+
//! Project version number for JSONPatchFramework.
24+
FOUNDATION_EXPORT double JSONPatchVersionNumber;
25+
26+
//! Project version string for JSONPatchFramework.
27+
FOUNDATION_EXPORT const unsigned char JSONPatchVersionString[];
28+
29+
// In this header, you should import all the public headers of your framework using statements like #import <JSONPatch/PublicHeader.h>
30+
31+
#import <JSONPatch/JSONPatch.h>

0 commit comments

Comments
 (0)