Skip to content

Commit

Permalink
Integrate parallelizable scheme DSL option.
Browse files Browse the repository at this point in the history
  • Loading branch information
dnkoutso committed Jun 7, 2022
1 parent d18f493 commit 04664ea
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

##### Enhancements

* Integrate `parallelizable` scheme DSL option.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#11399](https://github.com/CocoaPods/CocoaPods/pull/11399)

* Use `${DEVELOPMENT_LANGUAGE}` as the default `CFBundleDevelopmentRegion` value in any generated `Info.plist`.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10950](https://github.com/CocoaPods/CocoaPods/pull/10950)
Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GIT

GIT
remote: https://github.com/CocoaPods/Core.git
revision: fdc8a5d86c87ed30cf71ca16d4812d21da5add9b
revision: 8058017931ad9d4e0b2dc5f560ede864e9915677
branch: master
specs:
cocoapods-core (1.11.3)
Expand Down Expand Up @@ -127,7 +127,7 @@ PATH
cocoapods-downloader (>= 1.6.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
Expand All @@ -143,7 +143,7 @@ GEM
specs:
CFPropertyList (3.0.5)
rexml
activesupport (5.2.7)
activesupport (5.2.8)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -167,7 +167,7 @@ GEM
pry (= 0.10.3)
coderay (1.1.3)
colored2 (3.1.2)
concurrent-ruby (1.1.9)
concurrent-ruby (1.1.10)
cork (0.3.0)
colored2 (~> 3.1)
crack (0.4.5)
Expand Down Expand Up @@ -230,7 +230,7 @@ GEM
sparkr (>= 0.2.0)
term-ansicolor
yard (~> 0.9.12)
json (2.6.1)
json (2.6.2)
kicker (3.0.0)
listen (~> 1.3.0)
notify (~> 0.5.2)
Expand Down Expand Up @@ -268,7 +268,7 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
public_suffix (4.0.6)
public_suffix (4.0.7)
rainbow (2.2.2)
rake
rake (12.3.3)
Expand Down
3 changes: 3 additions & 0 deletions lib/cocoapods/installer/xcode/pods_project_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,9 @@ def configure_schemes_for_pod_target(project, pod_target, share_scheme, generato
if scheme_configuration.key?(:code_coverage)
scheme.test_action.code_coverage_enabled = scheme_configuration[:code_coverage]
end
if scheme_configuration.key?(:parallelizable)
scheme.test_action.testables.each { |testable| testable.parallelizable = scheme_configuration[:parallelizable] }
end

hosted_test_specs_by_host[spec].each do |hosted_spec|
# We are an app spec which hosts this test spec.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,8 @@ class Xcode
@coconut_spec.scheme = { :launch_arguments => ['Arg1'] }
@coconut_test_spec.scheme = { :launch_arguments => ['TestArg1'],
:environment_variables => { 'Key1' => 'Val1' },
:code_coverage => true }
:code_coverage => true,
:parallelizable => true }
@generator.installation_options.
stubs(:share_schemes_for_development_pods).
returns(true)
Expand Down Expand Up @@ -739,6 +740,7 @@ class Xcode
{ :key => 'Key1', :value => 'Val1', :enabled => true },
]
test_scheme.test_action.code_coverage_enabled?.should.be.true
test_scheme.test_action.testables.each { |testable| testable.parallelizable?.should.be.true }
test_scheme.launch_action.macro_expansions.empty?.should.be.false
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,8 @@ class Xcode
@coconut_spec.scheme = { :launch_arguments => ['Arg1'] }
@coconut_test_spec.scheme = { :launch_arguments => ['TestArg1'],
:environment_variables => { 'Key1' => 'Val1' },
:code_coverage => true }
:code_coverage => true,
:parallelizable => true }
@generator.installation_options.
stubs(:share_schemes_for_development_pods).
returns(true)
Expand Down Expand Up @@ -519,6 +520,7 @@ class Xcode
{ :key => 'Key1', :value => 'Val1', :enabled => true },
]
test_scheme.test_action.code_coverage_enabled?.should.be.true
test_scheme.test_action.testables.each { |testable| testable.parallelizable?.should.be.true }
end

it 'adds the test bundle to the test action of the app host when using app specs' do
Expand Down

0 comments on commit 04664ea

Please sign in to comment.