Skip to content

Commit 0f120c7

Browse files
arielvalentinarielvalentin
committed
squash: remove bundler conflicts
1 parent 238be90 commit 0f120c7

File tree

59 files changed

+48
-60
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+48
-60
lines changed

‎.github/actions/test_gem/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ runs:
115115
for i in `bundle exec appraisal list | sed 's/-/_/g' `; do
116116
echo "::group::🔎 Appraising ${i}"
117117
bundle install --gemfile=gemfiles/${i}.gemfile --jobs=3 --retry=4
118-
bundle exec --gemfile=gemfiles/${i}.gemfile rake test
118+
bundle exec --gemfile=gemfiles/${i}.gemfile rake test
119119
echo "::endgroup::"
120120
done
121121
else

‎.instrumentation_generator/templates/gemspec.tt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
2929
spec.add_dependency 'opentelemetry-instrumentation-base', '~> <%= instrumentation_base_version %>'
3030

3131
spec.add_development_dependency 'appraisal', '~> 2.5'
32-
spec.add_development_dependency 'bundler', '~> 2.4'
32+
3333
spec.add_development_dependency 'minitest', '~> 5.0'
3434
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
3535
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions

‎helpers/mysql/opentelemetry-helpers-mysql.gemspec‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
2828
spec.add_dependency 'opentelemetry-api', '~> 1.0'
2929
spec.add_dependency 'opentelemetry-common', '~> 0.21'
3030

31-
spec.add_development_dependency 'bundler', '~> 2.4'
3231
spec.add_development_dependency 'minitest', '~> 5.0'
3332
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
3433
spec.add_development_dependency 'rake', '~> 13.0'

‎helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
2727

2828
spec.add_dependency 'opentelemetry-common', '~> 0.21'
2929

30-
spec.add_development_dependency 'bundler', '~> 2.4'
3130
spec.add_development_dependency 'minitest', '~> 5.0'
3231
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
3332
spec.add_development_dependency 'rake', '~> 13.0'

‎helpers/sql/opentelemetry-helpers-sql.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
2828
spec.add_dependency 'opentelemetry-api', '~> 1.4.0'
2929

3030
spec.add_development_dependency 'appraisal', '~> 2.5'
31-
spec.add_development_dependency 'bundler', '~> 2.4'
31+
3232
spec.add_development_dependency 'minitest', '~> 5.0'
3333
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
3434
spec.add_development_dependency 'rake', '~> 13.0'

‎instrumentation/action_mailer/opentelemetry-instrumentation-action_mailer.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
3030
spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
3131

3232
spec.add_development_dependency 'appraisal', '~> 2.5'
33-
spec.add_development_dependency 'bundler', '~> 2.4'
33+
3434
spec.add_development_dependency 'minitest', '~> 5.0'
3535
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
3636
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'

‎instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
3030
spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.21'
3131

3232
spec.add_development_dependency 'appraisal', '~> 2.5'
33-
spec.add_development_dependency 'bundler', '~> 2.4'
33+
3434
spec.add_development_dependency 'minitest', '~> 5.0'
3535
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
3636
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'

‎instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
3030
spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
3131

3232
spec.add_development_dependency 'appraisal', '~> 2.5'
33-
spec.add_development_dependency 'bundler', '~> 2.4'
33+
3434
spec.add_development_dependency 'minitest', '~> 5.0'
3535
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
3636
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'

‎instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
2929
spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
3030

3131
spec.add_development_dependency 'appraisal', '~> 2.5'
32-
spec.add_development_dependency 'bundler', '~> 2.4'
32+
3333
spec.add_development_dependency 'minitest', '~> 5.0'
3434
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
3535
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'

0 commit comments

Comments
 (0)