blacklight 4.2.1 → 4.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -1
  3. data/VERSION +1 -1
  4. data/blacklight.gemspec +1 -1
  5. data/gemfiles/rails4.gemfile +1 -2
  6. data/lib/generators/blacklight/blacklight_generator.rb +1 -1
  7. data/lib/generators/blacklight/jetty_generator.rb +1 -1
  8. data/spec/test_app_templates/Gemfile.extra +0 -1
  9. metadata +10 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4351fa82e876ef0b03e9d75450ea07744d8567e8
4
- data.tar.gz: b7d75684699b261d2677a4ef063e27b95959c5fd
3
+ metadata.gz: c47fcbe95024f4a71de3e84f3616d538718be76a
4
+ data.tar.gz: feddef4262a412ccd9bc97f654972509d61d43f4
5
5
  SHA512:
6
- metadata.gz: a31bb3788b2927af494e778c79c3367453d0f2a88f0d890abdf21743a3095281ac0f98218c189010f50bc7c1aff28b49e3211c5973a79a357fc2f825edd75b6a
7
- data.tar.gz: 31b186d154589f37db2cea16ea55d8f894e9182bf94d901b470399b29a639fe2086ec0198751fc9bcdaf965b2a47e48b9aa038a4f0d62da309bf9d09449475c3
6
+ metadata.gz: 5072d4421a66a31155f960d3aea6e2fcbe2d8c0d13dfe3906bcf443d70428148e0b7384fd5901a4ff672e930bd56808a13fd5849bc3fa5cc90a9f94bb7b820b4
7
+ data.tar.gz: 00c849b12279e93838f43af3d0441b1b7550ed65eb2945a77007bc89ec1709b5a8e4a1e443e16694ed6b50e932af0656bca1024e333f34a0a7701f2096340ace
data/.travis.yml CHANGED
@@ -15,7 +15,7 @@ notifications:
15
15
  email:
16
16
  - blacklight-commits@googlegroups.com
17
17
 
18
- env: JRUBY_OPTS="--server -Xcompile.invokedynamic=true -J-Xms512m -J-Xmx1024m"
18
+ env: JRUBY_OPTS="-J-Xms512m -J-Xmx1024m"
19
19
  # jruby 1.9 + rails 4.0.0.beta1 don't work well together
20
20
  matrix:
21
21
  allow_failures:
data/VERSION CHANGED
@@ -1 +1 @@
1
- 4.2.1
1
+ 4.2.2
data/blacklight.gemspec CHANGED
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
20
20
 
21
21
  # PRODUCTION GEM REQUIREMENTS
22
22
  # ---------------------------------------
23
- s.add_dependency "rails", ">= 3.2"
23
+ s.add_dependency "rails", ">= 3.2.6", "< 5"
24
24
  s.add_dependency "nokogiri", "~>1.5" # XML Parser
25
25
  # Let's allow future versions of marc, count on
26
26
  # them to be backwards compat until 1.1
data/gemfiles/rails4.gemfile CHANGED
@@ -6,5 +6,4 @@ gemspec :path=>"../"
6
6
  gem 'simplecov', :platform => :mri
7
7
  gem 'simplecov-rcov', :platform => :mri
8
8
 
9
- gem 'rails', '4.0.0.rc1'
10
- gem 'sass-rails', '4.0.0.rc1'
9
+ gem 'rails', '~> 4.0.0'
data/lib/generators/blacklight/blacklight_generator.rb CHANGED
@@ -72,7 +72,7 @@ EOF
72
72
  def generate_devise_assets
73
73
  if options[:devise]
74
74
  if Rails::VERSION::MAJOR == 4
75
- gem "devise", github:'plataformatec/devise', branch: 'rails4'
75
+ gem "devise", '3.0.0.rc'
76
76
  else
77
77
  gem "devise"
78
78
  end
data/lib/generators/blacklight/jetty_generator.rb CHANGED
@@ -11,7 +11,7 @@ module Blacklight
11
11
  # change this to a different download if you want to peg to a different
12
12
  # tagged version of our known-good jetty/solr.
13
13
  OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE # (Required by jruby)
14
- class_option :download_url, :aliases => "-u", :type=>"string", :default =>"https://github.com/projectblacklight/blacklight-jetty/zipball/v3.5.0" , :desc=>"location of zip file including a jetty with solr setup for blacklight."
14
+ class_option :download_url, :aliases => "-u", :type=>"string", :default =>"https://github.com/projectblacklight/blacklight-jetty/zipball/v4.0.0" , :desc=>"location of zip file including a jetty with solr setup for blacklight."
15
15
  class_option :downloaded_package, :aliases => "-d", :type=>"string", :desc => "manual download of BL-jetty zip file"
16
16
 
17
17
 
data/spec/test_app_templates/Gemfile.extra CHANGED
@@ -29,7 +29,6 @@ group :test do
29
29
  else
30
30
  gem 'capybara'
31
31
  end
32
- gem 'rcov', :platform => :mri_18
33
32
  gem 'simplecov', :platform => :mri_19
34
33
  gem 'simplecov-rcov', :platform => :mri_19
35
34
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: blacklight
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.1
4
+ version: 4.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Rochkind
@@ -16,7 +16,7 @@ authors:
16
16
  autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
- date: 2013-05-09 00:00:00.000000000 Z
19
+ date: 2013-07-03 00:00:00.000000000 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
22
  name: rails
@@ -24,14 +24,20 @@ dependencies:
24
24
  requirements:
25
25
  - - '>='
26
26
  - !ruby/object:Gem::Version
27
- version: '3.2'
27
+ version: 3.2.6
28
+ - - <
29
+ - !ruby/object:Gem::Version
30
+ version: '5'
28
31
  type: :runtime
29
32
  prerelease: false
30
33
  version_requirements: !ruby/object:Gem::Requirement
31
34
  requirements:
32
35
  - - '>='
33
36
  - !ruby/object:Gem::Version
34
- version: '3.2'
37
+ version: 3.2.6
38
+ - - <
39
+ - !ruby/object:Gem::Version
40
+ version: '5'
35
41
  - !ruby/object:Gem::Dependency
36
42
  name: nokogiri
37
43
  requirement: !ruby/object:Gem::Requirement