Fixes #791 Update RubotoCore to ActiveRecord 4.2

ruboto · Jan 24, 2016 · 6b2a17d · 6b2a17d
1 parent b5ee552
commit 6b2a17d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -74,18 +74,6 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-    - env: ANDROID_TARGET=19 RUBOTO_PLATFORM=FROM_GEM   TEST_PART=1of4 JRUBY_JARS_VERSION=STABLE
-    - env: ANDROID_TARGET=19 RUBOTO_PLATFORM=FROM_GEM   TEST_PART=2of4 JRUBY_JARS_VERSION=STABLE
-    - env: ANDROID_TARGET=19 RUBOTO_PLATFORM=FROM_GEM   TEST_PART=3of4 JRUBY_JARS_VERSION=STABLE
-    - env: ANDROID_TARGET=19 RUBOTO_PLATFORM=FROM_GEM   TEST_PART=4of4 JRUBY_JARS_VERSION=STABLE
-    - env: ANDROID_TARGET=15 RUBOTO_PLATFORM=FROM_GEM   TEST_PART=1of4 JRUBY_JARS_VERSION=STABLE
-    - env: ANDROID_TARGET=15 RUBOTO_PLATFORM=FROM_GEM   TEST_PART=2of4 JRUBY_JARS_VERSION=STABLE
-    - env: ANDROID_TARGET=15 RUBOTO_PLATFORM=FROM_GEM   TEST_PART=3of4 JRUBY_JARS_VERSION=STABLE
-    - env: ANDROID_TARGET=15 RUBOTO_PLATFORM=FROM_GEM   TEST_PART=4of4 JRUBY_JARS_VERSION=STABLE
-    - env: ANDROID_TARGET=19 RUBOTO_PLATFORM=STANDALONE TEST_PART=1of4 JRUBY_JARS_VERSION=STABLE
-    - env: ANDROID_TARGET=19 RUBOTO_PLATFORM=STANDALONE TEST_PART=2of4 JRUBY_JARS_VERSION=STABLE
-    - env: ANDROID_TARGET=19 RUBOTO_PLATFORM=STANDALONE TEST_PART=3of4 JRUBY_JARS_VERSION=STABLE
-    - env: ANDROID_TARGET=19 RUBOTO_PLATFORM=STANDALONE TEST_PART=4of4 JRUBY_JARS_VERSION=STABLE
     - env: ANDROID_TARGET=19 RUBOTO_PLATFORM=STANDALONE TEST_PART=1of4 JRUBY_JARS_VERSION=1.7.13
     - env: ANDROID_TARGET=19 RUBOTO_PLATFORM=STANDALONE TEST_PART=2of4 JRUBY_JARS_VERSION=1.7.13
     - env: ANDROID_TARGET=19 RUBOTO_PLATFORM=STANDALONE TEST_PART=3of4 JRUBY_JARS_VERSION=1.7.13

diff --git a/Rakefile b/Rakefile
@@ -512,11 +512,12 @@ task :get_jruby_jars_snapshots do
   [[master_gem, 'master'], [stable_gem, 'jruby-1_7']].each do |gem, branch|
     print "Downloading #{gem}: \r"
     uri = URI("http://#{download_host}#{download_dir}/snapshots/#{branch}/#{gem}")
-    done = 0
-    body = ''
     Net::HTTP.new(uri.host, uri.port).request_get(uri.path) do |response|
       if response.code == '200'
         length = response['Content-Length'].to_i
+        timestamp = response['Last-Modified'] # Sat, 23 Jan 2016 05:52:03 GMT'
+        body = ''
+        done = 0
         response.read_body do |fragment|
           body << fragment
           done += fragment.length
@@ -525,12 +526,15 @@ task :get_jruby_jars_snapshots do
             print "Downloading #{gem}: #{done / 1024}/#{length / 1024}KB #{progress}%\r"
           end
         end
+        unless body.empty?
+          File.write(gem, body)
+          FileUtils.touch gem, mtime: Time.parse(timestamp)
+        end
         puts
       else
         raise "Unexpected HTTP response code: #{response.code.inspect}"
       end
     end
-    File.open(gem, 'wb') { |f| f << body } unless body.empty?
   end
 end
 
@@ -564,9 +568,7 @@ task '.travis.yml' do
           next if api == 17 # FIXME(uwe):  Remove when Android 4.2 is green.
           next if api == 16 # FIXME(uwe):  Remove when Android 4.1 is green.
 
-          if platform == 'FROM_GEM' || # FIXME(uwe): Remove when new RubotoCore is green.
-              (v == :STABLE && (platform != 'STANDALONE' || api != 15)) || # FIXME(uwe):  Remove when 1.7 branch is green.
-              v == '1.7.13' || # FIXME(uwe):  Remove when 1.7.13 is green.
+          if v == '1.7.13' || # FIXME(uwe):  Remove when 1.7.13 is green.
               false
             allow_failures << line.gsub('-', '- env:')
           end

diff --git a/Vagrantfile b/Vagrantfile
@@ -35,6 +35,7 @@ Vagrant.configure(2) do |config|
       su - vagrant -c 'curl -sSL https://get.rvm.io | bash -s stable --ruby'
       su - vagrant -c 'mkdir -p ruboto'
       su - vagrant -c 'rsync -acPuv --exclude adb_logcat.log --exclude /tmp /vagrant/* ruboto/'
+      sudo apt-get autoremove
     SHELL
   end
 

diff --git a/matrix_tests.sh b/matrix_tests.sh
@@ -14,8 +14,10 @@ MASTER=`ls jruby-jars-*.gem | tail -n 1 | cut -f 3 -d'-' | sed s/\\.gem//`
 
 ANDROID_TARGETS="23 22 21 19 17 16 15" # We should cover at least 90% of the market
 PLATFORM_MODES="CURRENT FROM_GEM STANDALONE"
-STANDALONE_JRUBY_VERSIONS="$MASTER $STABLE 1.7.24 1.7.13"
-FROM_GEM_JRUBY_VERSIONS="$MASTER $STABLE"
+# FIXME(uwe): Add $MASTER when fixed: https://github.com/ruboto/ruboto/issues/737
+STANDALONE_JRUBY_VERSIONS="$STABLE 1.7.24 1.7.13"
+FROM_GEM_JRUBY_VERSIONS="$STABLE"
+# EMXIF
 RUBOTO_UPDATE_EXAMPLES=1
 # STRIP_INVOKERS=1
 # TEST_PART=2of4

diff --git a/test/arjdbc_test.rb b/test/arjdbc_test.rb
@@ -3,7 +3,7 @@
 class ArjdbcTest < Minitest::Test
   def setup
     generate_app bundle: [
-        [:activerecord, '<4.2.0'],
+        [:activerecord, '~>4.2.5'],
         :'activerecord-jdbc-adapter',
         :sqldroid,
     ]