Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d203b465f3d6
Choose a base ref
...
head repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 89e9e1870348
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 29, 2017

  1. [refactor] work-around on BN#to_s impl which has been due JRuby 1.6

    @kares
    kares committed Oct 29, 2017
    Copy the full SHA
    66b4da3 View commit details

  2. [travis-ci] setup some tests with JDK 9 + adjust allowe failures

    @kares
    kares committed Oct 29, 2017
    Copy the full SHA
    89e9e18 View commit details
Showing with 19 additions and 13 deletions.
  1. +13 −5 .travis.yml
  2. +6 −8 src/main/java/org/jruby/ext/openssl/BN.java
18 changes: 13 additions & 5 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,12 @@ sudo: false
jdk:
- openjdk7
- oraclejdk8

addons:
apt:
packages:
- oracle-java9-installer

env:
- TEST_PROFILE=test-1.7.20
- TEST_PROFILE=test-1.7.26
@@ -16,11 +22,7 @@ script: if [[ -v TEST_COMMAND ]]; then $TEST_COMMAND; else mvn verify -P $TEST_P

matrix:
allow_failures:
#- env: TEST_PROFILE=test-1.7.22 # seems as an embed loading bug (same with 1.7.23)
- env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-1.7.24
- env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby-1.7.21
- jdk: oraclejdk9
include:
- jdk: openjdk7
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -S rake test" BUNDLE_INSTALL=true
@@ -38,6 +40,12 @@ matrix:
- jdk: openjdk7
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn verify -P test-1.7.26" BUNDLE_INSTALL=true RUBY_MAVEN_VERSION=3.3.8
rvm: jruby-1.7.26
- jdk: oraclejdk9
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -S rake test" BUNDLE_INSTALL=true
rvm: jruby-9.1.13.0
- jdk: oraclejdk9
env: TEST_COMMAND="jruby -rbundler/setup -S rmvn test-compile && jruby -S rake test" BUNDLE_INSTALL=true
rvm: jruby-head
#
- jdk: oraclejdk8
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
14 changes: 6 additions & 8 deletions src/main/java/org/jruby/ext/openssl/BN.java
View file
Original file line number Diff line number Diff line change
@@ -178,22 +178,20 @@ public IRubyObject copy(IRubyObject other) {
return this;
}

@JRubyMethod(name = "to_s", rest = true, optional = 1)
@Deprecated
public RubyString to_s(IRubyObject[] args) {
int argc = Arity.checkArgumentCount(getRuntime(), args, 0, 1);
return to_s( argc == 1 ? RubyNumeric.num2int(args[0]) : 10 );
}

// 1.6.8 can not handle - this way :

@Override
//@JRubyMethod(name = "to_s")
@JRubyMethod(name = "to_s")
public RubyString to_s() { return to_s(10); }

//@JRubyMethod(name = "to_s")
//public RubyString to_s(IRubyObject base) {
// return to_s( RubyNumeric.num2int(base) );
//}
@JRubyMethod(name = "to_s")
public RubyString to_s(IRubyObject base) {
return to_s( RubyNumeric.num2int(base) );
}

private RubyString to_s(final int base) {
final Ruby runtime = getRuntime();