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

Commit 18e504f

Browse files
committed
Updated for Xcode 8 beta 2
Fixed code signing for Carthage
1 parent 5672f34 commit 18e504f

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "PureSwift/JSON-C" "098c5ad91d262de5ad695a6162b6d0d4b384741d"
1+
github "PureSwift/JSON-C" "0b49467d3f881523c9a74994f6e460a757bdb84f"

Xcode/SwiftFoundation.xcodeproj/project.pbxproj

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,6 @@
135135
6E957C2B1C43AA55003F3C51 /* JSONSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E957C291C43AA55003F3C51 /* JSONSerialization.swift */; };
136136
6E957C2C1C43AA55003F3C51 /* JSONSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E957C291C43AA55003F3C51 /* JSONSerialization.swift */; };
137137
6E957C2D1C43AA55003F3C51 /* JSONSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E957C291C43AA55003F3C51 /* JSONSerialization.swift */; };
138-
6E957C481C43B397003F3C51 /* JSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E957C451C43B397003F3C51 /* JSON.framework */; };
139-
6E957C491C43B397003F3C51 /* JSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E957C451C43B397003F3C51 /* JSON.framework */; };
140-
6E957C4A1C43B397003F3C51 /* JSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E957C451C43B397003F3C51 /* JSON.framework */; };
141-
6E957C4B1C43B397003F3C51 /* JSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E957C471C43B397003F3C51 /* JSON.framework */; };
142-
6E957C4C1C43B397003F3C51 /* JSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E957C471C43B397003F3C51 /* JSON.framework */; };
143-
6E957C4D1C43B397003F3C51 /* JSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E957C471C43B397003F3C51 /* JSON.framework */; };
144138
6E957C4E1C43B3A1003F3C51 /* JSON.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 6E957C471C43B397003F3C51 /* JSON.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
145139
6E957C4F1C43B3A5003F3C51 /* JSON.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 6E957C451C43B397003F3C51 /* JSON.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
146140
6E957C571C442E3E003F3C51 /* JSONTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E957C561C442E3E003F3C51 /* JSONTests.swift */; };
@@ -267,17 +261,13 @@
267261
isa = PBXFrameworksBuildPhase;
268262
buildActionMask = 2147483647;
269263
files = (
270-
6E957C4C1C43B397003F3C51 /* JSON.framework in Frameworks */,
271-
6E957C491C43B397003F3C51 /* JSON.framework in Frameworks */,
272264
);
273265
runOnlyForDeploymentPostprocessing = 0;
274266
};
275267
1AE78FBD1B96774300CDEF17 /* Frameworks */ = {
276268
isa = PBXFrameworksBuildPhase;
277269
buildActionMask = 2147483647;
278270
files = (
279-
6E957C4D1C43B397003F3C51 /* JSON.framework in Frameworks */,
280-
6E957C4A1C43B397003F3C51 /* JSON.framework in Frameworks */,
281271
);
282272
runOnlyForDeploymentPostprocessing = 0;
283273
};
@@ -293,8 +283,6 @@
293283
isa = PBXFrameworksBuildPhase;
294284
buildActionMask = 2147483647;
295285
files = (
296-
6E957C4B1C43B397003F3C51 /* JSON.framework in Frameworks */,
297-
6E957C481C43B397003F3C51 /* JSON.framework in Frameworks */,
298286
);
299287
runOnlyForDeploymentPostprocessing = 0;
300288
};
@@ -866,12 +854,13 @@
866854
isa = XCBuildConfiguration;
867855
buildSettings = {
868856
CLANG_ENABLE_MODULES = YES;
869-
CODE_SIGN_IDENTITY = "iPhone Developer";
857+
CODE_SIGN_IDENTITY = "";
870858
COMBINE_HIDPI_IMAGES = YES;
871859
DEFINES_MODULE = YES;
872860
DYLIB_COMPATIBILITY_VERSION = 1;
873861
DYLIB_CURRENT_VERSION = 1;
874862
DYLIB_INSTALL_NAME_BASE = "@rpath";
863+
ENABLE_BITCODE = YES;
875864
FRAMEWORK_SEARCH_PATHS = $SRCROOT/../Carthage/Build/iOS;
876865
FRAMEWORK_VERSION = A;
877866
INFOPLIST_FILE = "$(SRCROOT)/SwiftFoundation/Info.plist";
@@ -889,12 +878,13 @@
889878
isa = XCBuildConfiguration;
890879
buildSettings = {
891880
CLANG_ENABLE_MODULES = YES;
892-
CODE_SIGN_IDENTITY = "iPhone Developer";
881+
CODE_SIGN_IDENTITY = "";
893882
COMBINE_HIDPI_IMAGES = YES;
894883
DEFINES_MODULE = YES;
895884
DYLIB_COMPATIBILITY_VERSION = 1;
896885
DYLIB_CURRENT_VERSION = 1;
897886
DYLIB_INSTALL_NAME_BASE = "@rpath";
887+
ENABLE_BITCODE = YES;
898888
FRAMEWORK_SEARCH_PATHS = $SRCROOT/../Carthage/Build/iOS;
899889
FRAMEWORK_VERSION = A;
900890
INFOPLIST_FILE = "$(SRCROOT)/SwiftFoundation/Info.plist";
@@ -991,6 +981,7 @@
991981
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
992982
CLANG_WARN_UNREACHABLE_CODE = YES;
993983
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
984+
CODE_SIGNING_REQUIRED = NO;
994985
COPY_PHASE_STRIP = NO;
995986
CURRENT_PROJECT_VERSION = 1;
996987
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -1041,6 +1032,7 @@
10411032
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
10421033
CLANG_WARN_UNREACHABLE_CODE = YES;
10431034
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1035+
CODE_SIGNING_REQUIRED = NO;
10441036
COPY_PHASE_STRIP = NO;
10451037
CURRENT_PROJECT_VERSION = 1;
10461038
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";

0 commit comments

Comments
 (0)