Upgrade jQuery UI to 1.8.20; use package.json instead of version.txt

joliss · joliss · commit ad8e0033437f · 2012-05-01T21:42:22.000+02:00
diff --git a/History.md b/History.md
@@ -1,3 +1,7 @@
+# 0.4.0
+
+* Upgrade to jQuery UI 1.8.20
+
 # 0.3.0
 
 * Upgrade to jQuery UI 1.8.19
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/joliss/jquery-ui-rails.png?branch=master)](http://travis-ci.org/joliss/jquery-ui-rails) [![Dependency Status](https://gemnasium.com/joliss/jquery-ui-rails.png)](https://gemnasium.com/joliss/jquery-ui-rails)
 
-This gem packages the jQuery UI 1.8.19 assets (JavaScripts, stylesheets, and
+This gem packages the jQuery UI 1.8.20 assets (JavaScripts, stylesheets, and
 images) for the Rails 3.1+ [asset
 pipeline](http://guides.rubyonrails.org/asset_pipeline.html), so you never have
 to download a custom package through the [web
@@ -111,7 +111,7 @@ application.css as well.
 
 Datepicker has optional i18n modules for non-US locales, named
 `jquery.ui.datepicker-xx[-YY]`
-([list](https://github.com/jquery/jquery-ui/tree/1.8.19/ui/i18n)), for example:
+([list](https://github.com/jquery/jquery-ui/tree/1.8.20/ui/i18n)), for example:
 
 ```javascript
 //= require jquery.ui.datepicker-pt-BR
diff --git a/Rakefile b/Rakefile
@@ -5,7 +5,7 @@ DEPENDENCY_HASH = JSON.load(File.read('dependencies.js'))
 LANGUAGE_REGEX = /-[-a-zA-Z]+(?=\.js\z)/
 
 def version
-  File.read("jquery-ui/version.txt").strip
+  JSON.load(File.read('jquery-ui/package.json'))['version']
 end
 
 task :submodule do
diff --git a/jquery-ui b/jquery-ui
@@ -1 +1 @@
-Subproject commit 27c4854eb476e3ed7859ef8ef609d6bc3103f1d0
+Subproject commit 8226f9f02c4d88885f2df8dde1996eaf9dd6f270
diff --git a/jquery-ui-rails.gemspec b/jquery-ui-rails.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.files        = `git ls-files`.split("\n").reject { |f| f =~ /^testapp|^jquery-ui/ } + \
                    Dir.glob("vendor/**/*") + \
-                   Dir.glob('jquery-ui/*LICENSE.txt') + ['jquery-ui/version.txt']
+                   Dir.glob('jquery-ui/*LICENSE.txt') + ['jquery-ui/package.json']
   s.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_path = 'lib'
 end

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +# 0.4.0
++
 +* Upgrade to jQuery UI 1.8.20
++
 # 0.3.0
 * Upgrade to jQuery UI 1.8.19