Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
6fb29d43
Commit
6fb29d43
authored
Sep 06, 2017
by
Justin Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure a unique ID is generated when specs with resource bundles exist in more than one pod target
parent
38391fc7
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
CHANGELOG.md
CHANGELOG.md
+4
-0
pod_target_installer.rb
...ller/xcode/pods_project_generator/pod_target_installer.rb
+0
-1
pod_target_installer_spec.rb
...xcode/pods_project_generator/pod_target_installer_spec.rb
+2
-2
No files found.
CHANGELOG.md
View file @
6fb29d43
...
...
@@ -30,6 +30,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
*
Ensure a unique ID is generated for each resource bundle
[
Justin Martin
](
https://github.com/justinseanmartin
)
[
#7015
](
https://github.com/CocoaPods/CocoaPods/pull/7015
)
*
Do not include settings from file accessors of test specs into aggregate xcconfigs
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#7019
](
https://github.com/CocoaPods/CocoaPods/pull/7019
)
...
...
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
View file @
6fb29d43
...
...
@@ -226,7 +226,6 @@ module Pod
bundle_target
.
product_reference
.
tap
do
|
bundle_product
|
bundle_file_name
=
"
#{
bundle_name
}
.bundle"
bundle_product
.
name
=
bundle_file_name
bundle_product
.
path
=
bundle_file_name
end
filter_resource_file_references
(
paths
)
do
|
resource_phase_refs
,
compile_phase_refs
|
...
...
spec/unit/installer/xcode/pods_project_generator/pod_target_installer_spec.rb
View file @
6fb29d43
...
...
@@ -400,7 +400,7 @@ module Pod
it
'adds the resource bundle targets'
do
@bundle_target
.
should
.
be
.
an
.
instance_of
Xcodeproj
::
Project
::
Object
::
PBXNativeTarget
@bundle_target
.
product_reference
.
name
.
should
==
'banana_bundle.bundle'
@bundle_target
.
product_reference
.
path
.
should
==
'banana_bundle.bundle'
@bundle_target
.
product_reference
.
path
.
should
==
'
BananaLib-Pods-SampleProject-
banana_bundle.bundle'
@bundle_target
.
platform_name
.
should
==
:ios
@bundle_target
.
deployment_target
.
should
==
'4.3'
end
...
...
@@ -468,7 +468,7 @@ module Pod
it
'adds the resource bundle targets'
do
@bundle_target
.
should
.
be
.
an
.
instance_of
Xcodeproj
::
Project
::
Object
::
PBXNativeTarget
@bundle_target
.
product_reference
.
name
.
should
==
'banana_bundle.bundle'
@bundle_target
.
product_reference
.
path
.
should
==
'banana_bundle.bundle'
@bundle_target
.
product_reference
.
path
.
should
==
'
BananaLib-
banana_bundle.bundle'
end
it
'adds the build configurations to the resources bundle targets'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment