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
8326ec07
Commit
8326ec07
authored
Apr 19, 2018
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[BuildSettings] Rename subclasses to include the word "Settings"
parent
47be0099
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
13 deletions
+13
-13
pod_target_installer.rb
...ller/xcode/pods_project_generator/pod_target_installer.rb
+1
-1
aggregate_target.rb
lib/cocoapods/target/aggregate_target.rb
+1
-1
build_settings.rb
lib/cocoapods/target/build_settings.rb
+2
-2
pod_target.rb
lib/cocoapods/target/pod_target.rb
+1
-1
aggregate_target_settings_spec.rb
...t/target/build_settings/aggregate_target_settings_spec.rb
+6
-6
pod_target_settings_spec.rb
spec/unit/target/build_settings/pod_target_settings_spec.rb
+0
-0
build_settings_spec.rb
spec/unit/target/build_settings_spec.rb
+2
-2
No files found.
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
View file @
8326ec07
...
...
@@ -426,7 +426,7 @@ module Pod
def
create_test_xcconfig_files
(
test_native_targets
,
test_resource_bundle_targets
)
target
.
supported_test_types
.
each
do
|
test_type
|
path
=
target
.
xcconfig_path
(
test_type
.
to_s
)
update_changed_file
(
Target
::
BuildSettings
::
Pod
.
new
(
target
,
true
),
path
)
update_changed_file
(
Target
::
BuildSettings
::
Pod
TargetSettings
.
new
(
target
,
true
),
path
)
xcconfig_file_ref
=
add_file_to_support_group
(
path
)
test_native_targets
.
each
do
|
test_target
|
...
...
lib/cocoapods/target/aggregate_target.rb
View file @
8326ec07
...
...
@@ -320,7 +320,7 @@ module Pod
settings
=
{}
user_build_configurations
.
each_key
do
|
configuration_name
|
settings
[
configuration_name
]
=
BuildSettings
::
Aggregate
.
new
(
self
,
configuration_name
)
settings
[
configuration_name
]
=
BuildSettings
::
Aggregate
TargetSettings
.
new
(
self
,
configuration_name
)
end
settings
...
...
lib/cocoapods/target/build_settings.rb
View file @
8326ec07
...
...
@@ -412,7 +412,7 @@ module Pod
end
# A subclass that generates build settings for a {PodTarget}
class
Pod
<
BuildSettings
class
Pod
TargetSettings
<
BuildSettings
#-------------------------------------------------------------------------#
# @!group Public API
...
...
@@ -785,7 +785,7 @@ module Pod
end
# A subclass that generates build settings for a `PodTarget`
class
Aggregate
<
BuildSettings
class
Aggregate
TargetSettings
<
BuildSettings
#-------------------------------------------------------------------------#
# @!group Public API
...
...
lib/cocoapods/target/pod_target.rb
View file @
8326ec07
...
...
@@ -612,7 +612,7 @@ module Pod
end
def
create_build_settings
BuildSettings
::
Pod
.
new
(
self
,
false
)
BuildSettings
::
Pod
TargetSettings
.
new
(
self
,
false
)
end
end
end
spec/unit/target/build_settings/aggregate_spec.rb
→
spec/unit/target/build_settings/aggregate_
target_settings_
spec.rb
View file @
8326ec07
...
...
@@ -3,7 +3,7 @@ require File.expand_path('../../../../spec_helper', __FILE__)
module
Pod
class
Target
class
BuildSettings
describe
Aggregate
do
describe
Aggregate
TargetSettings
do
def
specs
[
fixture_spec
(
'banana-lib/BananaLib.podspec'
)]
end
...
...
@@ -22,7 +22,7 @@ module Pod
unless
@specs
.
empty?
@target
.
target_definition
.
whitelist_pod_for_configuration
(
@specs
.
first
.
name
,
'Release'
)
end
@generator
=
Aggregate
.
new
(
@target
,
'Release'
)
@generator
=
Aggregate
TargetSettings
.
new
(
@target
,
'Release'
)
end
shared
'Aggregate'
do
...
...
@@ -175,7 +175,7 @@ module Pod
end
it
'does not links the pod targets with the aggregate target for non-whitelisted configuration'
do
@generator
=
Aggregate
.
new
(
@target
,
'Debug'
)
@generator
=
Aggregate
TargetSettings
.
new
(
@target
,
'Debug'
)
@xcconfig
=
@generator
.
generate
@xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
.
not
.
include
'-l"Pods-BananaLib"'
end
...
...
@@ -215,9 +215,9 @@ module Pod
:product_basename
=>
'PodTarget'
,
:target_definitions
=>
[
target_definition
],
)
pod_target
.
stubs
(
:build_settings
=>
Pod
.
new
(
pod_target
,
false
))
pod_target
.
stubs
(
:build_settings
=>
Pod
TargetSettings
.
new
(
pod_target
,
false
))
aggregate_target
=
fixture_aggregate_target
([
pod_target
])
@generator
=
Aggregate
.
new
(
aggregate_target
,
'Debug'
)
@generator
=
Aggregate
TargetSettings
.
new
(
aggregate_target
,
'Debug'
)
@generator
.
other_ldflags
.
should
==
%w(-ObjC -l"StaticLibrary" -l"VendoredDyld" -l"xml2" -framework "PodTarget" -framework "StaticFramework" -framework "VendoredFramework" -framework "XCTest")
end
end
...
...
@@ -526,7 +526,7 @@ module Pod
describe
'an empty pod target'
do
before
do
@blank_target
=
fixture_aggregate_target
@generator
=
Aggregate
.
new
(
@blank_target
,
'Release'
)
@generator
=
Aggregate
TargetSettings
.
new
(
@blank_target
,
'Release'
)
end
it
'it should not have any framework search paths'
do
...
...
spec/unit/target/build_settings/pod_spec.rb
→
spec/unit/target/build_settings/pod_
target_settings_
spec.rb
View file @
8326ec07
This diff is collapsed.
Click to expand it.
spec/unit/target/build_settings_spec.rb
View file @
8326ec07
...
...
@@ -4,11 +4,11 @@ module Pod
class
Target
describe
BuildSettings
do
def
pod
(
pod_target
,
test_xcconfig
=
false
)
BuildSettings
::
Pod
.
new
(
pod_target
,
test_xcconfig
)
BuildSettings
::
Pod
TargetSettings
.
new
(
pod_target
,
test_xcconfig
)
end
def
aggregate
(
aggregate_target
,
configuration_name
=
'Release'
)
BuildSettings
::
Aggregate
.
new
(
aggregate_target
,
configuration_name
)
BuildSettings
::
Aggregate
TargetSettings
.
new
(
aggregate_target
,
configuration_name
)
end
describe
'memoization'
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