diff --git a/Sources/XcodeProject/Objects/PBXProject.swift b/Sources/XcodeProject/Objects/PBXProject.swift index 06e474c..7fe3c56 100644 --- a/Sources/XcodeProject/Objects/PBXProject.swift +++ b/Sources/XcodeProject/Objects/PBXProject.swift @@ -20,6 +20,7 @@ public final class PBXProject: PBXObject, PBXContainer { case xcode3_2 = "Xcode 3.2" case xcode6_3 = "Xcode 6.3" case xcode8_0 = "Xcode 8.0" + case xcode9_3 = "Xcode 9.3" } var compatibilityVersion: CompatibilityVersion = .xcode8_0 var developmentRegion: String = "English" diff --git a/Sources/XcodeProject/Objects/References/PBXFileReference.swift b/Sources/XcodeProject/Objects/References/PBXFileReference.swift index 400640f..d2fc384 100644 --- a/Sources/XcodeProject/Objects/References/PBXFileReference.swift +++ b/Sources/XcodeProject/Objects/References/PBXFileReference.swift @@ -14,7 +14,7 @@ public final class PBXFileReference: PBXReference { case explicit(String) case unknown - static func from (_ plist: PropertyList) -> FileType { + static func from(_ plist: PropertyList) -> FileType { if let lastKnownFileType = plist["lastKnownFileType"]?.string { return .lastKnown(lastKnownFileType) } else if let explicitFileType = plist["explicitFileType"]?.string { diff --git a/Sources/XcodeProject/ProjectFile.swift b/Sources/XcodeProject/ProjectFile.swift index 1f338c9..7708b89 100644 --- a/Sources/XcodeProject/ProjectFile.swift +++ b/Sources/XcodeProject/ProjectFile.swift @@ -27,6 +27,7 @@ public final class ProjectFile { case xcode32 = 46 case xcode63 = 47 case xcode8 = 48 + case xcode93 = 50 } var archiveVersion: UInt = 1 diff --git a/Tests/XcodeProjectTests/Fixtures/Xcode9.3Project.xcodeproj/project.pbxproj b/Tests/XcodeProjectTests/Fixtures/Xcode9.3Project.xcodeproj/project.pbxproj new file mode 100644 index 0000000..b880bcb --- /dev/null +++ b/Tests/XcodeProjectTests/Fixtures/Xcode9.3Project.xcodeproj/project.pbxproj @@ -0,0 +1,332 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 6CC5669F209BEADF00B8D501 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CC5669E209BEADF00B8D501 /* AppDelegate.swift */; }; + 6CC566A1209BEAE100B8D501 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6CC566A0209BEAE100B8D501 /* Assets.xcassets */; }; + 6CC566A4209BEAE100B8D501 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6CC566A2209BEAE100B8D501 /* MainMenu.xib */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 6CC5669B209BEADF00B8D501 /* Xcode9.3Project.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Xcode9.3Project.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 6CC5669E209BEADF00B8D501 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 6CC566A0209BEAE100B8D501 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 6CC566A3209BEAE100B8D501 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 6CC566A5209BEAE100B8D501 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 6CC566A6209BEAE100B8D501 /* Xcode9_3Project.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Xcode9_3Project.entitlements; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 6CC56698209BEADF00B8D501 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 6CC56692209BEADF00B8D501 = { + isa = PBXGroup; + children = ( + 6CC5669D209BEADF00B8D501 /* Xcode9.3Project */, + 6CC5669C209BEADF00B8D501 /* Products */, + ); + sourceTree = ""; + }; + 6CC5669C209BEADF00B8D501 /* Products */ = { + isa = PBXGroup; + children = ( + 6CC5669B209BEADF00B8D501 /* Xcode9.3Project.app */, + ); + name = Products; + sourceTree = ""; + }; + 6CC5669D209BEADF00B8D501 /* Xcode9.3Project */ = { + isa = PBXGroup; + children = ( + 6CC5669E209BEADF00B8D501 /* AppDelegate.swift */, + 6CC566A0209BEAE100B8D501 /* Assets.xcassets */, + 6CC566A2209BEAE100B8D501 /* MainMenu.xib */, + 6CC566A5209BEAE100B8D501 /* Info.plist */, + 6CC566A6209BEAE100B8D501 /* Xcode9_3Project.entitlements */, + ); + path = Xcode9.3Project; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 6CC5669A209BEADF00B8D501 /* Xcode9.3Project */ = { + isa = PBXNativeTarget; + buildConfigurationList = 6CC566A9209BEAE100B8D501 /* Build configuration list for PBXNativeTarget "Xcode9.3Project" */; + buildPhases = ( + 6CC56697209BEADF00B8D501 /* Sources */, + 6CC56698209BEADF00B8D501 /* Frameworks */, + 6CC56699209BEADF00B8D501 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Xcode9.3Project; + productName = Xcode9.3Project; + productReference = 6CC5669B209BEADF00B8D501 /* Xcode9.3Project.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 6CC56693209BEADF00B8D501 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0930; + LastUpgradeCheck = 0930; + ORGANIZATIONNAME = "g-Off.net"; + TargetAttributes = { + 6CC5669A209BEADF00B8D501 = { + CreatedOnToolsVersion = 9.3; + }; + }; + }; + buildConfigurationList = 6CC56696209BEADF00B8D501 /* Build configuration list for PBXProject "Xcode9.3Project" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 6CC56692209BEADF00B8D501; + productRefGroup = 6CC5669C209BEADF00B8D501 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 6CC5669A209BEADF00B8D501 /* Xcode9.3Project */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 6CC56699209BEADF00B8D501 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6CC566A1209BEAE100B8D501 /* Assets.xcassets in Resources */, + 6CC566A4209BEAE100B8D501 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 6CC56697209BEADF00B8D501 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6CC5669F209BEADF00B8D501 /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 6CC566A2209BEAE100B8D501 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 6CC566A3209BEAE100B8D501 /* Base */, + ); + name = MainMenu.xib; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 6CC566A7209BEAE100B8D501 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.13; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 6CC566A8209BEAE100B8D501 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.13; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 6CC566AA209BEAE100B8D501 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = Xcode9.3Project/Xcode9_3Project.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Xcode9.3Project/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + OTHER_CFLAGS = ( + "-DHELLO=1", + "-DDEBUG", + ); + PRODUCT_BUNDLE_IDENTIFIER = "net.g-Off.Xcode9-3Project"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.0; + }; + name = Debug; + }; + 6CC566AB209BEAE100B8D501 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = Xcode9.3Project/Xcode9_3Project.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Xcode9.3Project/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + OTHER_CFLAGS = ( + "-DHELLO=1", + "-DDEBUG", + ); + PRODUCT_BUNDLE_IDENTIFIER = "net.g-Off.Xcode9-3Project"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.0; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 6CC56696209BEADF00B8D501 /* Build configuration list for PBXProject "Xcode9.3Project" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6CC566A7209BEAE100B8D501 /* Debug */, + 6CC566A8209BEAE100B8D501 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 6CC566A9209BEAE100B8D501 /* Build configuration list for PBXNativeTarget "Xcode9.3Project" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6CC566AA209BEAE100B8D501 /* Debug */, + 6CC566AB209BEAE100B8D501 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 6CC56693209BEADF00B8D501 /* Project object */; +} diff --git a/Tests/XcodeProjectTests/Fixtures/Xcode9.3Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Tests/XcodeProjectTests/Fixtures/Xcode9.3Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..9c42150 --- /dev/null +++ b/Tests/XcodeProjectTests/Fixtures/Xcode9.3Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Tests/XcodeProjectTests/Fixtures/Xcode9.3Project.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Tests/XcodeProjectTests/Fixtures/Xcode9.3Project.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Tests/XcodeProjectTests/Fixtures/Xcode9.3Project.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + +