Skip to content

Commit

Permalink
Depend on the released adapter gems
Browse files Browse the repository at this point in the history
  • Loading branch information
Dawa Ometto committed May 24, 2023
1 parent 5e9966b commit a51a7a5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 0 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions gollum-lib.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion gollum-lib_java.gemspec
Original file line number Diff line number Diff line change
@@ -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")

0 comments on commit a51a7a5

Please sign in to comment.