Skip to content

Commit 30e8f50

Browse files
committed
handle incorrect version number matching
1 parent 91e1eff commit 30e8f50

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

jruby-openssl.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
55

66
version_rb = File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
77
version_rb = File.read(version_rb)
8-
s.version = version_rb.match( /.*VERSION\s*=\s*['"](.*)['"]/m )[1]
8+
s.version = version_rb.match( /.*\sVERSION\s*=\s*['"](.*)['"]/ )[1]
99

1010
s.platform = 'java'
1111
s.authors = ['Ola Bini', 'JRuby contributors']
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
2222
select { |f| f =~ /^(lib)/ || f =~ /^History|LICENSE|README|Rakefile/i } +
2323
Dir.glob('lib/**/*.jar') # 'lib/jopenssl.jar' and potentially BC jars
2424

25-
bc_version = version_rb.match( /.*BOUNCY_CASTLE_VERSION\s*=\s*['"](.*)['"]/m )[1]
25+
bc_version = version_rb.match( /.*\sBOUNCY_CASTLE_VERSION\s*=\s*['"](.*)['"]/ )[1]
2626
raise 'BOUNCY_CASTLE_VERSION not matched' if (bc_version || '').empty?
2727

2828
s.requirements << "jar org.bouncycastle:bcpkix-jdk15on, #{bc_version}"

0 commit comments

Comments
 (0)