diff --git a/Gemfile b/Gemfile index 24f2b80c..8da7c073 100644 --- a/Gemfile +++ b/Gemfile @@ -3,10 +3,7 @@ gemspec :name => 'gollum-lib' gem 'irb' if RUBY_PLATFORM == 'java' then - gem 'gollum-rjgit_adapter', git: 'https://github.com/dometto/gollum-lib_rjgit_adapter', branch: 'tree_find_blob' group :development do gem 'activesupport', '~> 6.0' end -else - gem 'gollum-rugged_adapter', git: 'https://github.com/gollum/rugged_adapter' end diff --git a/gollum-lib.gemspec b/gollum-lib.gemspec index 3411abb0..7348e652 100644 --- a/gollum-lib.gemspec +++ b/gollum-lib.gemspec @@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb') # This file needs to conditionally define the default adapter for MRI and Java, because this is the file that is included from the Gemfile. # In addition, the default Java adapter needs to be defined in gollum-lib_java.gemspec beause that file is used to *build* the Java gem. if RUBY_PLATFORM == 'java' then - default_adapter = ['gollum-rjgit_adapter', '~> 1.0'] + default_adapter = ['gollum-rjgit_adapter', '~> 2.0'] else - default_adapter = ['gollum-rugged_adapter', '~> 2.0'] + default_adapter = ['gollum-rugged_adapter', '~> 3.0'] end Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter) diff --git a/gollum-lib_java.gemspec b/gollum-lib_java.gemspec index 8db08747..62772a08 100644 --- a/gollum-lib_java.gemspec +++ b/gollum-lib_java.gemspec @@ -1,4 +1,4 @@ require File.join(File.dirname(__FILE__), 'gemspec.rb') require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb') -default_adapter = ['gollum-rjgit_adapter', '~> 1.0'] +default_adapter = ['gollum-rjgit_adapter', '~> 2.0'] Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter, "java")