diff --git a/.travis.yml b/.travis.yml
index 0e4c89e..e1bbdce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,15 @@ script: "bundle exec rspec spec"
env:
- CI=true
rvm:
- - 2.0
- - 2.1
- - 2.2.4
- - 2.3.0
- - jruby-9.0.4.0
- - rbx-2
+ - 2.2
+ - 2.3
+ - 2.4
+ - jruby-9
+ - rbx-3
cache: bundler
sudo: false
matrix:
allow_failures:
- - rvm: rbx-2
+ - rvm: jruby-9
+ - rvm: rbx-3
+dist: trusty
diff --git a/Gemfile b/Gemfile
index cf5f8c8..ef5de3b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,22 +2,21 @@ source "http://rubygems.org"
gemspec
-gem 'rdf', github: "ruby-rdf/rdf", branch: "develop"
-gem 'rdf-turtle', github: "ruby-rdf/rdf-turtle", branch: "develop"
-gem 'ebnf', github: "gkellogg/ebnf", branch: "develop"
+gem 'rdf', git: "https://github.com/ruby-rdf/rdf", branch: "develop"
+gem 'rdf-turtle', git: "https://github.com/ruby-rdf/rdf-turtle", branch: "develop"
+gem 'ebnf', git: "https://github.com/gkellogg/ebnf", branch: "develop"
group :development do
- gem "wirble"
gem "byebug", platforms: :mri
gem 'psych', platforms: [:mri, :rbx]
end
group :development, :test do
- gem 'json-ld', github: "ruby-rdf/json-ld", branch: "develop"
- gem 'rdf-spec', github: "ruby-rdf/rdf-spec", branch: "develop"
- gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic", branch: "develop"
- gem 'rdf-vocab', github: "ruby-rdf/rdf-vocab", branch: "develop"
- gem 'sxp', github: "gkellogg/sxp-ruby", branch: "develop"
+ gem 'json-ld', git: "https://github.com/ruby-rdf/json-ld", branch: "develop"
+ gem 'rdf-spec', git: "https://github.com/ruby-rdf/rdf-spec", branch: "develop"
+ gem 'rdf-isomorphic', git: "https://github.com/ruby-rdf/rdf-isomorphic", branch: "develop"
+ gem 'rdf-vocab', git: "https://github.com/ruby-rdf/rdf-vocab", branch: "develop"
+ gem 'sxp', git: "https://github.com/dryruby/sxp.rb", branch: "develop"
gem "redcarpet", platform: :ruby
gem 'simplecov', require: false, platform: :mri
gem 'coveralls', require: false, platform: :mri
diff --git a/README.md b/README.md
index aa8b0b0..a67dda3 100755
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ There is a new `:stream` option to {RDF::TriG::Writer} which is more efficient f
## Dependencies
-* [Ruby](http://ruby-lang.org/) (>= 2.0)
+* [Ruby](http://ruby-lang.org/) (>= 2.2.2)
* [RDF.rb](http://rubygems.org/gems/rdf) (~> 2.0)
* [rdf-turtle](http://rubygems.org/gems/rdf-turtle) (~> 2.0)
diff --git a/VERSION b/VERSION
index 227cea2..ccbccc3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0
+2.2.0
diff --git a/dependencyci.yml b/dependencyci.yml
new file mode 100644
index 0000000..0c67c1b
--- /dev/null
+++ b/dependencyci.yml
@@ -0,0 +1,5 @@
+platform:
+ Rubygems:
+ rdf-isomorphic:
+ tests:
+ unmaintained: skip
\ No newline at end of file
diff --git a/etc/doap-nquads.ttl b/etc/doap-nquads.ttl
index 9c3b9b7..df73f7a 100644
--- a/etc/doap-nquads.ttl
+++ b/etc/doap-nquads.ttl
@@ -4,8 +4,6 @@
@prefix dc: .
@prefix foaf: .
@prefix doap: .
-@prefix earl: .
-@prefix xsd: .
<> a doap:Project ;
doap:name "RDF.rb" ;
@@ -20,7 +18,7 @@
doap:implements ,
,
;
- doap:download-page ;
+ doap:download-page ;
doap:bug-database ;
doap:blog , ;
doap:vendor ;
@@ -78,4 +76,4 @@
foaf:mbox ;
foaf:mbox_sha1sum "35bc44e6d0070e5ad50ccbe0d24403c96af2b9bd" ;
foaf:homepage ;
- rdfs:isDefinedBy .
+ rdfs:isDefinedBy .
\ No newline at end of file
diff --git a/etc/earl-nquads.ttl b/etc/earl-nquads.ttl
index 0b520c6..c683875 100644
--- a/etc/earl-nquads.ttl
+++ b/etc/earl-nquads.ttl
@@ -20,7 +20,7 @@
doap:implements ,
,
;
- doap:download-page ;
+ doap:download-page ;
doap:bug-database ;
doap:blog , ;
doap:vendor ;
diff --git a/lib/rdf/trig/format.rb b/lib/rdf/trig/format.rb
index 841b5c4..ca452c6 100644
--- a/lib/rdf/trig/format.rb
+++ b/lib/rdf/trig/format.rb
@@ -16,7 +16,7 @@ module RDF::TriG
#
# @see http://www.w3.org/TR/rdf-testcases/#ntriples
class Format < RDF::Format
- content_type 'application/trig', extension: :trig, alias: 'application/x-trig'
+ content_type 'application/trig', extension: :trig, alias: 'application/x-trig;q=0.2'
content_encoding 'utf-8'
reader { RDF::TriG::Reader }
diff --git a/rdf-trig.gemspec b/rdf-trig.gemspec
index 7fd6431..d8f443a 100755
--- a/rdf-trig.gemspec
+++ b/rdf-trig.gemspec
@@ -10,7 +10,6 @@ Gem::Specification.new do |gem|
gem.license = 'Unlicense'
gem.summary = "TriG reader/writer for Ruby."
gem.description = %q{RDF::TriG is an TriG reader/writer for the RDF.rb library suite.}
- gem.rubyforge_project = 'rdf-trig'
gem.authors = ['Gregg Kellogg']
gem.email = 'public-rdf-ruby@w3.org'
@@ -24,18 +23,23 @@ Gem::Specification.new do |gem|
gem.test_files = %w()
gem.has_rdoc = false
- gem.required_ruby_version = '>= 2.0'
+ gem.required_ruby_version = '>= 2.2.2'
gem.requirements = []
- gem.add_runtime_dependency 'rdf', '~> 2.0'
+ #gem.add_runtime_dependency 'rdf', '~> 3.0'
+ gem.add_runtime_dependency 'rdf', '>= 2.2', '< 4.0'
gem.add_runtime_dependency 'ebnf', '~> 1.0', '>= 1.0.1'
- gem.add_runtime_dependency 'rdf-turtle', '~> 2.0'
- gem.add_development_dependency 'json-ld', '~> 2.0'
- gem.add_development_dependency 'rspec', '~> 3.2'
- gem.add_development_dependency 'rspec-its', '~> 1.0'
- gem.add_development_dependency 'rdf-isomorphic', '~> 2.0'
- gem.add_development_dependency 'yard' , '~> 0.8'
- gem.add_development_dependency 'rdf-spec', '~> 2.0'
- gem.add_development_dependency 'rake', '~> 10'
+ #gem.add_runtime_dependency 'rdf-turtle', '~> 3.0'
+ #gem.add_development_dependency 'json-ld', '~> 3.0'
+ gem.add_runtime_dependency 'rdf-turtle', '>= 2.2', '< 4.0'
+ gem.add_development_dependency 'json-ld', '>= 2.1', '< 4.0'
+ gem.add_development_dependency 'rspec', '~> 3.7'
+ gem.add_development_dependency 'rspec-its', '~> 1.2'
+ #gem.add_development_dependency 'rdf-isomorphic', '~> 3.0'
+ gem.add_development_dependency 'rdf-isomorphic', '>= 2.0', '< 4.0'
+ gem.add_development_dependency 'yard' , '~> 0.9'
+ #gem.add_development_dependency 'rdf-spec', '~> 3.0'
+ gem.add_development_dependency 'rdf-spec', '>= 2.2', '< 4.0'
+ gem.add_development_dependency 'rake', '~> 12.0'
gem.post_install_message = nil
end