Skip to content

Commit

Permalink
Update Puma dependency to ~> 3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
Minku Lee committed Sep 12, 2017
1 parent 69b2160 commit 5b321d9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
sudo: false
dist: precise
dist: trusty
matrix:
allow_failures:
- rvm: ruby-head
Expand All @@ -13,7 +13,7 @@ matrix:
- rvm: 2.4.1
- rvm: ruby-head
gemfile: 'gemfiles/Gemfile.ruby-head'
- rvm: jruby-9.1.12.0
- rvm: jruby-9.1.13.0
env: JRUBY_OPTS="--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -Xcompile.invokedynamic=false -J-Xmx1536m -J-XX:MaxPermSize=192m"

bundler_args: "--binstubs --jobs=3 --retry=3"
Expand Down
2 changes: 1 addition & 1 deletion gemstash.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ you push your own private gems as well."
spec.add_runtime_dependency "faraday", "~> 0.9"
spec.add_runtime_dependency "faraday_middleware", "~> 0.10"
spec.add_runtime_dependency "lru_redux", "~> 1.1"
spec.add_runtime_dependency "puma", "~> 2.14"
spec.add_runtime_dependency "puma", "~> 3.10"
spec.add_runtime_dependency "server_health_check-rack", "~> 0.1"
spec.add_runtime_dependency "sequel", "~> 4.26"
spec.add_runtime_dependency "sinatra", "~> 1.4"
Expand Down
3 changes: 2 additions & 1 deletion spec/support/test_gemstash_server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def initialize(port: nil, config: nil)
$test_gemstash_server_env = @env
# rubocop:enable Style/GlobalVars
@puma_cli = Puma::CLI.new(args)

TestGemstashServer.servers << self
end

Expand Down Expand Up @@ -53,7 +54,7 @@ def start
def stop
return if @stopped
@stopped = true
@puma_cli.halt
@puma_cli.launcher.stop
end

def join
Expand Down

0 comments on commit 5b321d9

Please sign in to comment.