Skip to content

Commit 38a0889

Browse files
committed
Updated rakefile to conform to json gem changes, removed the build setup for the old Java gem, replaced the load path special variable with a more readable alternative
1 parent abb48ad commit 38a0889

4 files changed

Lines changed: 5 additions & 20 deletions

File tree

rakefile

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# THE SOFTWARE.
2121
#
2222

23-
$: << File.expand_path(File.join(File.dirname(__FILE__)))
23+
$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__)))
2424

2525
require 'rubygems'
2626
require 'rubygems/package_task'
@@ -39,25 +39,10 @@ softlayer_api_gem = Gem::Specification.new do |s|
3939
s.files = FileList["README.textile", "LICENSE.textile", "lib/**/*.rb", "test/**/*.rb", "examples/**/*.rb"]
4040
s.require_path = "lib"
4141
s.has_rdoc = true
42-
s.add_runtime_dependency 'json', '~> 1.5', '>= 1.5.2'
42+
s.add_runtime_dependency 'json', '~> 1.8', '>= 1.8.1'
4343
s.license = %q{MIT}
4444
end
4545

46-
softlayer_api_jruby_gem = Gem::Specification.new do |s|
47-
s.platform = Gem::Platform::RUBY
48-
s.name = %q{softlayer_api_jruby}
49-
s.version = SoftLayer::VERSION
50-
s.author = "SoftLayer Development Team"
51-
s.email = %q{sldn@softlayer.com}
52-
s.homepage = %q{http://sldn.softlayer.com/}
53-
s.summary = %q{Library for accessing the SoftLayer portal API through JRuby}
54-
s.description = %q{The softlayer_api_jruby gem offers a convenient mechanism for invoking the services of the SoftLayer API from JRuby.}
55-
s.files = FileList["README.textile", "LICENSE.textile", "lib/**/*.rb", "test/**/*.rb", "examples/**/*.rb"]
56-
s.require_path = "lib"
57-
s.has_rdoc = true
58-
s.add_dependency("json-jruby")
59-
end
60-
6146
Gem::PackageTask.new(softlayer_api_gem) do |pkg|
6247
end
6348

test/SoftLayer_APIParameterFilter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# THE SOFTWARE.
2121
#
2222

23-
$: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
23+
$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
2424

2525
require 'rubygems'
2626
require 'softlayer_api'

test/SoftLayer_Service.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# THE SOFTWARE.
2121
#
2222

23-
$: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
23+
$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
2424

2525
require 'rubygems'
2626
require 'softlayer_api'

test/SoftLayer_ToObjectMask.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# THE SOFTWARE.
2121
#
2222

23-
$: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
23+
$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
2424

2525
require 'rubygems'
2626
require 'softlayer_api'

0 commit comments

Comments
 (0)