Skip to content

Commit a9ddbfb

Browse files
committed
Dependency Updates
This change updates the dependencies in the buildpack. It also makes all changes required by the upgrade to Rubocop.
1 parent 67863bf commit a9ddbfb

File tree

223 files changed

+78
-291
lines changed

Some content is hidden

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

223 files changed

+78
-291
lines changed

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ AllCops:
77
- 'rakelib/**/*'
88
Exclude:
99
- 'build/**/*'
10+
- Gemfile # TODO: Remove when upgrading to any version after 0.48.1
1011
Metrics/AbcSize:
1112
Max: 22
1213
Metrics/BlockLength:
@@ -45,6 +46,8 @@ Style/EmptyLinesAroundClassBody:
4546
Enabled: false
4647
Style/EmptyLinesAroundModuleBody:
4748
Enabled: false
49+
Style/IndentHeredoc: # TODO: Remove when dropping 2.2.x support
50+
Enabled: false
4851
Style/MethodMissing:
4952
Enabled: false
5053
Style/MultilineOperationIndentation:

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.6
1+
2.2.7

Gemfile.lock

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.5.0)
4+
addressable (2.5.1)
55
public_suffix (~> 2.0, >= 2.0.2)
66
ast (2.3.0)
77
crack (0.4.3)
@@ -12,7 +12,8 @@ GEM
1212
ast (~> 2.2)
1313
powerpack (0.1.1)
1414
public_suffix (2.0.5)
15-
rainbow (2.2.1)
15+
rainbow (2.2.2)
16+
rake
1617
rake (12.0.0)
1718
redcarpet (3.4.0)
1819
rspec (3.5.0)
@@ -28,24 +29,24 @@ GEM
2829
diff-lcs (>= 1.2.0, < 2.0)
2930
rspec-support (~> 3.5.0)
3031
rspec-support (3.5.0)
31-
rubocop (0.47.1)
32+
rubocop (0.48.1)
3233
parser (>= 2.3.3.1, < 3.0)
3334
powerpack (~> 0.1)
3435
rainbow (>= 1.99.1, < 3.0)
3536
ruby-progressbar (~> 1.7)
3637
unicode-display_width (~> 1.0, >= 1.0.1)
37-
rubocop-rspec (1.12.0)
38+
rubocop-rspec (1.15.0)
3839
rubocop (>= 0.42.0)
3940
ruby-progressbar (1.8.1)
4041
rubyzip (1.2.1)
4142
safe_yaml (1.0.4)
4243
tee (1.0.0)
43-
unicode-display_width (1.1.3)
44-
webmock (2.3.2)
44+
unicode-display_width (1.2.1)
45+
webmock (3.0.1)
4546
addressable (>= 2.3.6)
4647
crack (>= 0.3.2)
4748
hashdiff
48-
yard (0.9.8)
49+
yard (0.9.9)
4950

5051
PLATFORMS
5152
ruby
@@ -62,4 +63,4 @@ DEPENDENCIES
6263
yard
6364

6465
BUNDLED WITH
65-
1.14.5
66+
1.14.6

Rakefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Encoding: utf-8
21
# Cloud Foundry Java Buildpack
32
# Copyright 2013-2017 the original author or authors.
43
#
@@ -42,4 +41,4 @@ Package::StageBuildpackTask.new(Dir['bin/**/*', 'config/**/*', 'lib/**/*', 'reso
4241
.reject { |f| File.directory? f })
4342
Package::PackageTask.new
4443

45-
task default: %w(rubocop check_api_doc spec)
44+
task default: %w[rubocop check_api_doc spec]

bin/compile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env ruby
2-
# Encoding: utf-8
32
# Cloud Foundry Java Buildpack
43
# Copyright 2013-2017 the original author or authors.
54
#

bin/detect

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env ruby
2-
# Encoding: utf-8
32
# Cloud Foundry Java Buildpack
43
# Copyright 2013-2017 the original author or authors.
54
#

bin/release

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env ruby
2-
# Encoding: utf-8
32
# Cloud Foundry Java Buildpack
43
# Copyright 2013-2017 the original author or authors.
54
#

java-buildpack.iml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -265,34 +265,34 @@
265265
<excludeFolder url="file://$MODULE_DIR$/build" />
266266
<excludeFolder url="file://$MODULE_DIR$/doc" />
267267
</content>
268-
<orderEntry type="jdk" jdkName="rbenv: 2.2.6" jdkType="RUBY_SDK" />
268+
<orderEntry type="jdk" jdkName="rbenv: 2.2.7" jdkType="RUBY_SDK" />
269269
<orderEntry type="sourceFolder" forTests="false" />
270-
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.5.0, rbenv: 2.2.6) [gem]" level="application" />
271-
<orderEntry type="library" scope="PROVIDED" name="ast (v2.3.0, rbenv: 2.2.6) [gem]" level="application" />
272-
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.14.6, rbenv: 2.2.6) [gem]" level="application" />
273-
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.3, rbenv: 2.2.6) [gem]" level="application" />
274-
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, rbenv: 2.2.6) [gem]" level="application" />
275-
<orderEntry type="library" scope="PROVIDED" name="hashdiff (v0.3.2, rbenv: 2.2.6) [gem]" level="application" />
276-
<orderEntry type="library" scope="PROVIDED" name="parser (v2.4.0.0, rbenv: 2.2.6) [gem]" level="application" />
277-
<orderEntry type="library" scope="PROVIDED" name="powerpack (v0.1.1, rbenv: 2.2.6) [gem]" level="application" />
278-
<orderEntry type="library" scope="PROVIDED" name="public_suffix (v2.0.5, rbenv: 2.2.6) [gem]" level="application" />
279-
<orderEntry type="library" scope="PROVIDED" name="rainbow (v2.2.1, rbenv: 2.2.6) [gem]" level="application" />
280-
<orderEntry type="library" scope="PROVIDED" name="rake (v12.0.0, rbenv: 2.2.6) [gem]" level="application" />
281-
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.4.0, rbenv: 2.2.6) [gem]" level="application" />
282-
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.5.0, rbenv: 2.2.6) [gem]" level="application" />
283-
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.5.4, rbenv: 2.2.6) [gem]" level="application" />
284-
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.5.0, rbenv: 2.2.6) [gem]" level="application" />
285-
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.5.0, rbenv: 2.2.6) [gem]" level="application" />
286-
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.5.0, rbenv: 2.2.6) [gem]" level="application" />
287-
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.47.1, rbenv: 2.2.6) [gem]" level="application" />
288-
<orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v1.12.0, rbenv: 2.2.6) [gem]" level="application" />
289-
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.8.1, rbenv: 2.2.6) [gem]" level="application" />
290-
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.2.1, rbenv: 2.2.6) [gem]" level="application" />
291-
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.4, rbenv: 2.2.6) [gem]" level="application" />
292-
<orderEntry type="library" scope="PROVIDED" name="tee (v1.0.0, rbenv: 2.2.6) [gem]" level="application" />
293-
<orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.1.3, rbenv: 2.2.6) [gem]" level="application" />
294-
<orderEntry type="library" scope="PROVIDED" name="webmock (v2.3.2, rbenv: 2.2.6) [gem]" level="application" />
295-
<orderEntry type="library" scope="PROVIDED" name="yard (v0.9.8, rbenv: 2.2.6) [gem]" level="application" />
270+
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.5.1, rbenv: 2.2.7) [gem]" level="application" />
271+
<orderEntry type="library" scope="PROVIDED" name="ast (v2.3.0, rbenv: 2.2.7) [gem]" level="application" />
272+
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.14.6, rbenv: 2.2.7) [gem]" level="application" />
273+
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.3, rbenv: 2.2.7) [gem]" level="application" />
274+
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, rbenv: 2.2.7) [gem]" level="application" />
275+
<orderEntry type="library" scope="PROVIDED" name="hashdiff (v0.3.2, rbenv: 2.2.7) [gem]" level="application" />
276+
<orderEntry type="library" scope="PROVIDED" name="parser (v2.4.0.0, rbenv: 2.2.7) [gem]" level="application" />
277+
<orderEntry type="library" scope="PROVIDED" name="powerpack (v0.1.1, rbenv: 2.2.7) [gem]" level="application" />
278+
<orderEntry type="library" scope="PROVIDED" name="public_suffix (v2.0.5, rbenv: 2.2.7) [gem]" level="application" />
279+
<orderEntry type="library" scope="PROVIDED" name="rainbow (v2.2.2, rbenv: 2.2.7) [gem]" level="application" />
280+
<orderEntry type="library" scope="PROVIDED" name="rake (v12.0.0, rbenv: 2.2.7) [gem]" level="application" />
281+
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.4.0, rbenv: 2.2.7) [gem]" level="application" />
282+
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.5.0, rbenv: 2.2.7) [gem]" level="application" />
283+
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.5.4, rbenv: 2.2.7) [gem]" level="application" />
284+
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.5.0, rbenv: 2.2.7) [gem]" level="application" />
285+
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.5.0, rbenv: 2.2.7) [gem]" level="application" />
286+
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.5.0, rbenv: 2.2.7) [gem]" level="application" />
287+
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.48.1, rbenv: 2.2.7) [gem]" level="application" />
288+
<orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v1.15.0, rbenv: 2.2.7) [gem]" level="application" />
289+
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.8.1, rbenv: 2.2.7) [gem]" level="application" />
290+
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.2.1, rbenv: 2.2.7) [gem]" level="application" />
291+
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.4, rbenv: 2.2.7) [gem]" level="application" />
292+
<orderEntry type="library" scope="PROVIDED" name="tee (v1.0.0, rbenv: 2.2.7) [gem]" level="application" />
293+
<orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.2.1, rbenv: 2.2.7) [gem]" level="application" />
294+
<orderEntry type="library" scope="PROVIDED" name="webmock (v3.0.1, rbenv: 2.2.7) [gem]" level="application" />
295+
<orderEntry type="library" scope="PROVIDED" name="yard (v0.9.9, rbenv: 2.2.7) [gem]" level="application" />
296296
</component>
297297
<component name="RModuleSettingsStorage">
298298
<LOAD_PATH number="4" string0="$MODULE_DIR$/lib" string1="$MODULE_DIR$/spec" string2="$MODULE_DIR$/bin" string3="$MODULE_DIR$/spec/bin" />

0 commit comments

Comments
 (0)