Skip to content

Commit a1b5dcc

Browse files
nebhalenebhale
committed
Dependency Updates
Signed-off-by: Ben Hale <[email protected]>
1 parent f5fc61d commit a1b5dcc

File tree

6 files changed

+62
-68
lines changed

6 files changed

+62
-68
lines changed

‎.idea/codeStyles/Project.xml‎

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

‎Gemfile.lock‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.6.0)
5-
public_suffix (>= 2.0.2, < 4.0)
4+
addressable (2.7.0)
5+
public_suffix (>= 2.0.2, < 5.0)
66
ast (2.4.0)
77
crack (0.4.3)
88
safe_yaml (~> 1.0.0)
99
diff-lcs (1.3)
1010
hashdiff (1.0.0)
1111
jaro_winkler (1.5.3)
12-
parallel (1.17.0)
13-
parser (2.6.3.0)
12+
parallel (1.18.0)
13+
parser (2.6.5.0)
1414
ast (~> 2.4.0)
15-
public_suffix (3.1.1)
15+
public_suffix (4.0.1)
1616
rainbow (3.0.0)
17-
rake (12.3.2)
18-
redcarpet (3.4.0)
19-
rspec (3.8.0)
20-
rspec-core (~> 3.8.0)
21-
rspec-expectations (~> 3.8.0)
22-
rspec-mocks (~> 3.8.0)
23-
rspec-core (3.8.2)
24-
rspec-support (~> 3.8.0)
25-
rspec-expectations (3.8.4)
17+
rake (13.0.0)
18+
redcarpet (3.5.0)
19+
rspec (3.9.0)
20+
rspec-core (~> 3.9.0)
21+
rspec-expectations (~> 3.9.0)
22+
rspec-mocks (~> 3.9.0)
23+
rspec-core (3.9.0)
24+
rspec-support (~> 3.9.0)
25+
rspec-expectations (3.9.0)
2626
diff-lcs (>= 1.2.0, < 2.0)
27-
rspec-support (~> 3.8.0)
28-
rspec-mocks (3.8.1)
27+
rspec-support (~> 3.9.0)
28+
rspec-mocks (3.9.0)
2929
diff-lcs (>= 1.2.0, < 2.0)
30-
rspec-support (~> 3.8.0)
31-
rspec-support (3.8.2)
32-
rubocop (0.72.0)
30+
rspec-support (~> 3.9.0)
31+
rspec-support (3.9.0)
32+
rubocop (0.75.1)
3333
jaro_winkler (~> 1.5.1)
3434
parallel (~> 1.10)
3535
parser (>= 2.6)
3636
rainbow (>= 2.2.2, < 4.0)
3737
ruby-progressbar (~> 1.7)
3838
unicode-display_width (>= 1.4.0, < 1.7)
39-
rubocop-rspec (1.33.0)
40-
rubocop (>= 0.60.0)
39+
rubocop-rspec (1.36.0)
40+
rubocop (>= 0.68.1)
4141
ruby-progressbar (1.10.1)
42-
rubyzip (1.2.3)
42+
rubyzip (1.3.0)
4343
safe_yaml (1.0.5)
4444
tee (1.0.0)
4545
terminal-table (1.8.0)
4646
unicode-display_width (~> 1.1, >= 1.1.1)
4747
unicode-display_width (1.6.0)
48-
webmock (3.6.0)
48+
webmock (3.7.6)
4949
addressable (>= 2.3.6)
5050
crack (>= 0.3.2)
5151
hashdiff (>= 0.4.0, < 2.0.0)

‎java-buildpack.iml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -267,33 +267,33 @@
267267
</content>
268268
<orderEntry type="jdk" jdkName="rbenv: 2.3.8" jdkType="RUBY_SDK" />
269269
<orderEntry type="sourceFolder" forTests="false" />
270-
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.6.0, rbenv: 2.3.8) [gem]" level="application" />
270+
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.7.0, rbenv: 2.3.8) [gem]" level="application" />
271271
<orderEntry type="library" scope="PROVIDED" name="ast (v2.4.0, rbenv: 2.3.8) [gem]" level="application" />
272272
<orderEntry type="library" scope="PROVIDED" name="bundler (v2.0.2, rbenv: 2.3.8) [gem]" level="application" />
273273
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.3, rbenv: 2.3.8) [gem]" level="application" />
274274
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, rbenv: 2.3.8) [gem]" level="application" />
275275
<orderEntry type="library" scope="PROVIDED" name="hashdiff (v1.0.0, rbenv: 2.3.8) [gem]" level="application" />
276276
<orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.3, rbenv: 2.3.8) [gem]" level="application" />
277-
<orderEntry type="library" scope="PROVIDED" name="parallel (v1.17.0, rbenv: 2.3.8) [gem]" level="application" />
278-
<orderEntry type="library" scope="PROVIDED" name="parser (v2.6.3.0, rbenv: 2.3.8) [gem]" level="application" />
279-
<orderEntry type="library" scope="PROVIDED" name="public_suffix (v3.1.1, rbenv: 2.3.8) [gem]" level="application" />
277+
<orderEntry type="library" scope="PROVIDED" name="parallel (v1.18.0, rbenv: 2.3.8) [gem]" level="application" />
278+
<orderEntry type="library" scope="PROVIDED" name="parser (v2.6.5.0, rbenv: 2.3.8) [gem]" level="application" />
279+
<orderEntry type="library" scope="PROVIDED" name="public_suffix (v4.0.1, rbenv: 2.3.8) [gem]" level="application" />
280280
<orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, rbenv: 2.3.8) [gem]" level="application" />
281-
<orderEntry type="library" scope="PROVIDED" name="rake (v12.3.2, rbenv: 2.3.8) [gem]" level="application" />
282-
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.4.0, rbenv: 2.3.8) [gem]" level="application" />
283-
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.8.0, rbenv: 2.3.8) [gem]" level="application" />
284-
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.8.2, rbenv: 2.3.8) [gem]" level="application" />
285-
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.8.4, rbenv: 2.3.8) [gem]" level="application" />
286-
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.8.1, rbenv: 2.3.8) [gem]" level="application" />
287-
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.8.2, rbenv: 2.3.8) [gem]" level="application" />
288-
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.72.0, rbenv: 2.3.8) [gem]" level="application" />
289-
<orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v1.33.0, rbenv: 2.3.8) [gem]" level="application" />
281+
<orderEntry type="library" scope="PROVIDED" name="rake (v13.0.0, rbenv: 2.3.8) [gem]" level="application" />
282+
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.5.0, rbenv: 2.3.8) [gem]" level="application" />
283+
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.9.0, rbenv: 2.3.8) [gem]" level="application" />
284+
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.9.0, rbenv: 2.3.8) [gem]" level="application" />
285+
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.9.0, rbenv: 2.3.8) [gem]" level="application" />
286+
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.9.0, rbenv: 2.3.8) [gem]" level="application" />
287+
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.9.0, rbenv: 2.3.8) [gem]" level="application" />
288+
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.75.1, rbenv: 2.3.8) [gem]" level="application" />
289+
<orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v1.36.0, rbenv: 2.3.8) [gem]" level="application" />
290290
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.10.1, rbenv: 2.3.8) [gem]" level="application" />
291-
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.2.3, rbenv: 2.3.8) [gem]" level="application" />
291+
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.3.0, rbenv: 2.3.8) [gem]" level="application" />
292292
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.5, rbenv: 2.3.8) [gem]" level="application" />
293293
<orderEntry type="library" scope="PROVIDED" name="tee (v1.0.0, rbenv: 2.3.8) [gem]" level="application" />
294294
<orderEntry type="library" scope="PROVIDED" name="terminal-table (v1.8.0, rbenv: 2.3.8) [gem]" level="application" />
295295
<orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.6.0, rbenv: 2.3.8) [gem]" level="application" />
296-
<orderEntry type="library" scope="PROVIDED" name="webmock (v3.6.0, rbenv: 2.3.8) [gem]" level="application" />
296+
<orderEntry type="library" scope="PROVIDED" name="webmock (v3.7.6, rbenv: 2.3.8) [gem]" level="application" />
297297
<orderEntry type="library" scope="PROVIDED" name="yard (v0.9.20, rbenv: 2.3.8) [gem]" level="application" />
298298
</component>
299299
<component name="RModuleSettingsStorage">

‎lib/java_buildpack/buildpack_version.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ def initialize(should_log = true)
6464
# @return [Hash] a representation of the buildpack version
6565
def to_hash
6666
h = {}
67-
6867
h['hash'] = @hash if @hash
6968
h['offline'] = @offline if @offline
7069
h['remote'] = @remote if @remote

‎spec/java_buildpack/jre/open_jdk_like_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131

3232
let(:java_home) { JavaBuildpack::Component::MutableJavaHome.new }
3333

34-
let(:version_7) { VERSION_7 = JavaBuildpack::Util::TokenizedVersion.new('1.7.0_+') }
34+
let(:version_7) { JavaBuildpack::Util::TokenizedVersion.new('1.7.0_+') }
3535

36-
let(:version_8) { VERSION_8 = JavaBuildpack::Util::TokenizedVersion.new('1.8.0_+') }
36+
let(:version_8) { JavaBuildpack::Util::TokenizedVersion.new('1.8.0_+') }
3737

3838
let(:configuration) do
3939
{ 'jre' => jre_configuration,
@@ -99,7 +99,7 @@ def supports?
9999
end
100100

101101
def sub_configuration_context(configuration)
102-
c = context.clone
102+
c = context.clone
103103
c[:configuration] = configuration
104104
c
105105
end

‎spec/java_buildpack/util/format_duration_spec.rb‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,35 @@
2020

2121
describe 'duration' do # rubocop:disable RSpec/DescribeClass
2222

23+
let(:millisecond) { 0.001 }
24+
let(:tenth) { 100 * millisecond }
25+
let(:second) { 10 * tenth }
26+
let(:minute) { 60 * second }
27+
let(:hour) { 60 * minute }
28+
2329
it 'displays seconds' do
24-
expect_time_string '0.0s', MILLISECOND
25-
expect_time_string '0.1s', TENTH
26-
expect_time_string '1.0s', SECOND
27-
expect_time_string '1.1s', SECOND + TENTH
28-
expect_time_string '1.1s', SECOND + TENTH + MILLISECOND
30+
expect_time_string '0.0s', millisecond
31+
expect_time_string '0.1s', tenth
32+
expect_time_string '1.0s', second
33+
expect_time_string '1.1s', second + tenth
34+
expect_time_string '1.1s', second + tenth + millisecond
2935
end
3036

3137
it 'displays minutes' do
32-
expect_time_string '1m 0s', MINUTE
33-
expect_time_string '1m 1s', MINUTE + SECOND
34-
expect_time_string '1m 1s', MINUTE + SECOND + TENTH
35-
expect_time_string '1m 1s', MINUTE + SECOND + TENTH + MILLISECOND
38+
expect_time_string '1m 0s', minute
39+
expect_time_string '1m 1s', minute + second
40+
expect_time_string '1m 1s', minute + second + tenth
41+
expect_time_string '1m 1s', minute + second + tenth + millisecond
3642
end
3743

3844
it 'displays hours' do
39-
expect_time_string '1h 0m', HOUR
40-
expect_time_string '1h 1m', HOUR + MINUTE
41-
expect_time_string '1h 1m', HOUR + MINUTE + SECOND
42-
expect_time_string '1h 1m', HOUR + MINUTE + SECOND + TENTH
43-
expect_time_string '1h 1m', HOUR + MINUTE + SECOND + TENTH + MILLISECOND
45+
expect_time_string '1h 0m', hour
46+
expect_time_string '1h 1m', hour + minute
47+
expect_time_string '1h 1m', hour + minute + second
48+
expect_time_string '1h 1m', hour + minute + second + tenth
49+
expect_time_string '1h 1m', hour + minute + second + tenth + millisecond
4450
end
4551

46-
private
47-
48-
MILLISECOND = 0.001
49-
50-
TENTH = 100 * MILLISECOND
51-
52-
SECOND = 10 * TENTH
53-
54-
MINUTE = 60 * SECOND
55-
56-
HOUR = 60 * MINUTE
57-
5852
def expect_time_string(expected, time)
5953
expect(time.duration).to eq(expected)
6054
end

0 commit comments

Comments
 (0)