Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump last known versions. #253

Merged
merged 7 commits into from
Apr 27, 2015
Merged

Bump last known versions. #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
09f5bd6
[Constants] Bump last known versions.
neonichu Mar 24, 2015
e589f49
Add 6.3 project fixture
neonichu Apr 20, 2015
50b2f0b
Bump latest known versions
neonichu Apr 20, 2015
8a17a18
Introduce default object version, defaults to the 3.2 format.
neonichu Apr 20, 2015
96a7f1a
Tests 6.3 formatted projects can be opened.
neonichu Apr 20, 2015
18bc495
Allow providing an optional object version param.
neonichu Apr 20, 2015
7c37e41
[Changelog] 6.3 project compatibility.
neonichu Apr 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Xcodeproj Changelog

## Master

##### Enhancements

* Support for Xcode 6.3 compatible projects.
[Boris Bügling](https://github.com/neonichu)
[Xcodeproj#253](https://github.com/CocoaPods/Xcodeproj/pull/253)


## 0.24.0

##### Enhancements
Expand Down
11 changes: 7 additions & 4 deletions lib/xcodeproj/constants.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,26 @@ module Xcodeproj
module Constants
# @return [String] The last known iOS SDK (stable).
#
LAST_KNOWN_IOS_SDK = '7.1'
LAST_KNOWN_IOS_SDK = '8.3'

# @return [String] The last known OS X SDK (stable).
#
LAST_KNOWN_OSX_SDK = '10.9'
LAST_KNOWN_OSX_SDK = '10.10'

# @return [String] The last known archive version to Xcodeproj.
#
LAST_KNOWN_ARCHIVE_VERSION = 1

# @return [String] The default object version for Xcodeproj.
DEFAULT_OBJECT_VERSION = 46

# @return [String] The last known object version to Xcodeproj.
#
LAST_KNOWN_OBJECT_VERSION = 46
LAST_KNOWN_OBJECT_VERSION = 47

# @return [String] The last known object version to Xcodeproj.
#
LAST_UPGRADE_CHECK = '0510'
LAST_UPGRADE_CHECK = '0640'

# @return [Hash] The all the known ISAs grouped by superclass.
#
Expand Down
6 changes: 4 additions & 2 deletions lib/xcodeproj/project.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,20 @@ class Project
# The path provided will be expanded to an absolute path.
# @param [Bool] skip_initialization
# Wether the project should be initialized from scratch.
# @param [Int] object_version
# Object version to use for serialization, defaults to Xcode 3.2 compatible.
#
# @example Creating a project
# Project.new("path/to/Project.xcodeproj")
#
def initialize(path, skip_initialization = false)
def initialize(path, skip_initialization = false, object_version = Constants::DEFAULT_OBJECT_VERSION)
@path = Pathname.new(path).expand_path
@objects_by_uuid = {}
@generated_uuids = []
@available_uuids = []
unless skip_initialization
initialize_from_scratch
@object_version = object_version.to_s
end
unless skip_initialization.is_a?(TrueClass) || skip_initialization.is_a?(FalseClass)
raise ArgumentError, '[Xcodeproj] Initialization parameter expected to ' \
Expand Down Expand Up @@ -163,7 +166,6 @@ def to_s
#
def initialize_from_scratch
@archive_version = Constants::LAST_KNOWN_ARCHIVE_VERSION.to_s
@object_version = Constants::LAST_KNOWN_OBJECT_VERSION.to_s
@classes = {}

root_object.remove_referrer(self) if root_object
Expand Down
4,013 changes: 4,013 additions & 0 deletions spec/fixtures/Sample Project/6.3-format.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions ...fixtures/Sample Project/6.3-format.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

161 changes: 161 additions & 0 deletions ...res/Sample Project/6.3-format.xcodeproj/xcshareddata/xcschemes/Cocoa Application.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E525238B16245A900012E2BA"
BuildableName = "Cocoa Application.app"
BlueprintName = "Cocoa Application"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E52523B216245A910012E2BA"
BuildableName = "Cocoa ApplicationTests.octest"
BlueprintName = "Cocoa ApplicationTests"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E525238B16245A900012E2BA"
BuildableName = "Cocoa Application.app"
BlueprintName = "Cocoa Application"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "YES"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "YES"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E525238B16245A900012E2BA"
BuildableName = "Cocoa Application.app"
BlueprintName = "Cocoa Application"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "Some argument"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
<EnvironmentVariables>
<EnvironmentVariable
key = "Some Environment Variable"
value = ""
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
<AdditionalOption
key = "MallocStackLogging"
value = ""
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "DYLD_INSERT_LIBRARIES"
value = "/usr/lib/libgmalloc.dylib"
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "DYLD_PRINT_LIBRARIES"
value = ""
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "USERBREAK"
value = "1"
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "DYLD_PRINT_APIS"
value = ""
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "NSZombieEnabled"
value = "YES"
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "NSDOLoggingEnabled"
value = "YES"
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "AUTO_LOG_ALL"
value = ""
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "MallocGuardEdges"
value = ""
isEnabled = "YES">
</AdditionalOption>
<AdditionalOption
key = "MallocScribble"
value = ""
isEnabled = "YES">
</AdditionalOption>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E525238B16245A900012E2BA"
BuildableName = "Cocoa Application.app"
BlueprintName = "Cocoa Application"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
136 changes: 136 additions & 0 deletions ...t/6.3-format.xcodeproj/xcshareddata/xcschemes/iOS application and static library.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E52523F316245AB20012E2BA"
BuildableName = "iOS application.app"
BlueprintName = "iOS application"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "806F6FB517EFAF46001051EE"
BuildableName = "libiOS staticLibrary.a"
BlueprintName = "iOS staticLibrary"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "806F6FC217EFAF47001051EE"
BuildableName = "iOS staticLibraryTests.xctest"
BlueprintName = "iOS staticLibraryTests"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E525241E16245AB20012E2BA"
BuildableName = "iOS applicationTests.octest"
BlueprintName = "iOS applicationTests"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "806F6FC217EFAF47001051EE"
BuildableName = "iOS staticLibraryTests.xctest"
BlueprintName = "iOS staticLibraryTests"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E52523F316245AB20012E2BA"
BuildableName = "iOS application.app"
BlueprintName = "iOS application"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E52523F316245AB20012E2BA"
BuildableName = "iOS application.app"
BlueprintName = "iOS application"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E52523F316245AB20012E2BA"
BuildableName = "iOS application.app"
BlueprintName = "iOS application"
ReferencedContainer = "container:Cocoa Application.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading