ruboto 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10adce79aa0f610f28d87071ec839fd64a270c73
-  data.tar.gz: fb2cfe8130c054372ae42ce7b65528fe3796857d
+  metadata.gz: 4c5388b2c49b07f2a24e6ff47ddbfc1bdf3d3c32
+  data.tar.gz: 5e403bbd0d6595fcfa3a331219ab11c78f8038e1
 SHA512:
-  metadata.gz: fdcb7a76b98f60f06f00009d80b9e128dc9b909c99e8f4d665a98954de4252db738472d44ea1961d923385b27db06d3a3471eb2bf256802400a12b0b641acdca
-  data.tar.gz: 60142ca6e0daf809b78e29ca3bb70cded944651c75e05fe17731a83d9fc4b695717b75aebaeb97f97f3aa6da4cc802bbdbef36a697ef2fefaa91ad052ced667e
+  metadata.gz: af308b2ecd2ace0e15375505db4cc4c67ef466952a64bfe761e784dcf5b3ad4a41546418cf2c1e0745a5dfb74c81f74cd36a24177bc44da3ce49429687886b23
+  data.tar.gz: e90f2a78ea73193a1bfb24ee6436921ecf6c393947d3bd4d2d17fc9fec39067da4d335dcebd5082e3f09c8aa1326aceefb4b33e7269b242b50eb9dd0f77adf06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruboto (1.4.0)
+    ruboto (1.4.1.dev)
       main (~> 5.2)
       rake (~> 10.0)
       rubyzip (~> 1.0)
@@ -21,7 +21,7 @@ GEM
       pry (>= 0.9)
     map (6.5.5)
     method_source (0.8.2)
-    minitest (5.5.1)
+    minitest (5.8.3)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)

data/README.md

@@ -1,9 +1,6 @@
-[![Gem Version](https://badge.fury.io/rb/ruboto.png)](http://badge.fury.io/rb/ruboto)
-[![Build Status](https://travis-ci.org/ruboto/ruboto.png?branch=master)](https://travis-ci.org/ruboto/ruboto)
-[![Code Climate](https://codeclimate.com/github/ruboto/ruboto.png)](https://codeclimate.com/github/ruboto/ruboto)
-
-Ruboto - JRuby On Android
-=========================
+[![Gem Version](https://badge.fury.io/rb/ruboto.svg)](http://badge.fury.io/rb/ruboto)
+[![Build Status](https://travis-ci.org/ruboto/ruboto.svg?branch=master)](https://travis-ci.org/ruboto/ruboto)
+[![Code Climate](https://codeclimate.com/github/ruboto/ruboto.svg)](https://codeclimate.com/github/ruboto/ruboto)
 
 Ruboto (JRuby on Android) is a platform for developing full stand-alone apps for
 Android using the Ruby language and libraries.  It includes support libraries

data/RELEASE_CANDICATE_DOC.md

@@ -1,15 +1,10 @@
-Subject: [ANN] Ruboto 1.4.0 release candidate
+Subject: [ANN] Ruboto 1.4.1 release candidate
 
 Hi all!
 
-The Ruboto 1.4.0 release candidate is now available.
+The Ruboto 1.4.1 release candidate is now available.
 
-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.
+Bugfixes for the 1.4.0 release.
 
 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.4.0 released!
+Subject: [ANN] Ruboto 1.4.1 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 1.4.0.
+The Ruboto team is pleased to announce the release of Ruboto 1.4.1.
 
 Ruboto (JRuby on Android) is a platform for developing full stand-alone
 apps for Android using the Ruby language and libraries.  It includes
@@ -8,78 +8,44 @@ 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.4.0:
+New in version 1.4.1:
 
-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 #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)
+Bugfixes for the 1.4.0 release.
 
 Features:
 
-* Issue #722 Start emulator without skin for "ruboto emulator"
-* Issue #756 Allow "ruboto setup --update" to update HAXM if a new
-  version is available
+* Issue #779 Differentiate the default dex heap size for 32-bit systems
+* Issue #780 Update "rake log" to handle output from Android 6.0
+* Issue #782 Do not commit the keystore by default
+* Issue #789 Add support for JRuby 1.7.24
 
 Bugfixes:
 
-* 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
+* Issue #783 Don't report changing emulator properties when they are not
+  actually changed
+* Issue #784 Improve haxm install with/without "-y" and "--upgrade"
+  options (donv)
+* Issue #785 Setup never finds Platform SDK
+* Issue #786 Use $ANDROID_HOME instead of android executable location to
+  find platforms (ahills)
+* Issue #790 Fix "--update" option for "ruboto setup"
 
-Support:
+Performance:
 
-* 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.
+* Issue #787 Refresh the benchmark server layout and design
 
-Community:
+Support:
 
-* Issue #762 How can I help? (juanjogeta)
-* Issue #766 Reduce noise on #ruboto channel from travis
-* Issue #771 How can I help? (ChaosCat)
+* Issue #749 Invalid maximum heap size: -Xmx4096M
+* Issue #761 JDK 7
 
 Internal:
 
-* 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)
+* Issue #773 Release 1.4.1
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=39
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=40
 
 
 Installation:

data/Rakefile

@@ -506,7 +506,8 @@ task :get_jruby_jars_snapshots do
   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
+  stable_gems = all_gems.grep /-1\.7\./
+  stable_gem = stable_gems.last
   FileUtils.rm_rf Dir['jruby-jars-*.gem']
   [[master_gem, 'master'], [stable_gem, 'jruby-1_7']].each do |gem, branch|
     print "Downloading #{gem}: \r"
@@ -541,34 +542,31 @@ task '.travis.yml' do
   allow_failures = ''
 
   # 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.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.22', '1.7.19', '1.7.13']],
+      ['STANDALONE', [:MASTER, :STABLE, '1.7.24', '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):  Nettbuss uses api level 15.  Keep for 2016.
       # FIXME(uwe):  https://github.com/ruboto/ruboto/issues/426
       [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.
+
+          next if v == :MASTER # FIXME(uwe):  Remove when master branch is green.
+          next if api == 23 # FIXME(uwe):  Remove when Android 6.0 is green.  Unable to start emulator on travis.
+          next if api == 22 # FIXME(uwe):  Remove when Android 5.1 is green.  Must use slow ARM emulator due to missing HAXM.
+          next if api == 22 && platform == 'STANDALONE' && v == :STABLE # FIXME(uwe):  Remove when Android 5.1 is green.  Must use slow ARM emulator due to missing HAXM.
+          next if api == 21 # FIXME(uwe):  Remove when Android 5.0 is green.
+          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.
-              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 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

data/assets/.gitignore

@@ -1,3 +1,4 @@
+*.keystore
 .bundle
 .DS_Store
 .idea

data/assets/rakelib/ruboto.rake

@@ -555,7 +555,10 @@ file APK_FILE => APK_DEPENDENCIES do |t|
   build_apk(t, false)
 end
 
-MINIMUM_DX_HEAP_SIZE = (ENV['DX_HEAP_SIZE'] && ENV['DX_HEAP_SIZE'].to_i) || 4096
+# FIXME(uwe): Simplify when we stop supporting 32-bit development environments
+DEFAULT_MIN_DX_HEAP_SIZE = RbConfig::CONFIG['host_cpu'] =~ /86/ ? 3072 : 4096
+# EMXIF
+MINIMUM_DX_HEAP_SIZE = (ENV['DX_HEAP_SIZE'] && ENV['DX_HEAP_SIZE'].to_i) || DEFAULT_MIN_DX_HEAP_SIZE
 task :patch_dex do
   DX_FILENAMES.each do |dx_filename|
     new_dx_content = File.read(dx_filename).dup
@@ -892,21 +895,21 @@ task :log, [:filter] do |t, args|
   IO.popen logcat_cmd do |logcat|
     puts "--- waiting for activity #{package}/.#{main_activity} ..."
     activity_started = false
-    started_regex_android_5_1 = Regexp.new "^\\I/ActivityManager.+Start proc (?<pid>\\d+):#{package}/.+ for activity #{package}/\\.#{main_activity}"
-    started_regex =             Regexp.new "^\\I/ActivityManager.+Start proc #{package} for activity #{package}/\\.#{main_activity}: pid=(?<pid>\\d+)"
-    restarted_regex =           Regexp.new "^\\I/ActivityManager.+START u0 {cmp=#{package}/org.ruboto.RubotoActivity.+} from pid (?<pid>\\d+)"
-    related_regex =             Regexp.new "#{package}|#{main_activity}"
+    started_regex =             %r"I.ActivityManager.+Start proc #{package} for activity #{package}/\.#{main_activity}: pid=(?<pid>\d+)"
+    started_regex_android_5_1 = %r"I.ActivityManager.+Start proc (?<pid>\d+):#{package}/.+ for activity #{package}/\.#{main_activity}"
+    restarted_regex =           %r"I.ActivityManager.+START u0 {cmp=#{package}/org.ruboto.RubotoActivity.+} from pid (?<pid>\d+)"
+    related_regex =             /#{package}|#{main_activity}/
     android_4_2_noise_regex = /Unexpected value from nativeGetEnabledTags/
     pid_regex = nil
     logcat.each_line do |line|
       line.force_encoding(Encoding::BINARY)
-      # FIXME(uwe): Remove when we stop supporting Ancdroid 4.2
+      # FIXME(uwe): Remove when we stop supporting Android 4.2
       next if line =~ android_4_2_noise_regex
       # EMXIF
       if (activity_start_match = started_regex.match(line) || started_regex_android_5_1.match(line) || restarted_regex.match(line))
         activity_started = true
         pid = activity_start_match[:pid]
-        pid_regex = Regexp.new "\\( *#{pid}\\): "
+        pid_regex = /\( *#{pid}\): /
         puts "--- activity PID=#{pid}"
       end
       if activity_started && (line =~ pid_regex || line =~ related_regex)

data/lib/ruboto/commands/base.rb

@@ -449,12 +449,22 @@ module Ruboto
               description 'answer "yes" to all interactive questions.  Will automatically install needed components.'
             }
 
-            option('upgrade', 'u') {
-                description 'upgrades intel haxm'
+            option('update', 'u') {
+                description 'updates intel haxm'
+            }
+
+            option('upgrade') {
+                description 'DEPRECATED:  Use --update instead'
             }
 
             def run
-              setup_ruboto(params['yes'].value, params['target'].values, params['upgrade'].values)
+              update = params['update'].value
+
+              # FIXME(uwe): Remove after Ruboto 1.5.0 is released
+              update ||= params['upgrade'].value
+              # EMXIF
+
+              setup_ruboto(params['yes'].value, params['target'].values, update)
             end
           end
 

data/lib/ruboto/util/emulator.rb

@@ -48,7 +48,7 @@ module Ruboto
             end
           else
             puts "Unexpected response from emulator: #{output.inspect}"
-            puts "Assuming wrong emulator is running."
+            puts 'Assuming wrong emulator is running.'
           end
         else
           puts 'No emulator is running.'
@@ -269,11 +269,13 @@ EOF
       end
 
       def add_property(new_avd_config, property_name, value)
-        pattern = /^#{property_name}=.*$/
+        pattern = /^#{property_name}=(.*)$/
         property = "#{property_name}=#{value}"
         if new_avd_config =~ pattern
-          new_avd_config.gsub! pattern, property
-          puts "Changed property: #{property}"
+          if $1 != value
+            new_avd_config.gsub! pattern, property
+            puts "Changed property: #{property}"
+          end
         else
           new_avd_config << "#{property}\n"
           puts "Added property: #{property}"

data/lib/ruboto/util/setup.rb

@@ -21,7 +21,7 @@ module Ruboto
       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, upgrade_haxm) unless check_all(api_levels)
+        install_all(accept_all, api_levels, upgrade_haxm) unless check_all(api_levels, upgrade_haxm)
         config_path(accept_all)
       end
 
@@ -161,7 +161,7 @@ module Ruboto
       # Check Methods
       #
 
-      def check_all(api_levels)
+      def check_all(api_levels, update = false)
         @existing_paths ||= []
         @missing_paths ||= []
 
@@ -179,11 +179,20 @@ module Ruboto
         @missing_paths.uniq!
 
         puts
-        ok = @java_loc && @javac_loc && @ant_loc && @android_loc && @emulator_loc && @haxm_kext_loc && @adb_loc && @dx_loc && @platform_sdk_loc.all? { |_, path| !path.nil? }
+        ok = @java_loc && @javac_loc && @ant_loc && @android_loc && @emulator_loc && haxm_ok?(update) &&
+            @adb_loc && @dx_loc && @platform_sdk_loc.all? { |_, path| !path.nil? }
         puts "    #{ok ? '*** Ruboto setup is OK! ***' : '!!! Ruboto setup is NOT OK !!!'}\n\n"
         ok
       end
 
+      def haxm_ok?(update)
+        @haxm_kext_loc && !(update && haxm_old?)
+      end
+
+      def haxm_old?
+        @haxm_kext_version != @haxm_installer_version
+      end
+
       def check_for_emulator
         @emulator_loc = check_for('emulator', 'Android Emulator',
                                   File.join(android_package_directory, 'tools', 'emulator'))
@@ -194,24 +203,38 @@ module Ruboto
         when MAC_OS_X
           @haxm_kext_loc = '/Library/Extensions/intelhaxm.kext'
           found = File.exist?(@haxm_kext_loc)
+
+          # FIXME(uwe): Remove when we stop supporting old HAXM installer versions, like mid 2016.
+          unless found
+            @haxm_kext_loc = '/System/Library/Extensions/intelhaxm.kext'
+            found = File.exist?(@haxm_kext_loc)
+          end
+          # EMXIF
+
           if found
             @haxm_kext_version = `kextstat | grep com.intel.kext.intelhaxm`.slice(/\(.*\)/)[1..-2]
           else
             @haxm_kext_loc = nil
           end
 
-          os_x_version = `sw_vers -productVersion`
-          if Gem::Version.new(os_x_version) > Gem::Version.new('10.9')
-            @haxm_installer_loc = Dir[File.join(android_package_directory, 'extras', 'intel', 'Hardware_Accelerated_Execution_Manager', 'IntelHAXM*_above*.dmg')][0]
-          else
-            @haxm_installer_loc = Dir[File.join(android_package_directory, 'extras', 'intel', 'Hardware_Accelerated_Execution_Manager', 'IntelHAXM*_below*.dmg')][0]
+          @haxm_installer_loc = Dir[File.join(android_package_directory, 'extras', 'intel', 'Hardware_Accelerated_Execution_Manager', 'IntelHAXM_*.dmg')][0]
+
+          # FIXME(uwe): Remove when we stop supporting old HAXM installer versions, like mid 2016.
+          if @haxm_installer_loc.nil?
+            os_x_version = `sw_vers -productVersion`
+            if Gem::Version.new(os_x_version) > Gem::Version.new('10.9')
+              @haxm_installer_loc = Dir[File.join(android_package_directory, 'extras', 'intel', 'Hardware_Accelerated_Execution_Manager', 'IntelHAXM*_above*.dmg')][0]
+            else
+              @haxm_installer_loc = Dir[File.join(android_package_directory, 'extras', 'intel', 'Hardware_Accelerated_Execution_Manager', 'IntelHAXM*_below*.dmg')][0]
+            end
           end
+          # EMXIF
 
-          @haxm_installer_version = @haxm_installer_loc.scan(/\d+/).join('.')[0..4] unless @haxm_installer_loc.nil? || @haxm_installer_loc.empty?
-          if @haxm_kext_version == @haxm_installer_version
-            puts "#{'%-25s' % 'Intel HAXM'}: #{(found ? "Found" : 'Not found')}"
-          else
+          @haxm_installer_version = File.basename(@haxm_installer_loc).scan(/\d+/).join('.') unless @haxm_installer_loc.nil? || @haxm_installer_loc.empty?
+          if haxm_old?
             puts "#{'%-25s' % 'Intel HAXM'}: Old   #{@haxm_kext_version}/#{@haxm_installer_version}"
+          else
+            puts "#{'%-25s' % 'Intel HAXM'}: #{(found ? 'Found' : 'Not found')}"
           end
         when LINUX
           @haxm_installer_loc = 'Not supported, yet.'
@@ -264,7 +287,7 @@ module Ruboto
       end
 
       def check_for_android_platform(api_level)
-        @platform_sdk_loc[api_level] = File.expand_path "#{@android_loc}/../../platforms/#{api_level}"
+        @platform_sdk_loc[api_level] = File.expand_path "#{android_package_directory}/platforms/#{api_level}"
         found = File.exist? @platform_sdk_loc[api_level]
         @platform_sdk_loc[api_level] = nil unless found
         puts "#{'%-25s' % "Platform SDK #{api_level}"}: #{(found ? 'Found' : 'Not found')}"
@@ -284,8 +307,8 @@ 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?
+        install_haxm(accept_all) unless haxm_ok?(upgrade_haxm)
+        # download_and_upgrade_haxm(true) if upgrade_haxm
 
         if @android_loc
           api_levels.each do |api_level|
@@ -590,7 +613,7 @@ module Ruboto
           end
           if accept_all || a == 'Y' || a.empty?
             android_cmd = windows? ? 'android.bat' : 'android'
-            update_cmd = "#{android_cmd} --silent update sdk --no-ui --filter build-tools-#{get_tools_version('build-tool')},extra-intel-Hardware_Accelerated_Execution_Manager,platform-tool,tool -a"
+            update_cmd = "#{android_cmd} --silent update sdk --no-ui --filter build-tools-#{get_tools_version('build-tool')},extra-intel-Hardware_Accelerated_Execution_Manager,platform-tool,tool"
             update_sdk(update_cmd, accept_all)
             check_for_build_tools
             check_for_platform_tools
@@ -634,18 +657,26 @@ module Ruboto
       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.'
+        if @haxm_installer_loc && (@haxm_kext_loc.nil? || haxm_old?)
+          if @haxm_kext_loc.nil?
+            puts 'HAXM not installed.'
+          else
+            puts "HAXM is old: #{@haxm_kext_version} / #{@haxm_installer_version}"
+          end
+
           unless accept_all
-            print 'Would you like to install HAXM? (Y/n): '
+            if @haxm_kext_loc.nil?
+              print 'Would you like to install HAXM? (Y/n): '
+            else
+              print 'Would you like to update HAXM? (Y/n): '
+            end
             a = STDIN.gets.chomp.upcase
           end
           if accept_all || a == 'Y' || a.empty?
             case android_package_os_id
             when MAC_OS_X
-              puts "Mounting the HAXM install image"
+              puts 'Mounting the HAXM install image'
               if custom_version.nil?
                 system "hdiutil attach #{@haxm_installer_loc}"
                 fileName = Dir['/Volumes/IntelHAXM*/IntelHAXM*.mpkg'][0]
@@ -653,7 +684,7 @@ module Ruboto
                 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."
+              puts 'Starting the HAXM installer.  Sudo password required.'
               system "sudo -S installer -pkg #{fileName} -target /"
             when LINUX
               puts '    HAXM installation on Linux is not supported, yet.'

data/lib/ruboto/util/update.rb

@@ -490,9 +490,6 @@ module Ruboto
                     'com/kenai/jffi',
                     'com/kenai/jnr/x86asm',
                     'com/martiansoftware',
-                    'com/oracle/nfi',
-                    'com/oracle/truffle',
-                    'java',
                     'jni',
                     'jnr/constants/platform/darwin',
                     'jnr/constants/platform/fake',
@@ -527,22 +524,11 @@ module Ruboto
                     # 'org/jruby/runtime/invokedynamic', # Should be excluded
                     # 'org/jruby/runtime/opto',              # What is this?
                     # 'org/jruby/runtime/opto/OptoFactory*', # What is this?
-                    'org/jruby/truffle',
-                    'org/jruby/truffle/*.class',
-                    'org/jruby/truffle/nodes',
-                    'org/jruby/truffle/runtime/control',
-                    'org/jruby/truffle/runtime/core',
-                    'org/jruby/truffle/runtime/methods',
-                    'org/jruby/truffle/runtime/signal',
-                    'org/jruby/truffle/runtime/subsystems',
-                    'org/jruby/truffle/runtime/util',
-                    'org/jruby/truffle/runtime/*.class',
-                    'org/jruby/truffle/translator',
                 ]
               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
+              elsif gem_version >= Gem::Version.new('1.7.25.dev')
+                # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.25
                 excluded_core_packages = [
                     '**/*Aix*',
                     '**/*Darwin*',
@@ -551,7 +537,6 @@ module Ruboto
                     '**/*OpenBSD*',
                     '**/*Solaris*',
                     '**/*sunos*',
-                    '**/*Windows*',
                     'META-INF',
                     'com/headius/invokebinder',
                     'com/headius/options/example',
@@ -559,8 +544,8 @@ module Ruboto
                     'com/kenai/jffi',
                     'com/kenai/jnr/x86asm',
                     'com/martiansoftware',
-                    'java',
                     'jni',
+                    'jnr/**/*windows*',
                     'jnr/constants/platform/fake',
                     'jnr/enxio',
                     'jnr/ffi/annotations',
@@ -571,6 +556,7 @@ module Ruboto
                     'jnr/ffi/Struct$*',
                     'jnr/ffi/types',
                     'jnr/x86asm',
+                    'org/jruby/**/*windows*',
                     'org/jruby/ant',
                     'org/jruby/cext',
                     'org/jruby/compiler/impl/BaseBodyCompiler*',
@@ -586,17 +572,16 @@ module Ruboto
                     '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
+              elsif gem_version >= Gem::Version.new('1.7.24.dev')
+                # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.24
                 excluded_core_packages = [
                     '**/*Aix*',
                     '**/*Darwin*',
-                    '**/*FreeBSD*',
+                     '**/*FreeBSD*',
                     '**/*MacOS*',
                     '**/*OpenBSD*',
                     '**/*Solaris*',
                     '**/*sunos*',
-                    '**/*Windows*',
                     'META-INF',
                     'com/headius/invokebinder',
                     'com/headius/options/example',
@@ -605,6 +590,7 @@ module Ruboto
                     'com/kenai/jnr/x86asm',
                     'com/martiansoftware',
                     'jni',
+                    'jnr/**/*windows*',
                     'jnr/constants/platform/fake',
                     'jnr/enxio',
                     'jnr/ffi/annotations',
@@ -615,6 +601,7 @@ module Ruboto
                     'jnr/ffi/Struct$*',
                     'jnr/ffi/types',
                     'jnr/x86asm',
+                    'org/jruby/**/*windows*',
                     'org/jruby/ant',
                     'org/jruby/cext',
                     'org/jruby/compiler/impl/BaseBodyCompiler*',
@@ -630,6 +617,12 @@ module Ruboto
                     'org/jruby/javasupport/bsf',
                     'org/yecht',
                 ]
+              elsif gem_version >= Gem::Version.new('1.7.23')
+                # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.23
+                excluded_core_packages = %w(**/*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 = %w(**/*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 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.19')
                 # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.19
                 excluded_core_packages = %w(**/*.sh **/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius/invokebinder com/headius/options/example com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/enxio jnr/ffi/annotations jnr/ffi/byref jnr/ffi/mapper jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/Aix* jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* 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 yaml.rb)

data/lib/ruboto/version.rb

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

data/test/app_test_methods.rb

@@ -38,17 +38,9 @@ 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
-
-      # FIXME(uwe):  Remove when we release RubotoCore based on JRuby 1.7.20
-      next if file =~ /rss/ && (RUBOTO_PLATFORM == 'CURRENT' || RUBOTO_PLATFORM == 'FROM_GEM')
+      # FIXME(uwe):  Remove when we stop testing JRuby 1.7.24 or api level 19
+      next if file =~ /rss/ && JRUBY_JARS_VERSION <= Gem::Version.new('1.7.24') &&
+          (RUBOTO_PLATFORM == 'STANDALONE' || RUBOTO_PLATFORM == 'CURRENT') && ANDROID_OS == 19
       # EMXIF
 
       # FIXME(uwe):  Remove when we stop testing api level < 16

data/test/minimal_app_test.rb

@@ -21,7 +21,8 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
     # APK was 4.3MB.  JRuby: 1.7.8,  ANDROID_TARGET: 16
     # APK was 4.4MB.  JRuby: 1.7.12, ANDROID_TARGET: 19
     # APK was 4.4MB.  JRuby: 1.7.14, ANDROID_TARGET: 19
-    # APK was 4.6MB.  JRuby: 1.7.20.dev, ANDROID_TARGET: 19
+    # APK was 4.6MB.  JRuby: 1.7.20, ANDROID_TARGET: 19
+    # APK was 4.7MB.  JRuby: 1.7.24, ANDROID_TARGET: 23
     # APK was 4.2MB.  JRuby: 9000.dev, ANDROID_TARGET: 10
     # APK was 4.2MB.  JRuby: 9000.dev, ANDROID_TARGET: 15
     # APK was 4.6MB.  JRuby: 9000.dev, ANDROID_TARGET: 16
@@ -35,9 +36,10 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
           '1.7.11' => 4.4,
           '1.7.12' => 4.4,
           '1.7.14' => 4.4,
-          '1.7.20.dev' => 4.6,
+          '1.7.20' => 4.6,
+          '1.7.24' => 4.7,
           '9.0.0.0.dev' => 4.6,
-      }[JRUBY_JARS_VERSION.to_s] || 4.6
+      }[JRUBY_JARS_VERSION.to_s] || 4.7
       lower_limit = upper_limit * 0.9
       version_message ="JRuby: #{JRUBY_JARS_VERSION}, ANDROID_TARGET: #{ANDROID_TARGET}"
       assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}MB: #{'%.1f' % apk_size.ceil(1)}MB.  #{version_message}"

data/test/ruboto_gen_test.rb

@@ -79,48 +79,42 @@ class RubotoGenTest < Minitest::Test
   # APK was  6721.6KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.19
   # APK was  7882.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.19
   # APK was 10109.9KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 21, JRuby: 1.7.19
-
-  # Conflict?
-  # APK was  7040.6KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.20.dev
-  # APK was  8938.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.20.dev
-
-  # APK was  6689.5KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 9000.dev
-  # APK was  7012.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 9000.dev
-  # APK was  8015.9KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 17, JRuby: 9000.dev
-  # APK was  8232.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 9000.dev
-  # 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  7040.6KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.20
+  # APK was  8938.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.20
   # 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
+  # APK was  8501.5KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 23, JRuby: 1.7.22
+  # APK was  7006.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.23
+  # APK was  7083.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.24
+  # APK was  8596.6KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.24
+  # APK was  7081.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.25.dev
+  # APK was  4633.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 22, JRuby: 9.0.0.0.SNAPSHOT
+  # APK was  8762.6KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 23, JRuby: 9.0.5.0.SNAPSHOT
+  LIMITS = {
+      '~>9.0.5.0.SNAPSHOT' => ANDROID_TARGET <= 15 ? 7200 : 9800.0,
+      '~>1.7.24' => ANDROID_TARGET <= 15 ? 7200 : 9000.0,
+      '~>1.7.22' => ANDROID_TARGET <= 15 ? 7200 : 9000.0,
+      '1.7.20' => ANDROID_TARGET <= 15 ? 8000 : 9000.0,
+      '1.7.19' => 8000.0,
+      '1.7.18' => 10100.0,
+      '1.7.17' => 9999.0,
+      '1.7.15' => 8000.0,
+      '1.7.14' => 9800.0,
+      '1.7.13' => 8000.0,
+      '1.7.12' => 9800.0,
+      '~>1.7.5' => 8800.0,
+      '1.7.4' => 8500.0,
+  }
+
   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}"
-    version << ", ANDROID_TARGET: #{ANDROID_TARGET}"
+    version_string = "  PLATFORM: #{RUBOTO_PLATFORM}"
+    version_string << ", ANDROID_TARGET: #{ANDROID_TARGET}"
     if RUBOTO_PLATFORM == 'STANDALONE'
-      upper_limit = {
-          '1.7.4' => 8500.0,
-          '1.7.5' => 8800.0,
-          '1.7.6' => 8800.0,
-          '1.7.8' => 8800.0,
-          '1.7.9' => 8800.0,
-          '1.7.10' => 8800.0,
-          '1.7.11' => 8800.0,
-          '1.7.12' => 9800.0,
-          '1.7.13' => 8000.0,
-          '1.7.14' => 9800.0,
-          '1.7.15' => 8000.0,
-          '1.7.17' => 9999.0,
-          '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,
-      }[JRUBY_JARS_VERSION.to_s] || 9800.0
-      version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
+      upper_limit = LIMITS.each do |version_spec, value|
+        break value if Gem::Requirement.new(version_spec) =~ JRUBY_JARS_VERSION
+      end
+      raise "Unknown JRuby version: #{JRUBY_JARS_VERSION}" if upper_limit == LIMITS
+      version_string << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
       upper_limit = {
           10 => 67.0,
@@ -132,8 +126,8 @@ class RubotoGenTest < Minitest::Test
       }[ANDROID_TARGET] || 76.0
     end
     lower_limit = upper_limit * 0.8
-    assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}KB: #{'%.1f' % apk_size.ceil(1)}KB.#{version}"
-    assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}KB: #{'%.1f' % apk_size.floor(1)}KB.  You should lower the limit.#{version}"
+    assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}KB: #{'%.1f' % apk_size.ceil(1)}KB.#{version_string}"
+    assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}KB: #{'%.1f' % apk_size.floor(1)}KB.  You should lower the limit.#{version_string}"
   end
 
   def test_gen_subclass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -90,7 +90,6 @@ files:
 - Vagrantfile
 - assets/.gitignore
 - assets/Rakefile
-- assets/bin/LAST_UPDATE
 - assets/libs/dx.jar
 - assets/rakelib/ruboto.device.rb
 - assets/rakelib/ruboto.rake
@@ -256,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruboto/ruboto
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A platform for developing apps using JRuby on Android.