Merge pull request #10 from jwillemsen/master

Update ruby dependencies
RemedyIT · Dec 4, 2019 · ce15647 · ce15647
2 parents 641d5ca + 1552134
commit ce15647
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/mkrf_conf_srcgem.rb b/mkrf_conf_srcgem.rb
@@ -138,7 +138,7 @@
     end
     inst = Gem::DependencyInstaller.new
     begin
-      inst.install "taosource", ">= 6.1.8"
+      inst.install "taosource", ">= 6.5.7"
     rescue
       $stderr.puts 'Failed to install taosource gem.'
       exit(1)

diff --git a/rakelib/gem.rake b/rakelib/gem.rake
@@ -75,7 +75,7 @@ namespace :r2corba do
           gem.extensions = ['mkrf_conf_taogem.rb']
           gem.require_paths = %w{lib}
           gem.executables = []
-          gem.required_ruby_version = '>= 1.9.3'
+          gem.required_ruby_version = '>= 2.0'
           gem.licenses = ['ACE']
         end
         R2CORBA::Gem.build_gem(gemspec)
@@ -96,12 +96,16 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
     gem.extensions = ['mkrf_conf_srcgem.rb']
     gem.require_paths = %w{lib}
     gem.executables = %w{ridlc rins r2corba}
-    gem.required_ruby_version = '>= 1.9.3'
+    gem.required_ruby_version = '>= 2.0'
     gem.licenses = ['R2CORBA', 'ACE', 'GPL']
     gem.require_paths << 'ext'
     gem.add_dependency 'ridl', '~> 2.5'
     gem.add_dependency 'rake', '~> 10.0'
     gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
+    gem.metadata = {
+      "bug_tracker_uri"   => "https://github.com/RemedyIT/r2corba/issues",
+      "source_code_uri"   => "https://github.com/RemedyIT/r2corba"
+    }
   end
   R2CORBA::Gem.build_gem(gemspec)
 end
@@ -131,11 +135,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
       gem.extensions = []
       gem.require_paths = %w{ext}
       gem.executables = []
-      if R2CORBA::Config.rb_ver_major < 2
-        gem.required_ruby_version = '>= 1.9.3'
-      else
-        gem.required_ruby_version = '>= 2.0.0'
-      end
+      gem.required_ruby_version = '>= 2.0.0'
       gem.licenses = ['R2CORBA', 'ACE']
       gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so'
     end
@@ -213,7 +213,7 @@ unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
       gem.require_paths = %w{lib}
       gem.executables = []
       gem.extensions = []
-      gem.required_ruby_version = '>= 1.9.3'
+      gem.required_ruby_version = '>= 2.0'
       gem.licenses = ['R2CORBA']
     end
     R2CORBA::Gem.build_gem(gemspec)

diff --git a/scripts/rake-taogem.rb b/scripts/rake-taogem.rb
@@ -48,7 +48,7 @@ def self.build_gem
     gem.require_paths = %w{lib}
     gem.executables = []
     #gem.platform = Gem::Platform::CURRENT
-    gem.required_ruby_version = '>= 1.8.6'
+    gem.required_ruby_version = '>= 2.0'
     gem.licenses = ['ACE']
   end
 end