summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2012-02-10 22:00:15 +0100
committerFlorian Frank <flori@ping.de>2012-02-11 09:46:07 +0100
commit5dcf0f9ecd09888245f3d0a64967989ed7a1e775 (patch)
tree333ab321e84dbc125b3ba12fb29f55bd079c7504
parentc93d679936aa5658c700b5c84367211e84b16238 (diff)
downloadjson-5dcf0f9ecd09888245f3d0a64967989ed7a1e775.tar.gz
configure travis
-rw-r--r--.gitignore2
-rw-r--r--.travis.yml7
-rw-r--r--Gemfile4
-rw-r--r--json.gemspec2
-rw-r--r--json_pure.gemspec2
5 files changed, 8 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 726ffce..274ea4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ pkg
java/Json.iml
Gemfile.lock
.rvmrc
+*.rbc
+.rbx
diff --git a/.travis.yml b/.travis.yml
index cb74e2d..e77e37b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,11 @@ rvm:
- 1.8.7
- 1.9.2
- 1.9.3
- - rbx
- - rbx-2.0
+ - rbx-18mode
+ - rbx-19mode
- ree
- - jruby
+ - jruby-18mode
+ - jruby-19mode
- ruby-head
script: "bundle exec rake"
diff --git a/Gemfile b/Gemfile
index e289c37..0beb1f0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,3 @@ gemspec :name => 'json-java'
group :development do
gem 'simplecov', :platform => :mri_19
end
-
-group :test do
- gem 'test-unit', :platform => :mri_19
-end
diff --git a/json.gemspec b/json.gemspec
index 3869c4d..ec92d11 100644
--- a/json.gemspec
+++ b/json.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Florian Frank"]
- s.date = "2012-01-15"
+ s.date = "2012-02-10"
s.description = "This is a JSON implementation as a Ruby extension in C."
s.email = "flori@ping.de"
s.extensions = ["ext/json/ext/parser/extconf.rb", "ext/json/ext/generator/extconf.rb"]
diff --git a/json_pure.gemspec b/json_pure.gemspec
index 7e83339..af00b7b 100644
--- a/json_pure.gemspec
+++ b/json_pure.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Florian Frank"]
- s.date = "2012-01-15"
+ s.date = "2012-02-10"
s.description = "This is a JSON implementation in pure Ruby."
s.email = "flori@ping.de"
s.extra_rdoc_files = ["README.rdoc"]