projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to bundler 2.0.2
[arvados.git]
/
services
/
login-sync
/
arvados-login-sync.gemspec
diff --git
a/services/login-sync/arvados-login-sync.gemspec
b/services/login-sync/arvados-login-sync.gemspec
index f2c5735985a7131129c38469e2183ffb70ef10f6..36e5ed925283676d28f53a51e021bbfe118925de 100644
(file)
--- a/
services/login-sync/arvados-login-sync.gemspec
+++ b/
services/login-sync/arvados-login-sync.gemspec
@@
-2,12
+2,12
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
-if not File.exist
s
?('/usr/bin/git') then
+if not File.exist?('/usr/bin/git') then
STDERR.puts "\nGit binary not found, aborting. Please install git and run gem build from a checked out copy of the git repository.\n\n"
exit
end
STDERR.puts "\nGit binary not found, aborting. Please install git and run gem build from a checked out copy of the git repository.\n\n"
exit
end
-git_latest_tag = `git
describe --abbrev=0
`
+git_latest_tag = `git
tag -l |sort -V -r |head -n1
`
git_latest_tag = git_latest_tag.encode('utf-8').strip
git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H .`.chomp.split(":")
git_timestamp = Time.at(git_timestamp.to_i).utc
git_latest_tag = git_latest_tag.encode('utf-8').strip
git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H .`.chomp.split(":")
git_timestamp = Time.at(git_timestamp.to_i).utc
@@
-24,7
+24,9
@@
Gem::Specification.new do |s|
s.files = ["bin/arvados-login-sync", "agpl-3.0.txt"]
s.executables << "arvados-login-sync"
s.required_ruby_version = '>= 2.1.0'
s.files = ["bin/arvados-login-sync", "agpl-3.0.txt"]
s.executables << "arvados-login-sync"
s.required_ruby_version = '>= 2.1.0'
- s.add_runtime_dependency 'arvados', '~> 1.2.0', '>= 1.2.0'
+ s.add_runtime_dependency 'arvados', '~> 1.3.0', '>= 1.3.0'
+ # arvados-google-api-client 0.8.7.2 is incompatible with faraday 0.16.2
+ s.add_dependency('faraday', '< 0.16')
s.homepage =
'https://arvados.org'
end
s.homepage =
'https://arvados.org'
end