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
b16a3341
Commit
b16a3341
authored
Oct 26, 2017
by
Dimitris Koutsogiorgas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set language to Swift for test native targets if any dependencies use Swift
parent
0714e1d4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
CHANGELOG.md
CHANGELOG.md
+4
-0
pod_target_installer.rb
...ller/xcode/pods_project_generator/pod_target_installer.rb
+2
-2
No files found.
CHANGELOG.md
View file @
b16a3341
...
@@ -12,6 +12,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -12,6 +12,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
##### Bug Fixes
*
Set language to Swift for test native targets if any dependencies use Swift
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#7170
](
https://github.com/CocoaPods/CocoaPods/issues/7170
)
*
Prevent multiple script phases from stripping vendored dSYM
*
Prevent multiple script phases from stripping vendored dSYM
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#7166
](
https://github.com/CocoaPods/CocoaPods/pull/7166
)
[
#7166
](
https://github.com/CocoaPods/CocoaPods/pull/7166
)
...
...
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
View file @
b16a3341
...
@@ -242,7 +242,7 @@ module Pod
...
@@ -242,7 +242,7 @@ module Pod
product_type
=
target
.
product_type_for_test_type
(
test_type
)
product_type
=
target
.
product_type_for_test_type
(
test_type
)
name
=
target
.
test_target_label
(
test_type
)
name
=
target
.
test_target_label
(
test_type
)
platform_name
=
target
.
platform
.
name
platform_name
=
target
.
platform
.
name
language
=
target
.
uses_swift?
?
:
swift
:
:objc
language
=
target
.
all_test_dependent_targets
.
any?
(
&
:uses_swift?
)
?
:
swift
:
:objc
native_test_target
=
project
.
new_target
(
product_type
,
name
,
platform_name
,
deployment_target
,
nil
,
language
)
native_test_target
=
project
.
new_target
(
product_type
,
name
,
platform_name
,
deployment_target
,
nil
,
language
)
native_test_target
.
product_reference
.
name
=
name
native_test_target
.
product_reference
.
name
=
name
...
@@ -431,7 +431,7 @@ module Pod
...
@@ -431,7 +431,7 @@ module Pod
#
#
def
test_target_swift_debug_hack
(
test_target_bc
)
def
test_target_swift_debug_hack
(
test_target_bc
)
return
unless
test_target_bc
.
debug?
return
unless
test_target_bc
.
debug?
return
unless
[
target
,
*
target
.
recursive_dependent_targets
]
.
any?
(
&
:uses_swift?
)
return
unless
target
.
all_test_dependent_targets
.
any?
(
&
:uses_swift?
)
ldflags
=
test_target_bc
.
build_settings
[
'OTHER_LDFLAGS'
]
||=
'$(inherited)'
ldflags
=
test_target_bc
.
build_settings
[
'OTHER_LDFLAGS'
]
||=
'$(inherited)'
ldflags
<<
' -lswiftSwiftOnoneSupport'
ldflags
<<
' -lswiftSwiftOnoneSupport'
end
end
...
...
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