ruboto 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f5ba4e753dedde7aa289ba6134642dfde679f5f
-  data.tar.gz: 25d533193f34d6d952f487d9af6208969126b6b2
+  metadata.gz: 10adce79aa0f610f28d87071ec839fd64a270c73
+  data.tar.gz: fb2cfe8130c054372ae42ce7b65528fe3796857d
 SHA512:
-  metadata.gz: e896f2bd95d184b67e508d34f061ddb0314fb7a1c59062ed7854c0ee742944d37696f0be22f5036d1d6254b5281ce12a259070a601088aeb88951bbbdc69dfc3
-  data.tar.gz: 75f73d4ce416b9e934eebbe538158bf02d6262eb6a34005980823de88239b94829ad60b8921ee1e73403b621dfaa4072a42efe09fbed73d5fab23ba05ef3d874
+  metadata.gz: fdcb7a76b98f60f06f00009d80b9e128dc9b909c99e8f4d665a98954de4252db738472d44ea1961d923385b27db06d3a3471eb2bf256802400a12b0b641acdca
+  data.tar.gz: 60142ca6e0daf809b78e29ca3bb70cded944651c75e05fe17731a83d9fc4b695717b75aebaeb97f97f3aa6da4cc802bbdbef36a697ef2fefaa91ad052ced667e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruboto (1.3.1)
+    ruboto (1.4.0)
       main (~> 5.2)
       rake (~> 10.0)
       rubyzip (~> 1.0)
@@ -22,7 +22,7 @@ GEM
     map (6.5.5)
     method_source (0.8.2)
     minitest (5.5.1)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -38,4 +38,4 @@ DEPENDENCIES
   ruboto!
 
 BUNDLED WITH
-   1.10.5
+   1.10.6

data/RELEASE_CANDICATE_DOC.md

@@ -1,10 +1,15 @@
-Subject: [ANN] Ruboto 1.3.1 release candidate
+Subject: [ANN] Ruboto 1.4.0 release candidate
 
 Hi all!
 
-The Ruboto 1.3.1 release candidate is now available.
+The Ruboto 1.4.0 release candidate is now available.
 
-Bugfixes for the 1.3.0 release.
+This release adds support for JRuby 1.7.22 and improves the installation
+of HAXM.  `ruboto setup --update` will now update an existing HAXM
+installation if a new version is available for download.
+
+Support for Android 2.3 has been dropped, and Android 4.1 is now the
+default api level when creating new apps.
 
 As always we need your help and feedback to ensure the quality of the release.  Please install the release candidate using
 

data/RELEASE_DOC.md

@@ -1,6 +1,6 @@
-Subject: [ANN] Ruboto 1.3.1 released!
+Subject: [ANN] Ruboto 1.4.0 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 1.3.1.
+The Ruboto team is pleased to announce the release of Ruboto 1.4.0.
 
 Ruboto (JRuby on Android) is a platform for developing full stand-alone
 apps for Android using the Ruby language and libraries.  It includes
@@ -8,82 +8,78 @@ support libraries and generators for creating projects, classes, tests,
 and more.  The complete APIs of Android, Java, and Ruby are available to
 you using the Ruby language.
 
-New in version 1.3.1:
+New in version 1.4.0:
 
-Bugfixes for the 1.3.0 release.
+This release adds support for JRuby 1.7.22 and improves the installation
+of HAXM.  `ruboto setup --update` will now update an existing HAXM
+installation if a new version is available for download.
+
+Support for Android 2.3 has been dropped, and Android 4.1 is now the
+default api level when creating new apps.
 
 API Changes:
 
-* Issue #733 Remove support for RubotoCore 0.4.7
+* Issue #687 Drop support for Android 2.3 api level 10
+* Issue #688 Set Android 4.1 api level 16 as default api level for new
+  apps
+* Issue #770 Support jruby 1.7.22 (donv)
 
 Features:
 
-* Issue #720 Install 64 bit system images for Android 5
-* Issue #721 Create and start emulator with 64bit system image for
-  Android 5
-* Issue #741 Make setup accept build tools rc (danielpassos)
+* Issue #722 Start emulator without skin for "ruboto emulator"
+* Issue #756 Allow "ruboto setup --update" to update HAXM if a new
+  version is available
 
 Bugfixes:
 
-* Issue #635 Gosu example is not working
-* Issue #668 Android API version above 15 not working
-* Issue #715 ruboto setup -y: FATAL -- : undefined method '[]' for
-  nil:NilClass (NoMethodError)
-* Issue #718 Haxm 10.9 daneb (daneb)
-* Issue #728 Fix haxm installation for MacOS  (phantomwhale)
-* Issue #729 (ArgumentError) unable to create proxy class for class
-  java.util.HashMap : null
-* Issue #734 ruboto setup problem
-
-Performance:
-
-* Issue #642 generate java methods in the build process only for
-  implemented ruby met... (tek)
+* Issue #634 Can't add jar files to proyect. Can't start the proyect
+  with jars added
+* Issue #638 Extra installs to build on Ubuntu 64 bit
+* Issue #655 "--with-jruby" seems to do its job, but then I still need
+  to download and install Ruboto Core on device
+* Issue #663 Minimal Gosu code fails.
+* Issue #664 Bundler can't see personal gems/Locally installed gems do
+  not get put on projects(only global).
+* Issue #669 Keep on restarting new emulator
+* Issue #686 Can't run on Real device with Android 5.0
+* Issue #703 The HAXM installer for OS X has changed name
+* Issue #712 can´t install ruboto
+* Issue #716 New App with no custom code terminates directly after start
+  (java.lang.NoSuchMethodException: makeDexElements).
+* Issue #717 ruboto setup -y - FATAL -- : undefined method 'slice' for
+  nil:NilClass
+* Issue #742 Accept Android plataform tools rc in setup
+* Issue #747 Running the emulator often hangs when run without
+  "--no-snapshot"
+* Issue #759 "ruboto gen jruby" should install jruby-jars ~>1.7
+* Issue #765 'rake boing' fails for multiple updated files
 
 Support:
 
-* Issue #631 ruby version problem
-* Issue #719 Webview addJavaScriptInterface
-* Issue #731 Quick Start Example
-* Issue #743 Help with LibGDX on Ruboto
-* Issue #746 ruboto setup - Java heap space
-  (Java::JavaLang::OutOfMemoryError)
+* Issue #670 emulator
+* Issue #736 rake install error
+* Issue #739 Game Frameworks?
+* Issue #750 Deploy ruboto within Gnuroot debian linux under Android OS
+* Issue #752 can't install ruboto with ruby gems in windows 10.
 
 Community:
 
-* Issue #589 How can I help? (devaroop)
-* Issue #640 How can I help? (sg552)
-* Issue #651 How can I help? (arantessergio)
-* Issue #659 How can I help?
-* Issue #662 How can I help? (aripoya)
-* Issue #665 How can I help?
-* Issue #683 How can I help?
-* Issue #684 How can I help?
-* Issue #685 How can I help?
-* Issue #694 How can I help?
-* Issue #704 How can I help?
-* Issue #725 How can I help?
-* Issue #730 How can I help?
-
-Pull requests:
-
-* Issue #740 rake log task detects activity start on lollipop (gfowley)
+* Issue #762 How can I help? (juanjogeta)
+* Issue #766 Reduce noise on #ruboto channel from travis
+* Issue #771 How can I help? (ChaosCat)
 
 Internal:
 
-* Issue #724 Get travis-ci GREEN! (donv)
-
-Rejected:
-
-* Issue #367 Remove support for running in Ruby 1.8 mode
-
-Other:
-
-* Issue #692 --with-jruby argument not working correctly
+* Issue #757 Release 1.4.0
+* Issue #767 TypeError: can't convert nil into String when running
+  Ruboto tests
+* Issue #769 Fetch jruby-jars snapshots from http://ci.jruby.org/ for
+  testing
+* Issue #772 Db haxm dark (daneb)
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=38
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=39
 
 
 Installation:

data/Rakefile

@@ -24,7 +24,7 @@ GEM_FILE = "ruboto-#{Ruboto::VERSION}.gem"
 GEM_SPEC_FILE = 'ruboto.gemspec'
 README_FILE = 'README.md'
 WEB_DIR = File.expand_path('../ruboto.github.com', File.dirname(__FILE__))
-BLOG_DIR = "_posts"
+BLOG_DIR = '_posts'
 RELEASE_BLOG = "#{BLOG_DIR}/#{Date.today}-Ruboto-#{Ruboto::VERSION}-release-doc.md"
 RELEASE_BLOG_GLOB = "#{BLOG_DIR}/*-Ruboto-#{Ruboto::VERSION}-release-doc.md"
 RELEASE_CANDIDATE_DOC = 'RELEASE_CANDICATE_DOC.md'
@@ -132,7 +132,7 @@ def get_github_issues
   raise "Milestone for version #{Ruboto::VERSION} not found." unless milestone_entry
   milestone = milestone_entry['number']
 
-  uri = URI("#{base_uri}/issues?milestone=#{milestone}&state=closed&per_page=1000")
+  uri = URI("#{base_uri}/issues?milestone=#{milestone}&state=all&per_page=1000")
   req = Net::HTTP::Get.new(uri.request_uri)
   res = https.start { |http| http.request(req) }
   issues = YAML.load(res.body).sort_by { |i| i['number'] }
@@ -167,11 +167,8 @@ task :release_docs do
   raise "\n    This task requires Ruby 1.9 or newer to parse JSON as YAML.\n\n" if RUBY_VERSION == '1.8.7'
   categories, grouped_issues, milestone, milestone_description, milestone_name = get_github_issues
 
-  #puts '=' * 80
-  #puts
-
+  puts '=' * 80
   puts
-  puts "Generanting release candidate doc ..."
   release_candidate_doc = <<EOF
 Subject: [ANN] Ruboto #{milestone_name} release candidate
 
@@ -206,16 +203,13 @@ The Ruboto Team
 http://ruboto.org/
 EOF
 
-  #puts release_candidate_doc
+  puts release_candidate_doc
   File.write(RELEASE_CANDIDATE_DOC, release_candidate_doc)
   sh "git add -f #{RELEASE_CANDIDATE_DOC}"
 
-  #puts
-  #puts '=' * 80
-  #puts
-
   puts
-  puts "Generanting release doc ..."
+  puts '=' * 80
+  puts
   release_doc = <<EOF
 Subject: [ANN] Ruboto #{milestone_name} released!
 
@@ -274,12 +268,10 @@ The Ruboto Team
 http://ruboto.org/
 EOF
 
+  puts release_doc
+  puts
+  puts '=' * 80
   File.write(RELEASE_DOC, release_doc)
-  sh "git add -f #{RELEASE_DOC}"
-
-  #puts release_doc
-  #puts
-  #puts '=' * 80
 
   unless Gem::Version.new(Ruboto::VERSION).prerelease?
     header = <<EOF
@@ -369,17 +361,15 @@ end
 
 desc 'Push the gem to RubyGems'
 task :release => [:clean, README_FILE, :release_docs, :gem] do
-  #output = `git status --porcelain`
-  #raise "Workspace not clean!\n#{output}" unless output.empty?
-  unless Gem::Version.new(Ruboto::VERSION).prerelease?
-    Dir.chdir WEB_DIR do
-      #output = `git status --porcelain`
-      #raise "Web workspace not clean!\n#{output}" unless output.empty?
-      sh "git add -f #{RELEASE_BLOG}"
-      `git commit -m "* Added release blog for Ruboto #{Ruboto::VERSION}"`
-      sh 'git push'
-    end
-  end  
+  output = `git status --porcelain`
+  raise "Workspace not clean!\n#{output}" unless output.empty?
+  Dir.chdir WEB_DIR do
+    output = `git status --porcelain`
+    raise "Web workspace not clean!\n#{output}" unless output.empty?
+    sh "git add -f #{RELEASE_BLOG}"
+    `git commit -m "* Added release blog for Ruboto #{Ruboto::VERSION}"`
+    sh 'git push'
+  end
   sh "git tag #{Ruboto::VERSION}"
   sh 'git push --tags'
   sh "gem push #{GEM_FILE}"
@@ -420,7 +410,7 @@ namespace :platform do
   end
 
   desc 'Generate the Ruboto Core platform project'
-  task :project => PLATFORM_PROJECT
+  task project: PLATFORM_PROJECT
 
   file PLATFORM_PROJECT do
     sh "git clone --depth 1 https://github.com/ruboto/ruboto-core.git #{PLATFORM_PROJECT}"
@@ -430,7 +420,7 @@ namespace :platform do
   end
 
   desc 'Generate a Ruboto Core platform debug apk'
-  task :debug => PLATFORM_DEBUG_APK
+  task debug: PLATFORM_DEBUG_APK
 
   task PLATFORM_DEBUG_APK do
     Rake::Task[PLATFORM_PROJECT].invoke
@@ -445,7 +435,7 @@ namespace :platform do
   end
 
   desc 'Generate a Ruboto Core platform release apk'
-  task :release => PLATFORM_RELEASE_APK
+  task release: PLATFORM_RELEASE_APK
 
   file PLATFORM_RELEASE_APK => PLATFORM_PROJECT do
     Dir.chdir(PLATFORM_PROJECT) do
@@ -496,7 +486,7 @@ namespace :platform do
   end
 
   desc 'Install the Ruboto Core platform debug apk'
-  task :install => PLATFORM_PROJECT do
+  task install: PLATFORM_PROJECT do
     Dir.chdir(PLATFORM_PROJECT) do
       sh 'rake install'
     end
@@ -511,17 +501,16 @@ end
 
 desc 'Download the latest jruby-jars snapshot'
 task :get_jruby_jars_snapshots do
-  download_host = 'lafo.ssw.uni-linz.ac.at'
-  index = Net::HTTP.get(download_host, "/graalvm/")
-  all_gems = index.scan(%r{(jruby-jars-.*?.gem).*?</td>\s*<td.*?</td>\s*<td.*?>\s*(.*?)</td>})
-  current_gems = [all_gems.select{|a| a[1].to_i > 0}.map{|a| a[0]}.
-          uniq.sort_by{|v| Gem::Version.new(v[11..-5])}.last]
-  current_gems << index.scan(/jruby-jars-1\.7\..*?.gem/).uniq.
-      sort_by{|v| Gem::Version.new(v[11..-5])}.last
+  download_host = 's3.amazonaws.com'
+  download_dir = "/ci.jruby.org"
+  index = Net::HTTP.get(download_host, download_dir)
+  all_gems = index.scan(%r{jruby-jars-.*?.gem}).sort_by{|v| Gem::Version.new(v[11..-5])}
+  master_gem = all_gems.last
+  stable_gem = all_gems.first
   FileUtils.rm_rf Dir['jruby-jars-*.gem']
-  current_gems.each do |gem|
+  [[master_gem, 'master'], [stable_gem, 'jruby-1_7']].each do |gem, branch|
     print "Downloading #{gem}: \r"
-    uri = URI("http://#{download_host}/graalvm/#{gem}")
+    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|
@@ -551,33 +540,36 @@ task '.travis.yml' do
   matrix = ''
   allow_failures = ''
 
-  # FIXME(uwe):  JRuby 1.7.13 works for Nettbuss
+  # FIXME(uwe):  JRuby 1.7.13 works for Nettbuss.  Keep for 2016.
   # FIXME(uwe):  JRuby 1.7.19:  RSS? => RubotoGenTest#test_activity_tests => Native crash
-  # FIXME(uwe):  JRuby 1.7.20:  Fails on RSS and upper case package names
+  # FIXME(uwe):  JRuby 1.7.22:  OK except https://github.com/jruby/jruby/issues/3401
   # FIXME(uwe):  RubotoCore (CURRENT) is missing thread_safe
   # FIXME(uwe):  Test all of these that work
   [
       ['CURRENT', [nil]],
       ['FROM_GEM', [:MASTER, :STABLE]],
-      ['STANDALONE', [:MASTER, :STABLE, '1.7.19', '1.7.13']],
+      ['STANDALONE', [:MASTER, :STABLE, '1.7.22', '1.7.19', '1.7.13']],
   ].each do |platform, versions|
     versions.each do |v|
       # FIXME(uwe):  Test the newest and most common api levels
       # FIXME(uwe):  Nettbuss uses api level 15.
       # FIXME(uwe):  https://github.com/ruboto/ruboto/issues/426
-      [22, 19, 17, 16, 15].each do |api|
+      [23, 22, 21, 19, 17, 16, 15].each do |api|
         (1..test_parts).each do |n|
           line = "    - ANDROID_TARGET=#{api} RUBOTO_PLATFORM=#{platform.ljust(10)} TEST_PART=#{n}of#{test_parts}#{" JRUBY_JARS_VERSION=#{v}" if v}\n"
           if v == :MASTER || # FIXME(uwe):  Remove when master branch is green.
+              (v == :STABLE && platform != 'FROM_GEM' && api != 15) || # FIXME(uwe):  Remove when 1.7 branch is green.
               v == '1.7.13' || # FIXME(uwe):  Remove when 1.7.13 is green.
-              api == 22 || # FIXME(uwe):  Remove when Android 5.1 is green.
+              api == 23 || # FIXME(uwe):  Remove when Android 6.0 is green.  Unable to start emulator on travis.
+              api == 22 || # FIXME(uwe):  Remove when Android 5.1 is green.  Must use slow ARM emulator due to missing HAXM.
               api == 21 || # FIXME(uwe):  Remove when Android 5.0 is green.
               api == 17 || # FIXME(uwe):  Remove when Android 4.2 is green.
               api == 16 || # FIXME(uwe):  Remove when Android 4.1 is green.
               false
             next
-          elsif v == :STABLE || # FIXME(uwe):  Remove when 1.7.20 supports RSS and upper case package names.
-              platform == 'FROM_GEM' # FIXME(uwe): Remove when new RubotoCore is green.
+          elsif platform == 'FROM_GEM' || # FIXME(uwe): Remove when new RubotoCore is green.
+              (v == '1.7.22' && api != 15) || # FIXME(uwe):  Remove when jruby-jars 1.7.22 is green.
+              false
             allow_failures << line.gsub('-', '- env:')
           end
           matrix << line

data/assets/rakelib/ruboto.rake

@@ -470,7 +470,7 @@ file BUILD_XML_FILE => RUBOTO_CONFIG_FILE do
 
   ant_script.gsub!(/\s*#{start_marker}.*?#{end_marker}\s*/m, '')
   # FIXME(uwe): Remove condition when we stop supporting Android 4.0 and older.
-  if sdk_level >= 16
+  if sdk_level >= 15
     unless ant_script.gsub!(/\s*(<\/project>)/, "\n\n#{dx_override}\n\n\\1")
       raise 'Bad ANT script'
     end
@@ -984,7 +984,7 @@ end
 
 # Triggers reload of updated scripts and restart of the current activity
 def reload_scripts(scripts)
-  s = scripts.map { |s| s.gsub(/[&;]/) { |m| "&#{m[0]}" } }.join('\;')
+  s = scripts.map { |s| s.gsub(/[&;]/) { |m| "&#{m[0]}" } }.join(';')
   cmd = %Q{adb shell am broadcast -a android.intent.action.VIEW -e reload '#{s}'}
   puts cmd
   system cmd

data/assets/src/org/ruboto/DexDex.java

@@ -50,8 +50,8 @@ public class DexDex {
     private static final String TAG = "DexDex";
 
     private static final int SDK_INT_ICS = 14;
-
     private static final int SDK_INT_KITKAT = 19;
+    private static final int SDK_INT_MARSHMALLOW = 23;
 
     private static final int BUF_SIZE = 8 * 1024;
     public static final int PROGRESS_COMPLETE = 100;
@@ -256,8 +256,9 @@ public class DexDex {
                 FrameworkHack.appendDexListImplUnderICS(jarsOfDex, pcl, dexDir);
             } else { // ICS+
                 boolean kitkatPlus = Build.VERSION.SDK_INT >= SDK_INT_KITKAT;
+                boolean marshmallowPlus = Build.VERSION.SDK_INT >= SDK_INT_MARSHMALLOW;
                 ArrayList<File> jarFiles = DexDex.strings2Files(jarsOfDex);
-                FrameworkHack.appendDexListImplICS(jarFiles, pcl, dexDir, kitkatPlus);
+                FrameworkHack.appendDexListImplICS(jarFiles, pcl, dexDir, kitkatPlus, marshmallowPlus);
             }
             // update theAppended if succeeded to prevent duplicated classpath entry
             for (String jarName : names) {

data/assets/src/org/ruboto/FrameworkHack.java

@@ -26,6 +26,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.zip.ZipFile;
 
 /**
@@ -114,7 +115,7 @@ public class FrameworkHack {
     // https://android.googlesource.com/platform/libcore/+/master/libdvm/src/main/java/dalvik/system/BaseDexClassLoader.java
     // https://android.googlesource.com/platform/libcore/+/master/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java
     public static void appendDexListImplICS(ArrayList<File> jarFiles, PathClassLoader pcl, File optDir,
-                                            boolean kitkatPlus) throws Exception {
+                                            boolean kitkatPlus, boolean marshmallowPlus) throws Exception {
         if(debug) {
             Log.d(TAG, "appendDexListImplICS(" + jarFiles);
         }
@@ -139,8 +140,11 @@ public class FrameworkHack {
         int jarCount = jarFiles.size();
         Object newDexElemArray = Array.newInstance(clazzElement, orgDexCount + jarCount);
         System.arraycopy(objOrgDexElements, 0, newDexElemArray, 0, orgDexCount);
-        Method mMakeDexElements = null;
-        if (kitkatPlus) {
+        final Method mMakeDexElements;
+        if (marshmallowPlus) {
+            mMakeDexElements =
+                    dplClass.getDeclaredMethod("makePathElements", List.class, File.class, List.class);
+        } else if (kitkatPlus) {
             mMakeDexElements =
                     dplClass.getDeclaredMethod("makeDexElements", ArrayList.class, File.class, ArrayList.class);
         } else {

data/assets/src/org/ruboto/JRubyAdapter.java

@@ -306,7 +306,6 @@ public class JRubyAdapter {
                 // TODO(uwe):  Add a way to display startup progress.
                 put("$application_context", appContext.getApplicationContext());
                 runScriptlet("begin\n  require 'environment'\nrescue LoadError => e\n  puts e\nend");
-                // runScriptlet("begin\n  require 'environment'\nrescue LoadError => e\n  java.lang.System.out.println(e)\nend");
 
                 initialized = true;
             } catch (ClassNotFoundException e) {

data/lib/ruboto/commands/base.rb

@@ -449,8 +449,12 @@ module Ruboto
               description 'answer "yes" to all interactive questions.  Will automatically install needed components.'
             }
 
+            option('upgrade', 'u') {
+                description 'upgrades intel haxm'
+            }
+
             def run
-              setup_ruboto(params['yes'].value, params['target'].values)
+              setup_ruboto(params['yes'].value, params['target'].values, params['upgrade'].values)
             end
           end
 

data/lib/ruboto/sdk_versions.rb

@@ -6,12 +6,13 @@ module Ruboto
         '2.3.3' => 10, '2.3.4' => 10, '2.3.5' => 10, '2.3.6' => 10, '2.3.7' => 10,
         '3.0' => 11, '3.1' => 12, '3.2' => 13, '4.0.1' => 14, '4.0.3' => 15,
         '4.0.4' => 15, '4.1' => 16, '4.1.1' => 16, '4.1.2' => 16, '4.2' => 17,
-        '4.2.2' => 17, '4.3' => 18, '4.3.1' => 18, '4.4.2' => 19, '5.0.1' => 21, '5.1' => 22
+        '4.2.2' => 17, '4.3' => 18, '4.3.1' => 18, '4.4.2' => 19, '5.0.1' => 21,
+        '5.1' => 22, '6.0' => 23
     }
     API_LEVEL_TO_VERSION = {
         10 => '2.3.3', 11 => '3.0', 12 => '3.1', 13 => '3.2', 14 => '4.0',
         15 => '4.0.3', 16 => '4.1.2', 17 => '4.2.2', 18 => '4.3.1',
-        19 => '4.4.2', 21 => '5.0.1', 22 => '5.1'
+        19 => '4.4.2', 21 => '5.0.1', 22 => '5.1', 23 => '6.0'
     }
 
     MINIMUM_SUPPORTED_SDK_LEVEL = 15

data/lib/ruboto/util/emulator.rb

@@ -8,6 +8,7 @@ module Ruboto
       ON_WINDOWS = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw/i)
       ON_MAC_OS_X = RbConfig::CONFIG['host_os'] =~ /^darwin/
       ON_LINUX = RbConfig::CONFIG['host_os'] =~ /linux/
+      ON_TRAVIS = ENV['TRAVIS'] == 'true'
 
       def sdk_level_name(sdk_level)
         Ruboto::SdkVersions::API_LEVEL_TO_VERSION[sdk_level.to_i] || sdk_level
@@ -32,8 +33,8 @@ module Ruboto
         new_snapshot = false
 
         if `adb devices` =~ /emulator-5554/
-          t = Net::Telnet.new('Host' => 'localhost', 'Port' => 5554, 'Prompt' => /^OK\n/)
-          t.waitfor(/^OK\n/)
+          t = Net::Telnet.new('Host' => 'localhost', 'Port' => 5554, 'Prompt' => /^OK\n|^KO:/)
+          t.waitfor(/Android Console:/)
           output = ''
           t.cmd('avd name') { |c| output << c }
           t.close
@@ -46,7 +47,8 @@ module Ruboto
               puts "Emulator #{running_avd_name} is running."
             end
           else
-            raise "Unexpected response from emulator: #{output.inspect}"
+            puts "Unexpected response from emulator: #{output.inspect}"
+            puts "Assuming wrong emulator is running."
           end
         else
           puts 'No emulator is running.'
@@ -55,6 +57,7 @@ module Ruboto
         # FIXME(uwe):  Change use of "killall" to use the Ruby Process API
         loop do
           emulator_opts = '-partition-size 256'
+          emulator_opts << ' -noskin'
           emulator_opts << ' -no-snapshot-load' if no_snapshot
           if !ON_MAC_OS_X && !ON_WINDOWS && ENV['DISPLAY'].nil?
             emulator_opts << ' -no-window -no-audio'
@@ -90,73 +93,14 @@ module Ruboto
           heap_size = large_heap ? 256 : 48
 
           unless File.exists? avd_home
-            puts "Creating AVD #{avd_name}"
-
-            target = `android list target`.split(/----------\n/).
-                find { |l| l =~ /android-#{sdk_level}/ }
-
-            if target.nil?
-              puts "Target android-#{sdk_level} not found.  You should run"
-              puts "\n    ruboto setup -y -t #{sdk_level}\n\nto install it."
-              exit 3
-            end
-
-            abis = target.slice(/(?<=ABIs : ).*/).split(', ')
-            has_x86 = abis.find { |a| a =~ /x86/ }
-            has_x86_64 = has_x86 && abis.find { |a| a =~ /x86_64/ }
-
-            # FIXME(uwe): The x86 emulator does not respect the heap setting and
-            # restricts to a 16MB heap on Android 2.3 which will crash any
-            # Ruboto app.  Remove the first "if" below when heap setting works
-            # on x86 emulator.
-            # https://code.google.com/p/android/issues/detail?id=37597
-            # https://code.google.com/p/android/issues/detail?id=61596
-            if sdk_level.to_i == 10
-              abi_opt = '--abi armeabi'
-            elsif has_x86
-              if has_x86_64
-                abi_opt = '--abi x86_64'
-              else
-                abi_opt = '--abi x86'
-              end
-            else
-              abi_opt = '--abi armeabi-v7a'
-            end
-            # EMXIF
-
-            skin_filename = "#{Ruboto::SdkLocations::ANDROID_HOME}/platforms/android-#{sdk_level}/skins/HVGA/hardware.ini"
-            if File.exists?(skin_filename)
-              old_skin_config = File.read(skin_filename)
-              new_skin_config = old_skin_config.gsub(/vm.heapSize=([0-9]*)/) { |m| $1.to_i < heap_size ? "vm.heapSize=#{heap_size}" : m }
-              File.write(skin_filename, new_skin_config) if new_skin_config != old_skin_config
-            end
-
-            puts `echo no | android create avd -a -n #{avd_name} -t android-#{sdk_level} #{abi_opt} -c 64M -s HVGA -d "Nexus One"`
-
-            if $? != 0
-              puts 'Failed to create AVD.'
-              exit 3
-            end
-            # avd_config_file_name = "#{avd_home}/config.ini"
-            # old_avd_config = File.read(avd_config_file_name)
-            # new_avd_config = old_avd_config.dup
-            # new_avd_config.gsub!(/vm.heapSize=([0-9]*)/) { |m| $1.to_i < heap_size ? "vm.heapSize=#{heap_size}" : m }
-            # add_property(new_avd_config, 'hw.device.manufacturer', 'Generic')
-            # add_property(new_avd_config, 'hw.device.name', '3.2" HVGA slider (ADP1)')
-            # add_property(new_avd_config, 'hw.mainKeys', 'no')
-            # add_property(new_avd_config, 'hw.sdCard', 'yes')
-            # File.write(avd_config_file_name, new_avd_config) if new_avd_config != old_avd_config
-
+            create_avd(avd_home, avd_name, heap_size, sdk_level)
             new_snapshot = true
+          else
+            # FIXME(uwe):  Patch old emulator AVDs.  Remove December 2016.
+            patch_config_ini(avd_home, heap_size)
+            # EMXIF
           end
 
-          # hw_config_file_name = "#{avd_home}/hardware-qemu.ini"
-          # if File.exists?(hw_config_file_name)
-          #   old_hw_config = File.read(hw_config_file_name)
-          #   new_hw_config = old_hw_config.gsub(/vm.heapSize=([0-9]*)/) { |m| $1.to_i < heap_size ? "vm.heapSize=#{heap_size}" : m }
-          #   File.write(hw_config_file_name, new_hw_config) if new_hw_config != old_hw_config
-          # end
-
           puts "Start emulator #{avd_name}#{' without snapshot' if no_snapshot}"
           system "emulator -avd #{avd_name} #{emulator_opts} #{'&' unless ON_WINDOWS}"
           return if ON_WINDOWS
@@ -210,6 +154,7 @@ module Ruboto
             end
           else
             puts 'Unable to start the emulator.'
+            exit 1 if ON_TRAVIS
           end
         end
 
@@ -246,6 +191,79 @@ EOF
         puts "Emulator #{avd_name} started OK."
       end
 
+      def create_avd(avd_home, avd_name, heap_size, sdk_level)
+        puts "Creating AVD #{avd_name}"
+
+        target = `android list target`.split(/----------\n/).
+            find { |l| l =~ /android-#{sdk_level}/ }
+
+        if target.nil?
+          puts "Target android-#{sdk_level} not found.  You should run"
+          puts "\n    ruboto setup -y -t #{sdk_level}\n\nto install it."
+          exit 3
+        end
+
+        abis = target.slice(/(?<=ABIs : ).*/).split(', ')
+        has_x86 = abis.find { |a| a =~ /x86/ }
+        has_x86_64 = has_x86 && abis.find { |a| a =~ /x86_64/ }
+
+        # FIXME(uwe): Remove this check when HAXM is available on travis
+        # FIXME(uwe): or the x86(_64) emulators don't require HAXM anymore
+        # Newer Android SDK tools (V24) require HAXM to run x86 emulators.
+        # HAXM is not available on travis-ci.
+        if ON_TRAVIS && sdk_level.to_i >= 22
+          abi_opt = '--abi armeabi-v7a'
+          # EMXIF
+        elsif has_x86
+          if has_x86_64
+            abi_opt = '--abi x86_64'
+          else
+            abi_opt = '--abi x86'
+          end
+        else
+          abi_opt = '--abi armeabi-v7a'
+        end
+
+        skin = 'HVGA'
+        # skin_filename = "#{Ruboto::SdkLocations::ANDROID_HOME}/platforms/android-#{sdk_level}/skins/#{skin}/hardware.ini"
+        # if File.exists?(skin_filename)
+        #   old_skin_config = File.read(skin_filename)
+        #   new_skin_config = old_skin_config.gsub(/vm.heapSize=([0-9]*)/) { |m| $1.to_i < heap_size ? "vm.heapSize=#{heap_size}" : m }
+        #   add_property(new_skin_config, 'hw.mainKeys', 'no')
+        #   add_property(new_skin_config, 'hw.lcd.density', '160')
+        #   File.write(skin_filename, new_skin_config) if new_skin_config != old_skin_config
+        # end
+
+        puts `echo no | android create avd -a -n #{avd_name} -t android-#{sdk_level} #{abi_opt} -c 64M -s #{skin} -d "Nexus One"`
+
+        if $? != 0
+          puts 'Failed to create AVD.'
+          exit 3
+        end
+        patch_config_ini(avd_home, heap_size)
+
+        # hw_config_file_name = "#{avd_home}/hardware-qemu.ini"
+        # if File.exists?(hw_config_file_name)
+        #   old_hw_config = File.read(hw_config_file_name)
+        #   new_hw_config = old_hw_config.gsub(/vm.heapSize=([0-9]*)/) { |m| $1.to_i < heap_size ? "vm.heapSize=#{heap_size}" : m }
+        #   File.write(hw_config_file_name, new_hw_config) if new_hw_config != old_hw_config
+        # end
+      end
+
+      def patch_config_ini(avd_home, heap_size)
+        avd_config_file_name = "#{avd_home}/config.ini"
+        old_avd_config = File.read(avd_config_file_name)
+        new_avd_config = old_avd_config.dup
+        new_avd_config.gsub!(/vm.heapSize=([0-9]*)/) { |m| $1.to_i < heap_size ? "vm.heapSize=#{heap_size}" : m }
+        # add_property(new_avd_config, 'hw.device.manufacturer', 'Generic')
+        # add_property(new_avd_config, 'hw.device.name', '3.2" HVGA slider (ADP1)')
+        # add_property(new_avd_config, 'hw.keyboard.lid', 'no')
+        add_property(new_avd_config, 'hw.lcd.density', '160')
+        add_property(new_avd_config, 'hw.mainKeys', 'no')
+        # add_property(new_avd_config, 'hw.sdCard', 'yes')
+        File.write(avd_config_file_name, new_avd_config) if new_avd_config != old_avd_config
+      end
+
       def device_ready?
         `adb get-state`.gsub(/^WARNING:.*$/, '').chomp == 'device'
       end

data/lib/ruboto/util/setup.rb

@@ -8,6 +8,7 @@ module Ruboto
       REPOSITORY_BASE = 'http://dl-ssl.google.com/android/repository'
       REPOSITORY_URL = "#{REPOSITORY_BASE}/repository-10.xml"
       SDK_DOWNLOAD_PAGE = 'http://developer.android.com/sdk/index.html?hl=sk'
+      ADDONS_URL = "#{REPOSITORY_BASE}/extras/intel/addon.xml"
 
       RUBOTO_GEM_ROOT = File.expand_path '../../../..', __FILE__
       WINDOWS_ELEVATE_CMD = "#{RUBOTO_GEM_ROOT}/bin/elevate_32.exe -c -w"
@@ -17,10 +18,10 @@ module Ruboto
       # Core Set up Method
       #
 
-      def setup_ruboto(accept_all, api_levels = [SdkVersions::DEFAULT_TARGET_SDK])
+      def setup_ruboto(accept_all, api_levels = [SdkVersions::DEFAULT_TARGET_SDK], upgrade_haxm = false)
         @platform_sdk_loc = {}
         api_levels = [project_api_level, *api_levels].compact.uniq
-        install_all(accept_all, api_levels) unless check_all(api_levels)
+        install_all(accept_all, api_levels, upgrade_haxm) unless check_all(api_levels)
         config_path(accept_all)
       end
 
@@ -80,6 +81,10 @@ module Ruboto
         File.join File.expand_path('~'), windows? ? 'AppData/Local/Android/android-sdk' : "android-sdk-#{android_package_os_id}"
       end
 
+      def android_haxm_directory
+        Dir[File.join(android_package_directory, 'extras', 'intel', 'Hardware_Accelerated_Execution_Manager')][0]
+      end
+
       def package_installer
         case android_package_os_id
         when LINUX
@@ -105,11 +110,11 @@ module Ruboto
         end
       end
 
-      def get_tools_version(type='tool')
+      def get_tools_version(type='tool', repo_url = REPOSITORY_URL)
         require 'rexml/document'
         require 'open-uri'
 
-        doc = REXML::Document.new(open(REPOSITORY_URL))
+        doc = REXML::Document.new(open(repo_url))
         doc.root.elements.to_a("sdk:#{type}/sdk:revision").map do |t|
           major = t.elements['sdk:major']
           minor = t.elements['sdk:minor']
@@ -272,7 +277,7 @@ module Ruboto
       # Install Methods
       #
 
-      def install_all(accept_all, api_levels)
+      def install_all(accept_all, api_levels, upgrade_haxm)
         install_java(accept_all) unless @java_loc && @javac_loc
         install_ant(accept_all) unless @ant_loc
         install_android_sdk(accept_all) unless @android_loc
@@ -280,6 +285,7 @@ module Ruboto
         # build-tools, platform-tools, tools, and haxm
         install_android_tools(accept_all) unless @dx_loc && @adb_loc && @emulator_loc && @haxm_installer_loc
         install_haxm(accept_all) unless @haxm_kext_loc
+        download_and_upgrade_haxm(true) unless upgrade_haxm.empty?
 
         if @android_loc
           api_levels.each do |api_level|
@@ -484,6 +490,7 @@ module Ruboto
         response
       end
 
+
       def install_android_sdk(accept_all)
         unless @android_loc
           puts 'Android package installer not found.'
@@ -537,27 +544,39 @@ module Ruboto
         end
       end
 
-      def download(asdk_file_name)
-        print "Downloading #{asdk_file_name}: \r"
-        uri = URI("http://dl.google.com/android/#{asdk_file_name}")
+      def download_third_party(filename, uri)
+        print "Downloading #{uri}/#{filename} \r"
+        uri = URI("#{uri}/#{filename}")
+        puts "File will be saved to #{android_haxm_directory}/#{filename}"
+        process_download("#{android_haxm_directory}/#{filename}", uri)
+      end
+
+      def process_download(filename, uri)
         body = ''
-        Net::HTTP.new(uri.host, uri.port).request_get(uri.path) do |response|
+        Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https').request_get(uri.path) do |response|
           length = response['Content-Length'].to_i
           response.read_body do |fragment|
             body << fragment
-            print "Downloading #{asdk_file_name}: #{body.length / 1024**2}MB/#{length / 1024**2}MB #{(body.length * 100) / length}%\r"
+            print "Downloading #{filename}: #{body.length / 1024**2}MB/#{length / 1024**2}MB #{(body.length * 100) / length}%\r"
           end
-          puts
         end
-        File.open(asdk_file_name, 'wb') { |f| f << body }
+        File.open(filename, 'wb') { |f| f << body }
       end
 
-      def unzip(accept_all, asdk_file_name)
+
+      def download(asdk_file_name)
+        print "Downloading #{asdk_file_name}: \r"
+        uri = URI("http://dl.google.com/android/#{asdk_file_name}")
+        process_download(asdk_file_name, uri)
+      end
+
+
+      def unzip(accept_all, asdk_file_name, extract_to='.')
         require 'zip'
         Zip::File.open(asdk_file_name) do |zipfile|
           zipfile.each do |f|
             f.restore_permissions = true
-            f.extract { accept_all }
+            f.extract("#{extract_to}/#{f.name}") { accept_all }
           end
         end
       end
@@ -581,7 +600,42 @@ module Ruboto
         end
       end
 
-      def install_haxm(accept_all)
+      def get_new_haxm_filename
+        version = get_tools_version('extra', ADDONS_URL)
+        zip_version = version.gsub(/\./, '_')
+        haxm_file_name = ''
+
+        case android_package_os_id
+        when MAC_OS_X
+          haxm_file_name = "haxm-macosx_v#{zip_version}.zip"
+        when WINDOWS
+          haxm_file_name = "haxm-windows_v#{zip_version}.zip"
+        when LINUX
+          puts 'HAXM installation on Linux is not supported, yet.'
+          version = ''
+        else
+          raise "Unknown host os: #{RbConfig::CONFIG['host_os']}"
+        end
+        return haxm_file_name, version
+      end
+
+      def download_haxm(accept_all, haxm_file_name)
+        uri = 'https://software.intel.com/sites/default/files/managed/dd/21'
+        download_third_party(haxm_file_name, uri)
+        unzip(accept_all, "#{android_haxm_directory}/#{haxm_file_name}", "#{android_haxm_directory}")
+        FileUtils.rm_f "#{android_haxm_directory}/#{haxm_file_name}"
+      end
+
+      def download_and_upgrade_haxm(accept_all)
+        print "Downloading Intel HAXM... \r"
+        filename, version = get_new_haxm_filename
+        download_haxm(accept_all, filename)
+        install_haxm(accept_all, version)
+      end
+
+      def install_haxm(accept_all, custom_version=nil)
+        filename = nil
+        haxm_file_override =  "IntelHAXM_#{custom_version}.dmg" unless custom_version.nil?
         if @haxm_installer_loc && @haxm_kext_loc.nil?
           puts 'HAXM not installed.'
           unless accept_all
@@ -592,8 +646,13 @@ module Ruboto
             case android_package_os_id
             when MAC_OS_X
               puts "Mounting the HAXM install image"
-              system "hdiutil attach #{@haxm_installer_loc}"
-              fileName = Dir['/Volumes/IntelHAXM*/IntelHAXM*.mpkg'][0]
+              if custom_version.nil?
+                system "hdiutil attach #{@haxm_installer_loc}"
+                fileName = Dir['/Volumes/IntelHAXM*/IntelHAXM*.mpkg'][0]
+              else
+                system "hdiutil attach #{android_haxm_directory}/#{haxm_file_override}"
+                fileName = Dir["/Volumes/IntelHAXM_#{custom_version}/IntelHAXM_#{custom_version}.mpkg"][0]
+              end
               puts "Starting the HAXM installer.  Sudo password required."
               system "sudo -S installer -pkg #{fileName} -target /"
             when LINUX

data/lib/ruboto/util/update.rb

@@ -168,6 +168,10 @@ module Ruboto
           return false
         end
 
+        # FIXME(uwe): Remove when JRuby 9000 works with Ruboto
+        version ||= ENV['JRUBY_JARS_VERSION'] || '~>1.7.13'
+        # EMXIF
+
         install_jruby_jars_gem(version)
         begin
           gem('jruby-jars', version) if version
@@ -213,7 +217,7 @@ module Ruboto
 
       def install_jruby_jars_gem(jruby_jars_version = ENV['JRUBY_JARS_VERSION'])
         if jruby_jars_version
-          version_requirement = " -v #{jruby_jars_version}"
+          version_requirement = " -v '#{jruby_jars_version}'"
         end
         `gem query -i -n jruby-jars#{version_requirement}`
         unless $? == 0
@@ -467,7 +471,7 @@ module Ruboto
               raise "Unpacking jruby-core jar failed: #$?" unless $? == 0
               File.delete jruby_core
               gem_version = Gem::Version.new(jruby_core_version.to_s.tr('-', '.'))
-              if gem_version >= Gem::Version.new('9.0.0.0.SNAPSHOT')
+              if gem_version >= Gem::Version.new('9.0.5.0.SNAPSHOT')
                 #noinspection RubyLiteralArrayInspection
                 excluded_core_packages = [
 
@@ -488,6 +492,7 @@ module Ruboto
                     'com/martiansoftware',
                     'com/oracle/nfi',
                     'com/oracle/truffle',
+                    'java',
                     'jni',
                     'jnr/constants/platform/darwin',
                     'jnr/constants/platform/fake',
@@ -534,22 +539,64 @@ module Ruboto
                     'org/jruby/truffle/runtime/*.class',
                     'org/jruby/truffle/translator',
                 ]
-              elsif gem_version >= Gem::Version.new('1.7.20.dev')
-                # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.20
+              elsif gem_version >= Gem::Version.new('9.0.0.0.SNAPSHOT')
+                raise "Unsupported jruby-jars version: #{gem_version}"
+              elsif gem_version >= Gem::Version.new('1.7.23.dev')
+                # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.23
+                excluded_core_packages = [
+                    '**/*Aix*',
+                    '**/*Darwin*',
+                     '**/*FreeBSD*',
+                    '**/*MacOS*',
+                    '**/*OpenBSD*',
+                    '**/*Solaris*',
+                    '**/*sunos*',
+                    '**/*Windows*',
+                    'META-INF',
+                    'com/headius/invokebinder',
+                    'com/headius/options/example',
+                    'com/kenai/constantine',
+                    'com/kenai/jffi',
+                    'com/kenai/jnr/x86asm',
+                    'com/martiansoftware',
+                    'java',
+                    'jni',
+                    'jnr/constants/platform/fake',
+                    'jnr/enxio',
+                    'jnr/ffi/annotations',
+                    'jnr/ffi/byref',
+                    'jnr/ffi/mapper',
+                    'jnr/ffi/provider',
+                    'jnr/ffi/util',
+                    'jnr/ffi/Struct$*',
+                    'jnr/ffi/types',
+                    'jnr/x86asm',
+                    'org/jruby/ant',
+                    'org/jruby/cext',
+                    'org/jruby/compiler/impl/BaseBodyCompiler*',
+                    'org/jruby/compiler/util',
+                    'org/jruby/demo',
+                    'org/jruby/embed/bsf',
+                    'org/jruby/embed/jsr223',
+                    'org/jruby/embed/osgi',
+                    'org/jruby/ext/ffi/AbstractMemory*',
+                    'org/jruby/ext/ffi/Enums*',
+                    'org/jruby/ext/ffi/io',
+                    'org/jruby/ext/ffi/jffi',
+                    'org/jruby/javasupport/bsf',
+                    'org/yecht',
+                ]
+              elsif gem_version >= Gem::Version.new('1.7.22')
+                # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.22
                 excluded_core_packages = [
-                    '**/*.sh',
                     '**/*Aix*',
                     '**/*Darwin*',
-                    '**/*darwin*',
                     '**/*FreeBSD*',
-                    '**/*freebsd*',
                     '**/*MacOS*',
                     '**/*OpenBSD*',
-                    '**/*openbsd*',
                     '**/*Solaris*',
                     '**/*sunos*',
                     '**/*Windows*',
-                    '**/*windows*',
                     'META-INF',
                     'com/headius/invokebinder',
                     'com/headius/options/example',
@@ -582,7 +629,6 @@ module Ruboto
                     'org/jruby/ext/ffi/jffi',
                     'org/jruby/javasupport/bsf',
                     'org/yecht',
-                    'yaml.rb',
                 ]
               elsif gem_version >= Gem::Version.new('1.7.19')
                 # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.19

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/activity/stack_activity_test.rb

@@ -15,15 +15,17 @@ end
 # ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0    '[28, 33, 51, 68]' expected, but got '[28, 33, 47, 64]'
 # ANDROID: 16, PLATFORM: 0.5.6,      JRuby: 1.7.3    '[28, 33, 45, 62]' expected, but got '[28, 33, 44, 61]'
 # ANDROID: 16, PLATFORM: 0.6.0,      JRuby: 9000.dev '[28, 33, 45, 62]' expected, but got '[28, 33, 45, 63]'
-# ANDROID: 19, PLATFORM: STANDALONE, JRuby: 1.7.20-SNAPSHOT '[28, 33, 43, 60]' expected, but got '[28, 33, 44, 61]'
+# ANDROID: 19, PLATFORM: STANDALONE, JRuby: 1.7.20   '[28, 33, 43, 60]' expected, but got '[28, 33, 44, 61]'
 # ANDROID: 20, PLATFORM: 1.0.2,      JRuby: 1.7.12   '[28, 33, 44, 61]' expected, but got '[28, 33, 43, 60]'
 # ANDROID: 21, PLATFORM: 1.0.2,      JRuby: 1.7.12   '[28, 33, 44, 61]' expected, but got '[28, 33, 43, 60]'
-# ANDROID: 22, PLATFORM: STANDALONE, JRuby: 1.7.20-SNAPSHOT '[28, 33, 44, 61]' expected, but got '[28, 33, 43, 60]'
+# ANDROID: 22, PLATFORM: STANDALONE, JRuby: 1.7.20   '[28, 33, 44, 61]' expected, but got '[28, 33, 43, 60]'
+# ANDROID: 23, PLATFORM: STANDALONE, JRuby: 1.7.19   '[28, 33, 43, 60]' expected, but got '[26, 31, 40, 57]'
 test('stack depth') do |activity|
   os_offset =
       case android.os.Build::VERSION::SDK_INT
       when 13 then [1, 1, 1, 1]
       when (15..19) then [0, 0, 1, 1]
+      when 23 then [-2, -2, -3, -3]
       else [0, 0, 0, 0]
       end
   jruby_offset =

data/test/app_test_methods.rb

@@ -38,6 +38,11 @@ module AppTestMethods
 
   def run_activity_tests(activity_dir)
     Dir[File.expand_path("#{activity_dir}/*", File.dirname(__FILE__))].each do |file|
+      # FIXME(uwe):  Remove when we stop testing JRuby 1.7.22 or api level 19
+      next if file =~ /rss/ && (JRUBY_JARS_VERSION == Gem::Version.new('1.7.22')) &&
+          RUBOTO_PLATFORM == 'STANDALONE' && ANDROID_OS == 19
+      # EMXIF
+
       # FIXME(uwe):  Remove when we stop testing JRuby < 1.7.20.dev
       next if file =~ /rss/ && (JRUBY_JARS_VERSION < Gem::Version.new('1.7.20.dev'))
       # EMXIF

data/test/arjdbc_test.rb

@@ -3,25 +3,19 @@ require_relative 'test_helper'
 class ArjdbcTest < Minitest::Test
   def setup
     generate_app bundle: [
-            [:activerecord, '<4.2.0'],
-            :'activerecord-jdbc-adapter',
-            :sqldroid,
-        ]
+        [:activerecord, '<4.2.0'],
+        :'activerecord-jdbc-adapter',
+        :sqldroid,
+    ]
   end
 
   def teardown
     cleanup_app
   end
 
-# FIXME(uwe):  Weird total app crash when running these tests together
-# FIXME(uwe):  Remove when we stop testing api level <= 15
-# FIXME(uwe):  or the stupid crash has been resolved
-  unless RubotoTest::ANDROID_OS <= 15 || has_stupid_crash
-    # EMXIF
-
-    def test_arjdbc
-      Dir.chdir APP_DIR do
-        File.open('src/ruboto_test_app_activity.rb', 'w') { |f| f << <<EOF }
+  def test_arjdbc
+    Dir.chdir APP_DIR do
+      File.open('src/ruboto_test_app_activity.rb', 'w') { |f| f << <<EOF }
 require 'ruboto/widget'
 require 'ruboto/util/stack'
 
@@ -94,7 +88,7 @@ class RubotoTestAppActivity
 end
 EOF
 
-        File.open('test/src/ruboto_test_app_activity_test.rb', 'w') { |f| f << <<EOF }
+      File.open('test/src/ruboto_test_app_activity_test.rb', 'w') { |f| f << <<EOF }
 activity Java::org.ruboto.test_app.RubotoTestAppActivity
 
 setup do |activity|
@@ -114,14 +108,17 @@ test("activity starts") do |activity|
 end
 EOF
 
-      end
-
-      run_app_tests
     end
 
-  # FIXME(uwe):  Remove when we stop testing api level <= 15
-  # FIXME(uwe):  or the stupid crash has been resolved
-  end
+    run_app_tests
+  end unless
+      # FIXME(uwe):  Weird total app crash when running these tests together
+      # FIXME(uwe):  Remove when we stop testing api level <= 15
+      # FIXME(uwe):  or the stupid crash has been resolved
+      RubotoTest::ANDROID_OS <= 15 || has_stupid_crash ||
+          # EMXIF
+          # FIXME(uwe):  remove when we stop supporting JRuby 1.7.22
+          # https://github.com/jruby/jruby/issues/3401
+          JRUBY_JARS_VERSION == Gem::Version.new('1.7.22')
   # EMXIF
-
 end

data/test/ruboto_gen_test.rb

@@ -91,6 +91,8 @@ class RubotoGenTest < Minitest::Test
   # APK was  7126.9KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 9.0.0.0.pre1
   # APK was  8571.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 21, JRuby: 9.0.0.0.pre1
   # APK was  4633.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 22, JRuby: 9.0.0.0.SNAPSHOT
+  # APK was  6999.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.22
+  # APK was  7006.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.23.dev
   def test_new_apk_size_is_within_limits
     apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / 1024
     version = "  PLATFORM: #{RUBOTO_PLATFORM}"
@@ -112,6 +114,8 @@ class RubotoGenTest < Minitest::Test
           '1.7.18' => 10100.0,
           '1.7.19' => 8000.0,
           '1.7.20.dev' => ANDROID_TARGET <= 15 ? 8000 : 9000.0,
+          '1.7.22' => ANDROID_TARGET <= 15 ? 7200 : 9000.0,
+          '1.7.23.dev' => ANDROID_TARGET <= 15 ? 7200 : 9000.0,
           '9.0.0.0.dev' => 8300.0,
           '9.0.0.0.pre1' => 8600.0,
           '9.0.0.0.SNAPSHOT' => 5000.0,

data/test/ruboto_setup_test.rb

@@ -2,21 +2,50 @@ require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'net/http'
 
 class RubotoSetupTest < Minitest::Test
+  include Ruboto::Util::Setup
+
   SDK_DOWNLOAD_PAGE = 'http://developer.android.com/sdk/index.html?hl=sk'
+  REPOSITORY_BASE = 'http://dl-ssl.google.com/android/repository'
+  ADDONS_URL = "#{REPOSITORY_BASE}/extras/intel/addon.xml"
+  HAXM_URL = 'https://software.intel.com/sites/default/files/managed/dd/21'
 
-  def test_if_page_still_exists
+  def test_if_sdk_page_still_exists?
     uri = URI.parse(SDK_DOWNLOAD_PAGE)
     res = Net::HTTP.get_response(uri)
+    assert_equal 200, res.code.to_i
+  end
 
+  def test_if_haxm_version_page_still_exists?
+    uri = URI.parse(ADDONS_URL)
+    res = Net::HTTP.get_response(uri)
     assert_equal 200, res.code.to_i
   end
 
+  def test_if_haxm_download_still_exists?
+    filename, version = get_new_haxm_filename
+    unless (filename.empty? || version.empty?)
+      uri = URI.parse("#{HAXM_URL}/#{filename}")
+      res = Net::HTTP.get_response(uri)
+      assert_equal 200, res.code.to_i
+    end
+  end
+
   def test_if_regex_still_applies_to_sdk
     regex = '(\>installer_.*.exe)'
     page_content = Net::HTTP.get(URI.parse(SDK_DOWNLOAD_PAGE))
     link = page_content.scan(/#{regex}/).to_s
+    assert_match /\d+(\.\d+)?(\.\d+)?/, link
+  end
 
-    assert_match /\d+(\.\d+)?(\.\d+)?/, link 
+  describe 'Upgrade HAXM' do
+    include Ruboto::Util::Setup
+    it 'should get the new HAXM file name and version' do
+      filename, version = get_new_haxm_filename
+      unless (filename.empty? || version.empty?)
+        filename.must_match /haxm-(.*)\.zip/
+        version.must_match /\d\.\d\.\d/
+      end
+    end
   end
 
 end

data/test/test_helper.rb

@@ -8,6 +8,7 @@ require 'yaml'
 require 'ruboto/sdk_versions'
 require 'ruboto/sdk_locations'
 require 'ruboto/util/update'
+require 'ruboto/util/setup'
 
 module RubotoTest
   include Ruboto::SdkVersions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruboto/ruboto
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A platform for developing apps using JRuby on Android.