From 4a1bf608d1e9c69e29f8dce4edcaca4ba0db9e2b Mon Sep 17 00:00:00 2001 From: Alexey Khokhlov Date: Thu, 2 Nov 2017 13:43:59 +0300 Subject: [PATCH] Swift4 --- .../ProtocolBuffers_Info.plist | 26 ++++++ ProtocolBuffers.xcodeproj/project.pbxproj | 43 ++-------- .../ProtocolBuffers-Package.xcscheme | 83 +++++++++++++++++++ 3 files changed, 116 insertions(+), 36 deletions(-) create mode 100644 ProtocolBuffers.xcodeproj/ProtocolBuffers_Info.plist create mode 100644 ProtocolBuffers.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers-Package.xcscheme diff --git a/ProtocolBuffers.xcodeproj/ProtocolBuffers_Info.plist b/ProtocolBuffers.xcodeproj/ProtocolBuffers_Info.plist new file mode 100644 index 0000000..c073e25 --- /dev/null +++ b/ProtocolBuffers.xcodeproj/ProtocolBuffers_Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 4.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/ProtocolBuffers.xcodeproj/project.pbxproj b/ProtocolBuffers.xcodeproj/project.pbxproj index c21746e..3677fc2 100644 --- a/ProtocolBuffers.xcodeproj/project.pbxproj +++ b/ProtocolBuffers.xcodeproj/project.pbxproj @@ -92,14 +92,14 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 3F2F4E861FAA3829005FFAFD /* PBXContainerItemProxy */ = { + 3F130A3F1FAB2CFA00E29F61 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = OBJ_1 /* Project object */; proxyType = 1; remoteGlobalIDString = "ProtocolBuffers::ProtocolBuffers"; remoteInfo = ProtocolBuffers; }; - 3F2F4E871FAA382A005FFAFD /* PBXContainerItemProxy */ = { + 3F130A401FAB2CFB00E29F61 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = OBJ_1 /* Project object */; proxyType = 1; @@ -109,17 +109,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 3F90B9881FAA3D7500097883 /* text_format_unittest_data_oneof_implemented.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_data_oneof_implemented.txt; sourceTree = ""; }; - 3F90B9891FAA3D7500097883 /* text_format_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_data.txt; sourceTree = ""; }; - 3F90B98A1FAA3D7500097883 /* text_format_unittest_data_pointy.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_data_pointy.txt; sourceTree = ""; }; - 3F90B98B1FAA3D7500097883 /* text_format_unittest_extensions_data_pointy.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_extensions_data_pointy.txt; sourceTree = ""; }; - 3F90B98C1FAA3D7500097883 /* delimitedFile.dat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = delimitedFile.dat; sourceTree = ""; }; - 3F90B98D1FAA3D7500097883 /* golden_message_oneof_implemented */ = {isa = PBXFileReference; lastKnownFileType = file; path = golden_message_oneof_implemented; sourceTree = ""; }; - 3F90B98E1FAA3D7500097883 /* bad_utf8_string */ = {isa = PBXFileReference; lastKnownFileType = file; path = bad_utf8_string; sourceTree = ""; }; - 3F90B98F1FAA3D7500097883 /* text_format_unittest_data_pointy_oneof.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_data_pointy_oneof.txt; sourceTree = ""; }; - 3F90B9901FAA3D7500097883 /* golden_message */ = {isa = PBXFileReference; lastKnownFileType = file; path = golden_message; sourceTree = ""; }; - 3F90B9911FAA3D7500097883 /* text_format_unittest_extensions_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_extensions_data.txt; sourceTree = ""; }; - 3F90B9921FAA3D7500097883 /* golden_packed_fields_message */ = {isa = PBXFileReference; lastKnownFileType = file; path = golden_packed_fields_message; sourceTree = ""; }; OBJ_10 /* CodedInputStream.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodedInputStream.swift; sourceTree = ""; }; OBJ_11 /* CodedOutputStream.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodedOutputStream.swift; sourceTree = ""; }; OBJ_12 /* ConcreateExtensionField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConcreateExtensionField.swift; sourceTree = ""; }; @@ -214,24 +203,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 3F90B9871FAA3D7500097883 /* testdata */ = { - isa = PBXGroup; - children = ( - 3F90B9881FAA3D7500097883 /* text_format_unittest_data_oneof_implemented.txt */, - 3F90B9891FAA3D7500097883 /* text_format_unittest_data.txt */, - 3F90B98A1FAA3D7500097883 /* text_format_unittest_data_pointy.txt */, - 3F90B98B1FAA3D7500097883 /* text_format_unittest_extensions_data_pointy.txt */, - 3F90B98C1FAA3D7500097883 /* delimitedFile.dat */, - 3F90B98D1FAA3D7500097883 /* golden_message_oneof_implemented */, - 3F90B98E1FAA3D7500097883 /* bad_utf8_string */, - 3F90B98F1FAA3D7500097883 /* text_format_unittest_data_pointy_oneof.txt */, - 3F90B9901FAA3D7500097883 /* golden_message */, - 3F90B9911FAA3D7500097883 /* text_format_unittest_extensions_data.txt */, - 3F90B9921FAA3D7500097883 /* golden_packed_fields_message */, - ); - path = testdata; - sourceTree = ""; - }; OBJ_32 /* Tests */ = { isa = PBXGroup; children = ( @@ -266,7 +237,6 @@ OBJ_48 /* pbTests */ = { isa = PBXGroup; children = ( - 3F90B9871FAA3D7500097883 /* testdata */, OBJ_49 /* Bar.Foo.proto.swift */, OBJ_50 /* Baz.Foo.proto.swift */, OBJ_51 /* Google.Protobuf.NoGenericServicesTest.UnittestNoGenericServices.proto.swift */, @@ -300,7 +270,7 @@ path = pbTests; sourceTree = ""; }; - OBJ_5 = { + OBJ_5 /* */ = { isa = PBXGroup; children = ( OBJ_6 /* Package.swift */, @@ -312,6 +282,7 @@ OBJ_81 /* DerivedData */, OBJ_82 /* Products */, ); + name = ""; sourceTree = ""; }; OBJ_7 /* Sources */ = { @@ -426,7 +397,7 @@ knownRegions = ( en, ); - mainGroup = OBJ_5; + mainGroup = OBJ_5 /* */; productRefGroup = OBJ_82 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -534,12 +505,12 @@ OBJ_141 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = "ProtocolBuffers::ProtocolBuffers" /* ProtocolBuffers */; - targetProxy = 3F2F4E861FAA3829005FFAFD /* PBXContainerItemProxy */; + targetProxy = 3F130A3F1FAB2CFA00E29F61 /* PBXContainerItemProxy */; }; OBJ_175 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = "ProtocolBuffers::ProtocolBufferTests" /* ProtocolBufferTests */; - targetProxy = 3F2F4E871FAA382A005FFAFD /* PBXContainerItemProxy */; + targetProxy = 3F130A401FAB2CFB00E29F61 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ diff --git a/ProtocolBuffers.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers-Package.xcscheme b/ProtocolBuffers.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers-Package.xcscheme new file mode 100644 index 0000000..bd99ff3 --- /dev/null +++ b/ProtocolBuffers.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers-Package.xcscheme @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +