Skip to content

Commit

Permalink
Merge pull request #429 from BuddyBuild/BBFixRegressionWithProductRef
Browse files Browse the repository at this point in the history 
Fix regression resulting in projects existing product refs being altered
  • Loading branch information
@segiddins
segiddins authored Oct 14, 2016
2 parents 8d21748 + e621fa7 commit d21b7d0
Show file tree
Hide file tree
Showing 10 changed files with 4,578 additions and 2 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

##### Bug Fixes

* None.
* Fix regression resulting in projects existing product ref groups being altered
[Rashin Arab](https://github.com/rasharab)
[#429](https://github.com/CocoaPods/Xcodeproj/pull/429)


## 1.3.2 (2016-10-10)
Expand Down
4 changes: 3 additions & 1 deletion lib/xcodeproj/project.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,9 @@ def initialize_from_file
if object_version.to_i > Constants::LAST_KNOWN_OBJECT_VERSION
raise '[Xcodeproj] Unknown object version.'
end
root_object.product_ref_group = root_object.main_group['Products'] || root_object.main_group.new_group('Products')

# Projects can have product_ref_groups that are not listed in the main_groups["Products"]
root_object.product_ref_group ||= root_object.main_group['Products'] || root_object.main_group.new_group('Products')
end

public
Expand Down
4,013 changes: 4,013 additions & 0 deletions spec/fixtures/Cocoa Application With productRefGroup.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions ...a Application With productRefGroup.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file

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

164 changes: 164 additions & 0 deletions ...lication With productRefGroup.xcodeproj/xcshareddata/xcschemes/Cocoa Application.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
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
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<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>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "YES"
ignoresPersistentStateOnLaunch = "YES"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
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
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
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>
139 changes: 139 additions & 0 deletions ...ductRefGroup.xcodeproj/xcshareddata/xcschemes/iOS application and static library.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
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
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<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>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
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
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
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

0 comments on commit d21b7d0

Please sign in to comment.