ruboto 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cf1877943572ab84d12119768dd14f3f78974f0
-  data.tar.gz: 2ae6f50b354303637f7b7cd5274f74de10648182
+  metadata.gz: 722d788ed8cf384285ca9fda8e6d810dbb8f53d8
+  data.tar.gz: b9c965d06f1ad9e654c7dfdc812091eb9cbfa730
 SHA512:
-  metadata.gz: 34824bba9512f51cd583fd61e51e018b636d24a12ed39923d128b2f45ddb6c86aaa5e3fdd1a3ccb5511a459e6f9bb19973279e8be2233a87a4da67a416c46a9e
-  data.tar.gz: ef88fdcd111e94f71a4c88509b98c7e5bbdb342a736350539b1b5cff4bf3b7f8cf2c30a5d5c0eddd265f9249e1522c9d87aee2e2f22e0aa487d6bde6a5da94c4
+  metadata.gz: 87fafecf9b75f9f5693b0a1bc89ea745abd400c4f51dccce0e0bebd1952768323f6a9bd425ff2a38b8eab30d89befa372af1ecadcd6d0e47f1e39553007bf010
+  data.tar.gz: 8b70573fda9f044cdbe0ee8e3ae77219be65de682094be742bb65269db9d170d9df040d5526c0226e1812e9f665ba82a1abb399ff70adfa8b3d706c25153b9d2

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    ruboto (1.5.0.dev)
+    ruboto (1.6.0)
       main (~> 5.2)
       net-telnet (~> 0.1.1)
-      rake (~> 11.3)
+      rake (>= 11.3, < 13)
       rubyzip (~> 1.0)
 
 GEM
@@ -22,13 +22,13 @@ GEM
       pry (>= 0.9)
     map (6.6.0)
     method_source (0.8.2)
-    minitest (5.8.4)
+    minitest (5.10.1)
     net-telnet (0.1.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (11.3.0)
+    rake (12.0.0)
     rubyzip (1.2.0)
     slop (3.6.0)
 

data/RELEASE_CANDICATE_DOC.md

@@ -1,11 +1,11 @@
-Subject: [ANN] Ruboto 1.5.0 release candidate
+Subject: [ANN] Ruboto 1.6.0 release candidate
 
 Hi all!
 
-The Ruboto 1.5.0 release candidate is now available.
+The Ruboto 1.6.0 release candidate is now available.
 
-We now have properly working Ruby SSL and HTTPS!  You need jruby-jars
-1.7.25 and Android 4.4 or better :)
+In this release we add support for Android 7.0 and 7.1 "Nougat" and update
+the Android SDK to level 25.
 
 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.5.0 released!
+Subject: [ANN] Ruboto 1.6.0 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 1.5.0.
+The Ruboto team is pleased to announce the release of Ruboto 1.6.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,59 +8,47 @@ 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.5.0:
+New in version 1.6.0:
 
-We now have properly working Ruby SSL and HTTPS!  You need jruby-jars
-1.7.25 and Android 4.4 or better :)
+In this release we add support for Android 7.0 and 7.1 "Nougat" and update
+the Android SDK to level 25.
 
 API Changes:
 
-* Issue #713 Add support for Android 5.1 Lollipop
-* Issue #768 Add support for Android 6.0 Marshmallow
+* Issue #816 Set default api level for new apps to 19 (Android 4.4
+  KitKat)
+* Issue #821 Update to Android SDK Tools 25
+* Issue #826 Rename 'assert_matches' to 'assert_match' for Minitest
+  compatibility
 
 Features:
 
-* Issue #791 Update RubotoCore to ActiveRecord 4.2
-* Issue #792 Set emulator name in ruboto.yml
-* Issue #795 Set emulator device name in ruboto.yml
-* Issue #797 Set emulator skin name in ruboto.yml
-* Issue #798 ruboto.yml emulator config (donv)
-* Issue #805 Add support for the new emulator 2.0
+* Issue #815 Add support for Android 7 Nougat
+* Issue #817 Add support for Android 7.1
+* Issue #819 Add support for concurrent-ruby gem
+* Issue #820 Reload scripts with large stack during 'rake boing'
 
 Bugfixes:
 
-* Issue #726 Any reference to net/https throws LoadError for
-  org/bouncycastle/bcpkix-jdk15on/1.47/bcpkix-jdk15on-1.47
-* Issue #793 Fix OpenSSL
-* Issue #796 Adds a setting in "ruboto.yml" for the desired
-  dex_heap_size (lucasallan)
-* Issue #807 Fix SDK_DOWNLOAD_PAGE link (LucianoPC)
+* Issue #813 ArgumentError creating new emulator image (AVD)
+* Issue #818 Error when creating a new emulator image for an app with
+  empty ruboto.yml
 
 Support:
 
-* Issue #802 java.lang.UnsupportedOperationException: can't load this
-  type of class file
-* Issue #803 (NoMethodError) undefined method 'current' for
-  Java::JavaLang::Thread:Class
-
-Community:
-
-* Issue #666 Set up donations and sponsoring of the Ruboto project
-
-Pull requests:
-
-* Issue #794 Test ssl (donv)
-* Issue #812 Set ANDROID_EMULATOR_FORCE_32BIT to fix broken build
-  (celeduc)
+* Issue #809 [Solved] JRuby 1.7.22 and Crosswalk issue (multidex)
+  Verification error in java.io.File[]
+  org.jruby.util.JRubyFile.listRoots()
+* Issue #822 How well does Ruboto work with Shoes 4?
 
 Internal:
 
-* Issue #775 Release 1.5.0
-* Issue #808 Bug fixes (donv)
+* Issue #828 More test parts (donv)
+* Issue #829 Use the new authenticated protocol to manage emulators
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=41
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=42
 
 
 Installation:

data/Rakefile

@@ -538,38 +538,39 @@ task :get_jruby_jars_snapshots do
   end
 end
 
+def test_parts(api)
+  (api == 23) ? 6 : 3
+end
+
 task '.travis.yml' do
   puts "Regenerating #{'.travis.yml'}"
   source = File.read('.travis.yml')
-  test_parts = 3
   matrix = ''
   allow_failures = ''
 
-  # FIXME(uwe):  JRuby 1.7.13 works for Nettbuss.  Keep for 2016.
   # FIXME(uwe):  Test all of these that work
   [
       # ['CURRENT', [nil]],                # Running standalone is the most important way now
       # ['FROM_GEM', [:MASTER, :STABLE]], # Running standalone is the most important way now
-      ['STANDALONE', [:MASTER, :STABLE, '1.7.25', '1.7.13']],
+      ['STANDALONE', [:MASTER, :STABLE, '1.7.25']],
   ].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.  Keep for 2017.
       # FIXME(uwe):  https://github.com/ruboto/ruboto/issues/426
-      [23, 22, 21, 19, 17, 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"
-
-          next if api == 23 # FIXME(uwe):  Remove when Android 6.0 is green.  Unable to start emulator on travis.
+      [25, 24, 23, 22, 21, 19].each do |api|
+        (1..test_parts(api)).each do |n|
+          line = "    - ANDROID_TARGET=#{api} RUBOTO_PLATFORM=#{platform.ljust(10)} TEST_PART=#{n}of#{test_parts(api)}#{" JRUBY_JARS_VERSION=#{v}" if v}\n"
+
+          next if v == :MASTER || v == :STABLE
+          next if api == 25 # FIXME(uwe):  Remove when Android 7.1 is green.  No runnable ABIs on travis.
+          # next if api == 24 # FIXME(uwe):  Remove when Android 7.0 is green.  No space left on device on travis.
+          next if api == 23 # FIXME(uwe):  Remove when Android 7.0 is green.  No space left on device 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.
 
-          if v == :MASTER || v == :STABLE
-            # allow_failures << line.gsub('-', '- env:')
-            next
-          end
+          (allow_failures << line.gsub('-', '- env:')) if api == 24 # FIXME(uwe):  Remove when Android 6.0 is green.  Unable to start emulator on travis.
+
           matrix << line
         end
       end

data/Vagrantfile

@@ -27,7 +27,7 @@ Vagrant.configure(2) do |config|
   end
 
   config.vm.define 'ubuntu' do |ubuntu|
-    ubuntu.vm.box = 'ubuntu/trusty64'
+    ubuntu.vm.box = 'ubuntu/precise64'
     ubuntu.vm.provision :shell, inline: create_swap(1536)
     ubuntu.vm.provision :shell, inline: <<-SHELL
       sudo apt-get -y install git libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1
@@ -36,6 +36,7 @@ Vagrant.configure(2) do |config|
       su - vagrant -c 'mkdir -p ruboto'
       su - vagrant -c 'rsync -acPuv --exclude adb_logcat.log --exclude /tmp /vagrant/* ruboto/'
       sudo apt-get -y autoremove
+      sudo timedatectl set-timezone #{Time.now.zone}
     SHELL
   end
 

data/assets/rakelib/ruboto.device.rb

@@ -3,7 +3,9 @@
 # Methods for package installation
 #
 
-APK_FILE_REGEXP = /^-rw-r--r--\s+(?:system|\d+\s+\d+)\s+(?:system|\d+)\s+(\d+)\s+(\d{4}-\d{2}-\d{2} \d{2}:\d{2}|\w{3} \d{2}\s+(?:\d{4}|\d{2}:\d{2}))\s+(.*)$/
+# Android 7.1: -rw-r--r-- 1 system system 9462614 2016-11-24 13:20 /data/app/org.ruboto.test_app-1/base.apk
+# Android 6.0: -rw-r--r-- system   system    9462797 2016-11-24 13:05 base.apk
+APK_FILE_REGEXP = /^-rw-r--r--(?:\s+\d+)?\s+(?:system|\d+\s+\d+)\s+(?:system|\d+)\s+(\d+)\s+(\d{4}-\d{2}-\d{2} \d{2}:\d{2}|\w{3} \d{2}\s+(?:\d{4}|\d{2}:\d{2}))\s+(.*)$/
 PROJECT_DIR = File.expand_path('..', File.dirname(__FILE__))
 UPDATE_MARKER_FILE = File.join(PROJECT_DIR, 'bin', 'LAST_UPDATE')
 
@@ -15,8 +17,8 @@ def package_installed?(package_name, apk_file)
   loop do
     path_line = `adb shell pm path #{package_name}`.chomp
     path_line.gsub! /^WARNING:.*$/, ''
-    return nil if $? == 0 && path_line.empty?
-    break if $? == 0 && path_line =~ /^package:(.*)$/
+    return nil if $? != 0 || path_line.empty?
+    break if path_line =~ /^package:(.*)$/
     puts path_line
     sleep 0.5
   end
@@ -58,8 +60,8 @@ def clear_update(package, apk_file)
 end
 
 def device_path_exists?(path)
-  path_output =`adb shell ls #{path}`
-  path_output.chomp !~ /No such file or directory|opendir failed, Permission denied/
+  path_output = `adb shell ls #{path} 2>&1`.chomp
+  path_output.empty? || path_output !~ /No such file or directory|opendir failed, Permission denied/
 end
 
 def wait_for_valid_device
@@ -70,73 +72,86 @@ def wait_for_valid_device
   end
 end
 
+# Synchronize device system time with development system time.
+def set_device_time
+  # TODO: (uwe) Remove when we stop supporting Android 6.0 and older
+  if sdk_level <= 23
+    return sh "adb shell date -s #{Time.now.strftime '%Y%m%d.%H%M%S'}"
+  end
+  # ODOT
+
+  sh "adb shell date +'%Y%m%d.%H%M%S' #{Time.now.strftime '%Y%m%d.%H%M%S'}"
+end
+
 def install_apk(package, apk_file)
   wait_for_valid_device
-
   failure_pattern = /^Failure \[(.*)\]/
   success_pattern = /^Success/
-  install_timeout = 900
+  install_timeout = 5 * 60
   case package_installed?(package, apk_file)
   when true
     puts "Package #{package} already installed."
     return
   when false
-    puts "Package #{package} already installed, but of different size or timestamp.  Replacing package."
-    sh "adb shell date -s #{Time.now.strftime '%Y%m%d.%H%M%S'}"
-    output = nil
-    install_retry_count = 0
+    puts "Package #{package} already installed, but of different size or timestamp."
+    replace_apk = true
+  else
+    # Package not installed.
+  end
+
+  set_device_time
+  output = nil
+  5.times do |install_retry_count|
+    if install_retry_count > 0
+      puts output
+      puts 'Retrying install...'
+    end
+    # replace_apk ||= install_retry_count >= 3
+    puts "#{replace_apk ? 'Replacing' : 'Installing'} package #{package}"
+
+    install_start = Time.now
     begin
       Timeout.timeout install_timeout do
-        output = `adb install -r "#{apk_file}" 2>&1`
+        output = `adb install #{'-r' if replace_apk} "#{apk_file}" 2>&1`
       end
     rescue Timeout::Error
       puts "Installing package #{package} timed out after #{install_timeout}s."
-      install_retry_count += 1
-      if install_retry_count <= 3
-        puts 'Retrying install...'
-        retry
-      end
-      puts 'Trying one final time to install the package:'
-      output = `adb install -r "#{apk_file}" 2>&1`
+      next
     end
+
     if $? == 0 && output !~ failure_pattern && output =~ success_pattern
+      puts "Install took #{(Time.now - install_start).to_i}s."
       clear_update(package, apk_file)
       return
     end
     case $1
     when 'INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES'
       puts 'Found package signed with different certificate.  Uninstalling it and retrying install.'
+    when 'INSTALL_FAILED_INVALID_URI', %r{failed to copy '(?:.*)' to '(.*)/RubotoTestApp-debug.apk': Read-only file system}
+      push_dir = $1 || '/data/local/tmp'
+      puts "Maybe wrong write permissions for APK push directory #{push_dir.inspect}.  Changing permissions."
+      puts `adb shell ls -l #{File.dirname(push_dir)}`
+      puts `adb shell chmod a+rwx #{push_dir}`
+      puts `adb shell ls -l #{File.dirname(push_dir)}`
+    when 'INSTALL_FAILED_ALREADY_EXISTS'
+      puts 'Package allready exists.'
+      if replace_apk
+        puts 'Uninstalling package.'
+      else
+        replace_apk = true
+        next
+      end
     else
       puts "'adb install' returned an unknown error: (#$?) #{$1 ? "[#$1}]" : output}."
       puts "Uninstalling #{package} and retrying install."
     end
+
     uninstall_apk(package, apk_file)
-  else
-    # Package not installed.
-    sh "adb shell date -s #{Time.now.strftime '%Y%m%d.%H%M%S'}"
+    replace_apk = false
   end
-  puts "Installing package #{package}"
-  output = nil
-  install_retry_count = 0
-  begin
-    Timeout.timeout install_timeout do
-      output = `adb install "#{apk_file}" 2>&1`
-    end
-  rescue Timeout::Error
-    puts "Installing package #{package} timed out after #{install_timeout}s."
-    install_retry_count += 1
-    if install_retry_count <= 3
-      puts 'Retrying install...'
-      retry
-    end
-    puts 'Trying one final time to install the package:'
-    install_start = Time.now
-    output = `adb install "#{apk_file}" 2>&1`
-    puts "Install took #{(Time.now - install_start).to_i}s."
-  end
-  puts output
-  raise "Install failed (#{$?}) #{$1 ? "[#$1}]" : output}" if $? != 0 || output =~ failure_pattern || output !~ success_pattern
+
   clear_update(package, apk_file)
+  raise "Install failed (#{$?}) #{$1 ? "[#$1}]" : output}"
 end
 
 def uninstall_apk(package_name, apk_file)

data/assets/rakelib/ruboto.rake

@@ -231,16 +231,8 @@ file File.basename(MANIFEST_FILE) => MANIFEST_FILE
 file MANIFEST_FILE => PROJECT_PROPS_FILE do
   old_manifest = File.read(MANIFEST_FILE)
   manifest = old_manifest.dup
-
-  # FIXME(uwe):  Remove 'L' special case when Android L has been released.
-  if sdk_level == 21
-    manifest.sub!(/(android:minSdkVersion=').*?(')/) { "#{$1}L#{$2}" }
-    manifest.sub!(/(android:targetSdkVersion=').*?(')/) { "#{$1}L#{$2}" }
-  else
-    manifest.sub!(/(android:minSdkVersion=').*?(')/) { "#{$1}#{sdk_level}#{$2}" }
-    manifest.sub!(/(android:targetSdkVersion=').*?(')/) { "#{$1}#{sdk_level}#{$2}" }
-  end
-  # EMXIF
+  manifest.sub!(/(android:minSdkVersion=').*?(')/) { "#{$1}#{sdk_level}#{$2}" }
+  manifest.sub!(/(android:targetSdkVersion=').*?(')/) { "#{$1}#{sdk_level}#{$2}" }
 
   if manifest != old_manifest
     puts "\nUpdating #{File.basename MANIFEST_FILE} with target from #{File.basename PROJECT_PROPS_FILE}\n\n"
@@ -820,6 +812,24 @@ rescue Exception
   puts $!
   puts $!.backtrace.join("\n")
   raise
+end
+            END_CODE
+          elsif jar =~ %r{concurrent_ruby_ext.jar$}
+            puts "Adding JRuby extension library initialization."
+            jar_load_code = <<-END_CODE
+require 'jruby'
+puts 'Starting ConcurrentRubyExtService'
+public
+begin
+  with_large_stack(2048) do
+    Java::ConcurrentRubyExtService.new.basicLoad(JRuby.runtime)
+  end
+rescue Exception
+  puts "Exception starting ConcurrentRubyExtService"
+  puts "\#{$!.class} \#{$!.message}"
+  puts $!
+  puts $!.backtrace.join("\n")
+  raise
 end
             END_CODE
           else
@@ -920,7 +930,7 @@ end
 # Methods
 
 def sdk_level
-  File.read(PROJECT_PROPS_FILE).scan(/(?:target=android-)(\d+)/)[0][0].to_i
+  File.read(PROJECT_PROPS_FILE).scan(/(?:target=(?:android|google_apis)-)(\d+)/)[0][0].to_i
 end
 
 def strings(name)

data/assets/rakelib/ruboto.stdlib.rake

@@ -259,22 +259,6 @@ def cleanup_jars
           Java::json.ext.ParserService.new.basicLoad(JRuby.runtime)
         END_CODE
       elsif j =~ %r{jopenssl.jar$}
-        # FIXME(uwe): Use our own patched version of OpenSSL until jruby-openssl 0.9.16 is released
-        # FIXME(uwe): Remove before Ruboto release!
-        # FIXME(uwe): Remove after jruby-openssl 0.9.16 is added to the jruby-1_7 branch
-        if File.exists? 'org/jruby/ext/openssl/OpenSSL.class'
-          puts '*' * 80
-          puts 'Patching OpenSSL'
-          FileUtils.rm 'org/jruby/ext/openssl/OpenSSL.class'
-          FileUtils.mkdir_p '../../../src/org/jruby/ext/openssl'
-          # require 'ruboto'
-          # FileUtils.cp "#{Ruboto::ASSETS}/src/org/jruby/ext/openssl/OpenSSL.java",
-          #     '../../../src/org/jruby/ext/openssl/OpenSSL.java'
-          FileUtils.cp File.expand_path('../../../assets/src/org/jruby/ext/openssl/OpenSSL.java', File.dirname(__FILE__)),
-              '../../../src/org/jruby/ext/openssl/OpenSSL.java'
-          puts '*' * 80
-        end
-        # EMXIF
         jar_load_code = <<-END_CODE
           require 'jruby'
           puts 'Starting JOpenSSL Service'

data/assets/src/ruboto/activity/reload.rb

@@ -44,9 +44,11 @@ module Ruboto::Activity::Reload
       if file_string
         scripts_dir = @activity.getExternalFilesDir(nil).absolute_path + '/scripts'
         files = file_string.split(/(?<!&);/).map { |f| f.gsub(/&(.)/) { |m| m[1] } }
-        files.each do |file|
-          Log.d "load file: #{scripts_dir}/#{file}"
-          load "#{scripts_dir}/#{file}"
+        with_large_stack(size: 256) do
+          files.each do |file|
+            Log.d "load file: #{scripts_dir}/#{file}"
+            load "#{scripts_dir}/#{file}"
+          end
         end
         Log.d 'restart activity'
         if @activity.intent.action == android.content.Intent::ACTION_MAIN ||

data/assets/src/ruboto/util/stack.rb

@@ -31,8 +31,8 @@ class Thread
     block_with_logging = proc do
       begin
         block.call
-      rescue Exception
-        STDERR.puts "Exception in #{name}: #{$!}\n#{$!.backtrace.join("\n")}"
+      rescue Exception => e
+        STDERR.puts "Exception in #{name}: #{e.class} #{e}\n#{e.backtrace.join("\n")}"
         raise
       end
     end

data/assets/test/src/test_helper.rb

@@ -16,6 +16,10 @@ def assert_less_than_or_equal(limit, actual, message = nil)
   raise "#{"#{message}\n" if message}Expected '#{actual}' to be less than or equal to '#{limit}'" unless actual <= limit
 end
 
-def assert_matches(pattern, actual, message = nil)
+def assert_match(pattern, actual, message = nil)
   raise "#{"#{message}\n" if message}'#{pattern}' expected, but got '#{actual}'" unless pattern =~ actual
 end
+def assert_matches(*args)
+  warn '"assert_matches" is deprecated.  Use "assert_match" instead, for Minitest compatibility.'
+  assert_match(*args)
+end

data/lib/ruboto/commands/base.rb

@@ -19,10 +19,10 @@ module Ruboto
       include Ruboto::SdkVersions
       include Ruboto::Util::Verify
 
-      # FIXME(uwe): Remove "L" special case
-      API_LEVEL_PATTERN = /^android-(\d+|L)$/
-      API_NUMBER_PATTERN = /(\d+|L)/
-      # EMXIF
+      API_LEVEL_PATTERN = /^(android|google_apis)-(\d+)$/
+      API_NUMBER_PATTERN = /(\d+)/
+      VERSION_HELP_TEXT = "(e.g., 'android-19' or '19' for kitkat, " \
+          "'google_apis-23' for Android 6.0 with Google APIs)"
 
       def self.main
         Main do
@@ -51,17 +51,16 @@ module Ruboto
                 argument :required
                 description 'Path to where you want your app.  Defaults to the last part of the package name.'
               }
-              # FIXME(uwe): Change to cast to integer for better comparison
               option('target', 't') {
                 argument :required
                 defaults DEFAULT_TARGET_SDK
-                description "Android version to target (e.g., 'android-19' or '19' for kitkat)"
+                description "Android version to target #{VERSION_HELP_TEXT}"
                 cast { |t| t =~ API_NUMBER_PATTERN ? "android-#$1" : t }
                 validate { |t| t =~ API_LEVEL_PATTERN }
               }
               option('min-sdk') {
                 argument :required
-                description "Minimum android version supported. (e.g., 'android-19' or '19' for kitkat)"
+                description "Minimum android version supported. #{VERSION_HELP_TEXT}"
                 cast { |t| t =~ API_NUMBER_PATTERN ? "android-#$1" : t }
                 validate { |t| t =~ API_LEVEL_PATTERN }
               }
@@ -95,11 +94,13 @@ module Ruboto
                 force = params['force'].value
 
                 abort "Path (#{path}) must be to a directory that does not yet exist. It will be created." if !force && File.exists?(path)
-                abort "Target must match android-<number>: got #{target}" unless target =~ API_LEVEL_PATTERN
+                unless target =~ API_LEVEL_PATTERN
+                  abort "Target must match #{API_LEVEL_PATTERN}: got #{target}"
+                end
 
-                # FIXME(uwe): Remove the 'L' special case when Android L has been released
-                abort "Minimum Android api level is #{MINIMUM_SUPPORTED_SDK}: got #{target}" unless $1 == 'L' || $1.to_i >= MINIMUM_SUPPORTED_SDK_LEVEL
-                # EMXIF
+                if $2.to_i < MINIMUM_SUPPORTED_SDK_LEVEL
+                  abort "Minimum Android api level is #{MINIMUM_SUPPORTED_SDK}: got #{target}"
+                end
 
                 root = File.expand_path(path)
                 puts "\nGenerating Android app #{name} in #{root}..."
@@ -359,7 +360,7 @@ module Ruboto
               # FIXME(uwe): Change to cast to integer for better comparison
               option('target', 't') {
                 argument :required
-                description "Android version to target (e.g., 'android-19' or '19' for kitkat)"
+                description "Android version to target #{VERSION_HELP_TEXT}"
                 cast { |t| t =~ API_NUMBER_PATTERN ? "android-#$1" : t }
                 validate { |t| t =~ API_LEVEL_PATTERN }
               }
@@ -387,11 +388,13 @@ module Ruboto
                 end
 
                 if (target = params['target'].value)
-                  abort "Target must match android-<number>: got #{target}" unless target =~ API_LEVEL_PATTERN
+                  unless target =~ API_LEVEL_PATTERN
+                    abort "Target must match #{API_LEVEL_PATTERN}: got #{target}"
+                  end
 
-                  # FIXME(uwe):  Remove the 'L' special case when Android L has been released.
-                  abort "Minimum Android api level is #{MINIMUM_SUPPORTED_SDK}: got #{target}" unless $1 == 'L' || $1.to_i >= MINIMUM_SUPPORTED_SDK_LEVEL
-                  # EMXIF
+                  unless $2.to_i >= MINIMUM_SUPPORTED_SDK_LEVEL
+                    abort "Minimum Android api level is #{MINIMUM_SUPPORTED_SDK}: got #{target}"
+                  end
 
                   target_level = target[API_NUMBER_PATTERN]
                   update_android(target_level)
@@ -437,7 +440,7 @@ module Ruboto
             include Ruboto::Util::Setup
 
             option('target', 't') {
-              description 'sets the target Android API level to set up for (example: -t android-16)'
+              description "sets the target Android API level to set up for #{VERSION_HELP_TEXT}"
               argument :required
               default DEFAULT_TARGET_SDK
               arity -1
@@ -482,11 +485,10 @@ module Ruboto
               argument :required
               default(api_level) if api_level
               cast { |t| t =~ API_NUMBER_PATTERN ? "android-#$1" : t }
-              validate { |t| t =~ API_LEVEL_PATTERN && sdk_level_name($1.to_i) }
+              validate { |t| t =~ API_LEVEL_PATTERN && sdk_level_name($2.to_i) }
             }
 
             option('no-snapshot', 's') {
-              extend Ruboto::Util::Emulator
               description 'do not use a snapshot when starting the emulator'
             }
 

data/lib/ruboto/sdk_versions.rb

@@ -7,17 +7,17 @@ module Ruboto
         '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, '6.0' => 23
+        '5.1' => 22, '6.0' => 23, '7.0' => 24, '7.1.1' => 25
     }
     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', 23 => '6.0'
+        19 => '4.4.2', 21 => '5.0.1', 22 => '5.1', 23 => '6.0', 24 => '7.0', 25 => '7.1.1'
     }
 
     MINIMUM_SUPPORTED_SDK_LEVEL = 15
     MINIMUM_SUPPORTED_SDK = "android-#{MINIMUM_SUPPORTED_SDK_LEVEL}"
-    DEFAULT_TARGET_SDK_LEVEL = 16
+    DEFAULT_TARGET_SDK_LEVEL = 19
     DEFAULT_TARGET_SDK = "android-#{DEFAULT_TARGET_SDK_LEVEL}"
   end
 end

data/lib/ruboto/util/emulator.rb

@@ -10,7 +10,6 @@ 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
@@ -21,7 +20,7 @@ module Ruboto
         STDOUT.sync = true
         if RbConfig::CONFIG['host_cpu'] == 'x86_64'
           if ON_MAC_OS_X
-            emulator_cmd = '-m "emulator64-(crash-service|arm|x86)"'
+            emulator_cmd = '-m "emulator64-(crash-service|arm|x86)|qemu-system-x86_64"'
           elsif ON_LINUX
             emulator_cmd = '-r "emulator64-(arm|x86)"'
           else
@@ -36,24 +35,45 @@ module Ruboto
         android_device = (emulator_config && emulator_config['device']) || "Nexus One"
         new_snapshot = false
 
-        if `adb devices` =~ /emulator-5554/
-          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
-          if output =~ /(.*)\nOK\n/
-            running_avd_name = $1
-            if running_avd_name == avd_name
-              puts "Emulator #{avd_name} is already running."
-              return
+        running_emulators = `adb devices`.scan(/emulator-(\d+)/)
+        if running_emulators.any?
+          desired_emulator_is_running = false
+          running_emulators.each do |port, _|
+            t = Net::Telnet.new('Host' => 'localhost', 'Port' => port, 'Prompt' => /^OK\n|^KO:/)
+            begin
+              intro = t.waitfor(/^OK\n/)
+            rescue Net::ReadTimeout
+              puts "Timeout waiting for emulator intro."
+              kill_emulator(t)
+              next
+            end
+            if %r{Android Console: you can find your <auth_token> in\s+'(?<auth_file>.*)'} =~ intro
+              auth_token = File.read auth_file
+              t.cmd("auth #{auth_token}")
+            end
+            output = t.cmd('avd name')
+            if output =~ /(.*)\nOK\n/
+              running_avd_name = $1
+              if running_avd_name == avd_name
+                if desired_emulator_is_running
+                  puts "Stopping duplicate #{running_avd_name} emulator."
+                  kill_emulator(t)
+                else
+                  puts "Emulator #{avd_name} is already running."
+                  desired_emulator_is_running = true
+                end
+              else
+                puts "Stopping #{running_avd_name} emulator."
+                kill_emulator(t)
+              end
             else
-              puts "Emulator #{running_avd_name} is running."
+              puts "Unexpected response from emulator: #{output.inspect}"
+              puts 'Assuming wrong emulator is running.'
+              kill_emulator(t)
             end
-          else
-            puts "Unexpected response from emulator: #{output.inspect}"
-            puts 'Assuming wrong emulator is running.'
+            t.close
           end
+          return if desired_emulator_is_running
         else
           puts 'No emulator is running.'
         end
@@ -64,32 +84,11 @@ module Ruboto
           emulator_opts << ' -noskin' unless android_device
           emulator_opts << ' -no-snapshot' if no_snapshot
           if !ON_MAC_OS_X && !ON_WINDOWS && ENV['DISPLAY'].nil?
-            emulator_opts << ' -no-window -no-audio'
+            emulator_opts << ' -no-window'
+            ENV['QEMU_AUDIO_DRV'] = 'none'
           end
 
-          `killall -0 #{emulator_cmd} 2> /dev/null`
-          if $? == 0
-            `killall #{emulator_cmd}`
-            10.times do |i|
-              `killall -0 #{emulator_cmd} 2> /dev/null`
-              if $? != 0
-                break
-              end
-              if i == 3
-                print 'Waiting for emulator to die: ...'
-              elsif i > 3
-                print '.'
-              end
-              sleep 1
-            end
-            puts
-            `killall -0 #{emulator_cmd} 2> /dev/null`
-            if $? == 0
-              puts 'Emulator still running.'
-              `killall -9 #{emulator_cmd}`
-              sleep 1
-            end
-          end
+          kill_all_emulators(emulator_cmd)
 
           avd_home = "#{ENV['HOME'].gsub('\\', '/')}/.android/avd/#{avd_name}.avd"
           manifest_file = 'AndroidManifest.xml'
@@ -104,7 +103,13 @@ module Ruboto
           end
 
           puts "Start emulator #{avd_name}#{' without snapshot' if no_snapshot}"
-          system "emulator -avd #{avd_name} #{emulator_opts} #{'&' unless ON_WINDOWS}"
+          start_cmd = "emulator -avd #{avd_name} #{emulator_opts} #{'&' unless ON_WINDOWS}"
+
+          # FIXME: (uwe) Remove debug
+          puts start_cmd
+          # EMXIF
+
+          system start_cmd
           return if ON_WINDOWS
 
           3.times do |i|
@@ -193,6 +198,40 @@ EOF
         puts "Emulator #{avd_name} started OK."
       end
 
+      def kill_emulator(telnet)
+        begin
+          telnet.cmd('kill')
+        rescue Errno::ECONNRESET
+          puts "Emulator reset connection."
+        end
+      end
+
+      def kill_all_emulators(emulator_cmd)
+        `killall -0 #{emulator_cmd} 2> /dev/null`
+        if $? == 0
+          `killall #{emulator_cmd}`
+          10.times do |i|
+            `killall -0 #{emulator_cmd} 2> /dev/null`
+            if $? != 0
+              break
+            end
+            if i == 3
+              print 'Waiting for emulator to die: ...'
+            elsif i > 3
+              print '.'
+            end
+            sleep 1
+          end
+          puts
+          `killall -0 #{emulator_cmd} 2> /dev/null`
+          if $? == 0
+            puts 'Emulator still running.'
+            `killall -9 #{emulator_cmd}`
+            sleep 1
+          end
+        end
+      end
+
       def create_avd(avd_home, avd_name, android_device, heap_size, sdk_level)
         puts "Creating AVD #{avd_name}"
 
@@ -206,6 +245,7 @@ EOF
         end
 
         abis = target.slice(/(?<=ABIs : ).*/).split(', ')
+        puts "Available abis: #{abis.inspect}"
         has_x86 = abis.find { |a| a =~ /x86/ }
         has_x86_64 = has_x86 && abis.find { |a| a =~ /x86_64/ }
 
@@ -213,23 +253,28 @@ EOF
         # 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
+        avoid_x86 = ON_TRAVIS && sdk_level.to_i >= 22
+        if avoid_x86
+          abis.reject!{|a| a =~ /x86/}
+          has_x86_64 = nil
+          has_x86 = nil
+        end
+        # EMXIF
+
+        if has_x86
           if has_x86_64
-            abi_opt = '--abi x86_64'
+            abi_opt = "--abi #{has_x86_64}"
           else
-            abi_opt = '--abi x86'
+            abi_opt = "--abi #{has_x86}"
           end
         else
-          abi_opt = '--abi armeabi-v7a'
+          abi_opt = "--abi #{abis.first || 'armeabi-v7a'}"
         end
 
         ruboto_config_filename = 'ruboto.yml'
         if File.exists?(ruboto_config_filename)
           ruboto_config = YAML.load_file(ruboto_config_filename)
-          skin = ruboto_config['emulator'] && ruboto_config['emulator']['skin']
+          skin = ruboto_config && ruboto_config['emulator'] && ruboto_config['emulator']['skin']
         end
         skin ||= '768x1280'
         # skin_filename = "#{Ruboto::SdkLocations::ANDROID_HOME}/platforms/android-#{sdk_level}/skins/#{skin}/hardware.ini"
@@ -241,7 +286,7 @@ EOF
         #   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}" if skin} -d "#{android_device}"`
+        puts `echo no | android create avd #{'-a' unless avoid_x86} -n #{avd_name} -t android-#{sdk_level} #{abi_opt} -c 64M #{"-s #{skin}" if skin} -d "#{android_device}"`
 
         if $? != 0
           puts 'Failed to create AVD.'
@@ -265,7 +310,7 @@ EOF
         end
       end
 
-      def patch_config_ini(avd_home, heap_size, no_snapshot)
+      def patch_config_ini(avd_home, heap_size, no_snapshot = nil)
         avd_config_file_name = "#{avd_home}/config.ini"
         old_avd_config = File.read(avd_config_file_name)
         new_avd_config = old_avd_config.dup
@@ -276,12 +321,14 @@ EOF
         # 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')
-        add_property(new_avd_config, 'snapshot.present', (!no_snapshot).to_s)
+        unless no_snapshot.nil?
+          add_property(new_avd_config, 'snapshot.present', (!no_snapshot).to_s)
+        end
         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'
+        `adb get-state 2>&1`.gsub(/^WARNING:.*$/, '').chomp == 'device'
       end
 
       def read_property(config, property_name)

data/lib/ruboto/util/setup.rb

@@ -268,6 +268,8 @@ module Ruboto
       def check_for_android_sdk
         @android_loc = check_for('android', 'Android Package Installer',
                                  File.join(android_package_directory, 'tools', windows? ? 'android.bat' : 'android'))
+        check_for('sdkmanager', 'Android SDK Manager',
+                                 File.join(android_package_directory, 'tools', 'bin', windows? ? 'sdkmanager.bat' : 'sdkmanager'))
       end
 
       def check_for(cmd, pretty_name=nil, alt_dir=nil)
@@ -617,7 +619,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')[0]},extra-intel-Hardware_Accelerated_Execution_Manager,platform-tool,tool -a"
             update_sdk(update_cmd, accept_all)
             check_for_build_tools
             check_for_platform_tools
@@ -707,8 +709,14 @@ module Ruboto
         if accept_all || a == 'Y' || a.empty?
           android_cmd = windows? ? 'android.bat' : 'android'
 
-          # FIXME(uwe):  Does this pattern work for all api levels?
-          update_cmd = "#{android_cmd} update sdk --no-ui --filter #{api_level},sys-img-x86-#{api_level.downcase},sys-img-x86_64-#{api_level.downcase},sys-img-armeabi-v7a-#{api_level.downcase} --all"
+          # FIXME: (uwe) Change to only install the best image for this system corresponding to the abi chosen when creating an emulator
+          level = api_level[/\d+/]
+          arches = %w(x86 x86_64 armeabi-v7a arm64-v8a)
+          arches -= %w(x86 x86_64) if ON_TRAVIS && level.to_i >= 22 # TODO: (uwe) Remove when travis can run x86 images
+          abi_list = arches.product(%w(android google_apis))
+              .map{|arch, vendor| "sys-img-#{arch}-#{vendor}-#{level}"}
+          puts "Installing #{abi_list}"
+          update_cmd = "#{android_cmd} update sdk --no-ui --filter #{api_level},#{abi_list.join(',')} --all"
           # EMXIF
 
           update_sdk(update_cmd, accept_all)

data/lib/ruboto/util/update.rb

@@ -457,7 +457,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.5.0.SNAPSHOT')
+              if gem_version >= Gem::Version.new('9.0.5.0')
                 #noinspection RubyLiteralArrayInspection
                 excluded_core_packages = [
 

data/lib/ruboto/util/verify.rb

@@ -4,15 +4,18 @@ require 'yaml'
 module Ruboto
   module Util
     module Verify
+      ON_TRAVIS = ENV['TRAVIS'] == 'true' # TODO: (uwe) Maybe check "/dev/kvm" ?
+
       ###########################################################################
       #
       # Verify the presence of important components
       #
 
-      def verify_manifest
-        return @manifest if @manifest
-        abort "cannot find your AndroidManifest.xml to extract info from it. Make sure you're in the root directory of your app" unless
-        File.exists? 'AndroidManifest.xml'
+      def verify_manifest(reload: false)
+        return @manifest if @manifest && !reload
+        unless File.exists? 'AndroidManifest.xml'
+          abort "cannot find your AndroidManifest.xml to extract info from it. Make sure you're in the root directory of your app"
+        end
         @manifest = REXML::Document.new(File.read('AndroidManifest.xml')).root
       end
 

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/activity/location_activity_test.rb

@@ -12,6 +12,6 @@ end
 
 test('distanceBetween') do |activity|
   assert_equal '12531.119140625', activity.find_view_by_id(42).text.to_s
-  assert_equal '27.2149505615234', activity.find_view_by_id(43).text.to_s
-  assert_equal '27.3007125854492', activity.find_view_by_id(44).text.to_s
+  assert_match /27.2149505615234/, activity.find_view_by_id(43).text.to_s
+  assert_match /27.3007125854492/, activity.find_view_by_id(44).text.to_s
 end

data/test/activity/navigation_activity_test.rb

@@ -91,6 +91,7 @@ def start_activity_by_button(activity, button_id, activity_class_name = 'org.rub
     waitForIdleSync
     puts 'wait_for_monitor_with_timeout'
     current_activity = monitor.wait_for_activity_with_timeout(10000)
+    puts "current_activity: #{current_activity.inspect}"
   ensure
     removeMonitor(monitor)
   end

data/test/activity/ssl_activity.rb

@@ -29,7 +29,7 @@ class SslActivity
         @open_uri_thread.join
         run_on_ui_thread { @response_view.text = 'open-uri loaded OK!' }
         puts 'before open'
-        open('https://google.com/', ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE) do |f|
+        open('https://www.google.com/', ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE) do |f|
           puts 'inside open'
           body = f.read
           puts 'body'
@@ -39,7 +39,7 @@ class SslActivity
           run_on_ui_thread { @response_view.text = heading }
         end
       rescue Exception
-        puts "Exception resdum: #{$!.class} #{$!.message}"
+        puts "Exception resume: #{$!.class} #{$!.message}"
         run_on_ui_thread { @response_view.text = $!.to_s }
       end
     end

data/test/activity/stack_activity_test.rb

@@ -20,12 +20,13 @@ end
 # 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   '[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]'
+# ANDROID: 25, PLATFORM: STANDALONE, JRuby: 1.7.25   '[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]
+      when (23..25) then [-2, -2, -3, -3]
       else [0, 0, 0, 0]
       end
   jruby_offset =

data/test/app_test_methods.rb

@@ -72,6 +72,14 @@ module AppTestMethods
       next if file =~ /button|fragment|margins|navigation|psych|rss|spinner|startup_exception|subclass/ && has_stupid_crash
       # EMXIF
 
+      # FIXME(uwe):  Crash when compiling proxy classes...investigate!
+      next if file =~ /dialog_fragment|ssl|subclass/ && ANDROID_OS == 24
+      # EMXIF
+
+      # FIXME(uwe):  Remove when we stop testing Android <= 5.0
+      next if file =~ /ssl/ && ANDROID_OS <= 21
+      # EMXIF
+
       if file =~ /_test.rb$/
         next unless file =~ /#{ENV['ACTIVITY_TEST_PATTERN']}/
         snake_name = file.chomp('_test.rb')

data/test/arjdbc_test.rb

@@ -121,4 +121,4 @@ EOF
           # https://github.com/jruby/jruby/issues/3401
           JRUBY_JARS_VERSION == Gem::Version.new('1.7.22')
   # EMXIF
-end
+end unless RubotoTest::ANDROID_OS == 24 # FIXME: (uwe) remove check when crash is fixed or we stop supporting Android 7.0

data/test/rake_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('test_helper', File.dirname(__FILE__))
+require_relative 'test_helper'
 require_relative '../assets/rakelib/ruboto.device'
 
 class RakeTest < Minitest::Test

data/test/ruboto_activity_test.rb

@@ -2,23 +2,25 @@ require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class RubotoActivityTest < Minitest::Test
   def setup
+    super
     generate_app
   end
 
   def teardown
     cleanup_app
+    super
   end
 
   def test_ruboto_activity_as_entry_point
     check_platform_installation
     Dir.chdir APP_DIR do
-      #java_source_file = 'src/org/ruboto/test_app/RubotoTestAppActivity.java'
-      #source = File.read(java_source_file)
-      #assert source.gsub!(/extends org.ruboto.EntryPointActivity/, 'extends org.ruboto.RubotoActivity')
-      #File.open(java_source_file, 'w') { |f| f << source }
+      package = 'org.ruboto.test_app'
+      app_element = verify_manifest(reload: true).elements['application']
+      activity_element = app_element.elements["activity[@android:name='org.ruboto.RubotoActivity']"]
+      activity_element.attributes['android:exported'] = true
+      save_manifest
       system 'rake install'
-      #system "adb shell am start -a android.intent.action.MAIN -n org.ruboto.example_test_app/.RubotoActivity"
-      system "adb shell am start -n org.ruboto.test_app/org.ruboto.RubotoActivity -e ClassName RubotoTestAppActivity"
+      system "adb shell am start -n #{package}/org.ruboto.RubotoActivity -e ClassName RubotoTestAppActivity"
       assert_equal 0, $?, "tests failed with return code #$?"
       # FIXME(uwe):  Assert that the activity was started correctly.
     end

data/test/ruboto_gen_test.rb

@@ -86,7 +86,8 @@ class RubotoGenTest < Minitest::Test
   # 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  7081.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.25
+  # APK was  8730.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.25
   # 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 = {

data/test/ruboto_setup_test.rb

@@ -1,9 +1,10 @@
-require File.expand_path('test_helper', File.dirname(__FILE__))
+require_relative 'test_helper'
 require 'net/http'
 
 class RubotoSetupTest < Minitest::Test
   include Ruboto::Util::Setup
 
+  # TODO: (uwe) The following tests verify internals of Ruboto setup.  Should test API instead.
   def test_if_sdk_page_still_exists?
     uri = URI.parse(SDK_DOWNLOAD_PAGE)
     res = Net::HTTP.get_response(uri)
@@ -26,10 +27,10 @@ class RubotoSetupTest < Minitest::Test
   end
 
   def test_if_regex_still_applies_to_sdk
-    regex = '(\>installer_.*.exe)'
+    regex = '(\>tools_r.*.zip)'
     page_content = Net::HTTP.get(URI.parse(SDK_DOWNLOAD_PAGE))
     link = page_content.scan(/#{regex}/).to_s
-    assert_match /\d+(\.\d+)?(\.\d+)?/, link
+    assert_match /\d+(\.\d+)?(\.\d+)?/, link, page_content
   end
 
   describe 'Upgrade HAXM' do

data/test/sqldroid_test.rb

@@ -1,8 +1,5 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 
-# FIXME(uwe):  Remove check when we stop supporting Android < 4.0.3
-if RubotoTest::ANDROID_OS >= 15 || RubotoTest::RUBOTO_PLATFORM != 'STANDALONE'
-
 class SqldroidTest < Minitest::Test
   def setup
     generate_app :bundle => :sqldroid
@@ -74,7 +71,4 @@ EOF
     run_app_tests
   end
 
-end
-
-end
-# EMXIF
+end if RubotoTest::ANDROID_OS != 24 # FIXME: (uwe) Remove check when the proxy compile is fixed

data/test/test_helper.rb

@@ -44,29 +44,12 @@ module RubotoTest
   TMP_DIR = File.join PROJECT_DIR, 'tmp'
   APP_DIR = File.join TMP_DIR, APP_NAME
 
-  # FIXME(uwe):  Remove special case when Android L has been released.
-  if (ENV['ANDROID_TARGET'] && ENV['ANDROID_TARGET'] =~ /(?:android-)?L/)
-    ANDROID_TARGET = 'L'
-  else
-    ANDROID_TARGET = (ENV['ANDROID_TARGET'] && ENV['ANDROID_TARGET'].slice(/\d+/).to_i) || MINIMUM_SUPPORTED_SDK_LEVEL
-  end
-  # EMXIF
+  ANDROID_TARGET = (ENV['ANDROID_TARGET'] && ENV['ANDROID_TARGET'].slice(/\d+/).to_i) || MINIMUM_SUPPORTED_SDK_LEVEL
 
   def self.version_from_device
     puts 'Reading OS version from device/emulator'
     system 'adb wait-for-device'
-    IO.popen('adb bugreport').each_line do |line|
-      if line =~ /sdk-eng (.*?) .*? .*? test-keys/
-        version = $1
-        api_level = VERSION_TO_API_LEVEL[version]
-        raise "Unknown version: #{version}" if api_level.nil?
-        return "android-#{api_level}"
-      end
-      if line =~ /\[ro\.build\.version\.sdk\]: \[(\d+)\]/
-        return $1
-      end
-    end
-    raise 'Unable to read device/emulator apilevel'
+    `adb shell getprop ro.build.version.sdk`
   end
 
   def uninstall_jruby_jars_gem
@@ -103,10 +86,6 @@ module RubotoTest
 
   ANDROID_OS = (ENV['ANDROID_OS'] || version_from_device).slice(/\d+/).to_i
 
-  # FIXME(uwe): Remove when Android L has been released
-  ANDROID_OS = 21 if ANDROID_OS == 0
-  # EMXIF
-
   puts "ANDROID_OS: #{ANDROID_OS}"
   puts "ANDROID_TARGET: #{ANDROID_TARGET}"
 
@@ -123,14 +102,7 @@ module RubotoTest
   elsif ENV['JRUBY_JARS_VERSION']
     JRUBY_JARS_VERSION = Gem::Version.new(ENV['JRUBY_JARS_VERSION'])
   else
-    # FIXME(uwe):  Simplify when we stop supporting rubygems < 1.8.0
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
-      gem_spec = Gem::Specification.find_by_path 'jruby-jars'
-    else
-      gem_spec = Gem.searcher.find('jruby-jars')
-    end
-    # EMXIF
-
+    gem_spec = Gem::Specification.find_by_path 'jruby-jars'
     raise StandardError.new("Can't find Gem specification jruby-jars.") unless gem_spec
     JRUBY_JARS_VERSION = gem_spec.version
   end
@@ -212,7 +184,7 @@ class Minitest::Test
       if example
         Dir.chdir TMP_DIR do
           system "tar xzf #{PROJECT_DIR}/examples/#{APP_NAME}_#{example}.tgz"
-          Dir.chdir(APP_NAME) { system '../../bin/ruboto setup -y' }
+          Dir.chdir(APP_NAME) { system "#{RUBOTO_CMD} setup -y" }
         end
         Dir.chdir APP_DIR do
           File.open('local.properties', 'w') { |f| f.puts "sdk.dir=#{ANDROID_HOME}" }
@@ -256,6 +228,8 @@ class Minitest::Test
 
       Dir.chdir APP_DIR do
         write_android_manifest
+        sleep 1
+        FileUtils.touch('project.properties')
         File.write('res/layout/dummy_layout.xml', <<-EOF)
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -45,16 +45,22 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '11.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '11.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement