Merge pull request #127 from rtyler/upgrade-scala-dependency

Upgrade scala dependency

.gitignore

@@ -13,3 +13,4 @@ tmp/
 Gemfile.lock
 Jarfile.lock
 .jbundler/
+lib/hermann_jars.rb

.travis.yml

@@ -1,10 +1,16 @@
 language: ruby
+sudo: false
 rvm:
 - ruby-head
 - 2.1
 - 1.9.3
 - jruby
 - ree
+
+# upgrading bundler since our gemspec relying on lib/hermann_jars.rb being
+# present causes troubles with bundler .17.x
+before_install:
+    - gem install bundler -N --version ">= 1.8.0"
 #deploy:
 #  provider: rubygems
 #  gemspec: hermann.gemspec

hermann.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/lookout/Hermann'
   s.licenses = ['MIT']
 
-  s.files = [ "Rakefile"]
+  s.files = ['Rakefile']
   s.files += `git ls-files -- lib`.split($\)
   s.files += `git ls-files -- ext`.split($\)
 
@@ -28,15 +28,16 @@ Gem::Specification.new do |s|
   s.add_dependency 'thread_safe', '~> 0.3.4'
 
   if RUBY_PLATFORM == "java"
+    s.files << 'lib/hermann_jars.rb'
     s.add_dependency 'concurrent-ruby', '~> 0.7.0'
 
     # IMPORTANT: make sure that jar-dependencies is only a development
     # dependency of your gem. if it is a runtime dependencies the require_jars
     # file will be overwritten during installation.
     s.add_dependency 'jar-dependencies', ['~> 0.1', '>= 0.1.10']
-    s.requirements << "jar org.apache.kafka:kafka_2.10, ~>0.8.1.1"
+    s.requirements << "jar org.apache.kafka:kafka_2.11, ~> 0.8.2.2"
     # use log4j-1.2.16+ to as 1.2.15 declares deps which are not in maven central and causes the dep resolution to fail
-    s.requirements << "jar log4j:log4j, ~>1.2.16"
+    s.requirements << "jar log4j:log4j, ~> 1.2.16"
     s.require_paths = ["lib"]
     s.platform = 'java'
   else