ruboto 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa80ecb3d9c8d5a37b94142f2a1fe730daad9563
-  data.tar.gz: bca65a11d086368713f67496b1ce279e17c56480
+  metadata.gz: 4bc93dda49229814d2889824399ff50031071d5a
+  data.tar.gz: 69ec9f1793ddb2d08e0f715b495d3ec7ec5a5758
 SHA512:
-  metadata.gz: d2b7f8bd447f38c527684f6b4caaa193f5ea7e88388a98888ace26ab6e85228d0f122d9ce6e1ef0c9c20c33bd50b69cda678fb4ce8e6cacd0382ea8596c8c10f
-  data.tar.gz: 7c929fcee3c3f860dd33930618d46dfc0350c21a745872db259435c8b2993ce674fe9afdd2698dcda94ef0a02410aa423a4a2792d37d79cee92dee9da700e640
+  metadata.gz: 5a7416a14f651cee7d9318c4342438c982c8d8a529b79e7dea044424eae1e2abe07461fc9ed5f12ff174dc23be32ade650fa1c9d9c1a9b13370b427ecd992504
+  data.tar.gz: eb20558feac71d3fa8fd7f513e39c69eac3f965f79547bbbb39992f326925b5ea258a092cdf2c438ece7c244760f6647b69eb0b7be87c436e4898edb9a106457

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ruboto (1.0.3)
-      main (~> 5.2.0)
+    ruboto (1.1.0)
+      main (~> 5.2)
       rake (~> 10.0)
       rubyzip (~> 1.0)
 

data/README.md

@@ -1,3 +1,4 @@
+[![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

data/RELEASE_CANDICATE_DOC.md

@@ -1,14 +1,27 @@
-Subject: [ANN] Ruboto 1.0.3 release candidate
+Subject: [ANN] Ruboto 1.1.0 release candidate
 
 Hi all!
 
-The Ruboto 1.0.3 release candidate is now available.
-
-This release focuses on stability and introduces a new mechanism for
-reducing the footprint of your app using the ruboto.yml config file.  You
-can now specify the Ruby compatibility level of your app (1.8/1.9/2.0) and
-which parts of the Ruby Standard Library you want to use.  Ruboto will now
-strip the parts you don't need, making your app a bit smaller.
+The Ruboto 1.1.0 release candidate is now available.
+
+This release adds support for large projects with more than 64K methods
+and Ruby stdlib HTTPS/SSL.  HTTPS/SSL using the Android APIs is working as
+before.
+
+To use the Ruby stdlib SSL features you need to include JRuby 1.7.13 or
+later in your app, and set the Android target to Android 4.1 (api level
+android-16) or later.  JRuby 1.7.13 has not been released yet, but you can
+use the "jruby-1_7" or "master" branches of JRuby if you want to try it
+now.
+
+The large app feature utilises the "multi-dex" option of the Android
+tooling, and also requires the target of your project to be set to Android
+4.1 (api level android-16) or later.
+
+The SSL feature is still new and will be improved in the coming releases
+of Ruboto.  An example is that accessing GitHub by https does not work out
+of the box.  This is being tracked as Issue #627 , and we would very much
+like contributors on this.
 
 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.0.3 released!
+Subject: [ANN] Ruboto 1.1.0 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 1.0.3.
+The Ruboto team is pleased to announce the release of Ruboto 1.1.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,43 +8,87 @@ 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.0.3:
-
-This release focuses on stability and introduces a new mechanism for
-reducing the footprint of your app using the ruboto.yml config file.  You
-can now specify the Ruby compatibility level of your app (1.8/1.9/2.0) and
-which parts of the Ruby Standard Library you want to use.  Ruboto will now
-strip the parts you don't need, making your app a bit smaller.
+New in version 1.1.0:
+
+This release adds support for large projects with more than 64K methods
+and Ruby stdlib HTTPS/SSL.  HTTPS/SSL using the Android APIs is working as
+before.
+
+To use the Ruby stdlib SSL features you need to include JRuby 1.7.13 or
+later in your app, and set the Android target to Android 4.1 (api level
+android-16) or later.  JRuby 1.7.13 has not been released yet, but you can
+use the "jruby-1_7" or "master" branches of JRuby if you want to try it
+now.
+
+The large app feature utilises the "multi-dex" option of the Android
+tooling, and also requires the target of your project to be set to Android
+4.1 (api level android-16) or later.
+
+The SSL feature is still new and will be improved in the coming releases
+of Ruboto.  An example is that accessing GitHub by https does not work out
+of the box.  This is being tracked as Issue #627 , and we would very much
+like contributors on this.
 
 Features:
 
-* Issue #418 Dynamic Ruboto runtime sizing and inclusion
-* Issue #576 Make Android 4.0 the default target.
-* Issue #592 Update to JRuby 1.7.12
+* Issue #154 Add support for SSL
+* Issue #459 openssl jruby error
+* Issue #601 Support large projects using multiple dex files
+* Issue #605 Easily change the JRuby version with "ruboto <gen|update>
+  jruby <version>"
+* Issue #606 Allow setting the JRuby version when creating or updating a
+  project with "--with-jruby <version>"
+* Issue #608 Allow starting the emulator without using a snapshot
+* Issue #610 Screen Scraper alongside Repository XML (daneb)
+* Issue #611 Allow setting flags when starting a RubotoActivity
+* Issue #623 If the emulator starts, but does not respond, retry without
+  loading a snapshot
+* Issue #624 Allow setting the Android API target level for "ruboto
+  update app"
 
 Bugfixes:
 
-* Issue #529 rake install start fails on windows
-* Issue #566 ruboto emulator -t android-19 failed
-* Issue #580 Ruboto setup fails if the path configuration script doesn't
-  exist
-* Issue #582 JRuby 9000 tests fail
-* Issue #583 'ruboto setup' crashes when config file does not exist.
-* Issue #585 rake install start does not power up app in Android 4.4
-  Kitkat emulator and sleeps at build successful
-* Issue #587 warning breaks is_installed?
+* Issue #342 require 'net/https' makes the app crash
+* Issue #586 ruboto doesn't recover from failed adb devices command
+* Issue #596 Detecting of dependencies misses open-uri due to dash in
+  file name
+* Issue #597 Auto dependencies should not store application source
+* Issue #598 Ruboto-Core Package file is invalid
+* Issue #604 Use the correct archive name when downloading Android SDK
+  components
+* Issue #612 Ruboto setup on Failing on Mac OS X
+* Issue #618 Intelhaxm - Mac OS X more generic (daneb)
+* Issue #622 Intelhaxm (daneb)
+
+Performance:
+
+* Issue #599 Speed up displaying Options Menu
+* Issue #616 Speed up Activity#setContentView
 
 Support:
 
-* Issue #579 Android platform SDK for android-10 not found (v1.0.2)
+* Issue #591 Problem completing the "gosu_android game" tutorial
+
+Community:
+
+* Issue #567 How can I help? (Noeyfan)
+* Issue #570 How can I help? (aripoya)
+* Issue #571 How can I help? (cjbcross)
+* Issue #602 How can I help? (yamishi13)
+* Issue #603 How can I help? (daneb)
+
+Pull requests:
+
+* Issue #588 Wait for valid device before installing (bootstraponline)
+* Issue #609 Scraping of Android SDK for Latest Version (daneb)
 
-Internal:
+Other:
 
-* Issue #577 Domain expired
+* Issue #607 Remove the deprecated "ruboto update ruboto" command
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=28
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=19
 
 
 Installation:
@@ -53,13 +97,13 @@ To use Ruboto, you need to install a Ruby implementation.  Then do
 (possibly as root/administrator)
 
     gem install ruboto
-    ruboto setup
+    ruboto setup -y
 
 To create a project do
 
     ruboto gen app --package <your.package.name>
     cd <project directory>
-    ruboto setup
+    ruboto setup -y
 
 To run an emulator for your project
 

data/Rakefile

@@ -153,8 +153,8 @@ def get_github_issues
   milestone_description = milestone_description.split("\r\n").map(&:wrap).join("\r\n")
   categories = {
       'Features' => 'feature', 'Bugfixes' => 'bug',
-      'Documentation' => 'documentation', 'Support' => 'support',
-      'Community' => 'community',
+      'Performance' => 'performance', 'Documentation' => 'documentation',
+      'Support' => 'support', 'Community' => 'community',
       'Pull requests' => nil, 'Internal' => 'internal',
       'Rejected' => 'rejected', 'Other' => nil
   }
@@ -233,10 +233,10 @@ New in version #{milestone_name}:
 #{milestone_description}
 
 #{(categories.keys & grouped_issues.keys).map do |cat|
-  "#{cat}:\n
-#{grouped_issues[cat].map { |i| %Q{* Issue ##{i['number']} #{i['title'].gsub('`', "'")}}.wrap(2) }.join("\n")}
+    "#{cat}:\n
+#{grouped_issues[cat].map { |i| %Q{* Issue ##{i['number']} #{i['title'].gsub('`', "'")}#{" (#{i['user']['login']})" if i['pull_request'] && i['pull_request']['html_url']}}.wrap(2) }.join("\n")}
 "
-end.join("\n")}
+  end.join("\n")}
 You can find a complete list of issues here:
 
 * https://github.com/ruboto/ruboto/issues?state=closed&milestone=#{milestone}
@@ -248,13 +248,13 @@ To use Ruboto, you need to install a Ruby implementation.  Then do
 (possibly as root/administrator)
 
     gem install ruboto
-    ruboto setup
+    ruboto setup -y
 
 To create a project do
 
     ruboto gen app --package <your.package.name>
     cd <project directory>
-    ruboto setup
+    ruboto setup -y
 
 To run an emulator for your project
 
@@ -426,7 +426,7 @@ namespace :platform do
   file PLATFORM_PROJECT do
     sh "git clone --depth 1 https://github.com/ruboto/ruboto-core.git #{PLATFORM_PROJECT}"
     Dir.chdir PLATFORM_PROJECT do
-      sh "ruby -rubygems -I#{File.expand_path('lib', File.dirname(__FILE__))} ../../bin/ruboto update app"
+      sh "ruby -rubygems -I#{File.expand_path('lib', File.dirname(__FILE__))} ../../bin/ruboto update app --force"
     end
   end
 
@@ -460,25 +460,27 @@ namespace :platform do
     puts 'Downloading the current RubotoCore platform release apk'
     uri = URI('https://raw.github.com/ruboto/ruboto.github.com/master/downloads/RubotoCore-release.apk')
     begin
-      Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https',
-          :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
-        headers = {'User-Agent' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; de-at) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10'}
+      headers = {'User-Agent' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; de-at) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10'}
+      catch :download_ok do
         loop do
-          response = http.get(uri.request_uri, headers)
-          if response.code == '200'
-            File.open(PLATFORM_CURRENT_RELEASE_APK, 'wb') { |f| f << response.body }
-            break
-          elsif response.code == '302'
-            headers.update('Referer' => uri.to_s)
-            if (cookie = response.response['set-cookie'])
-              headers.update('Cookie' => cookie)
+          Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https',
+              :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
+            response = http.get(uri.request_uri, headers)
+            if response.code == '200'
+              File.open(PLATFORM_CURRENT_RELEASE_APK, 'wb') { |f| f << response.body }
+              throw :download_ok
+            elsif response.code == '301' || response.code == '302'
+              headers.update('Referer' => uri.to_s)
+              if (cookie = response.response['set-cookie'])
+                headers.update('Cookie' => cookie)
+              end
+              uri = URI(response['location'].gsub(/^\//, 'http://ruboto.org/'))
+              puts "Following redirect to #{uri}."
+            else
+              puts "Got an unexpected response (#{response.code}).  Retrying download."
+              puts response.inspect
+              sleep 1
             end
-            uri = URI(response['location'].gsub(/^\//, 'http://ruboto.org/'))
-            puts "Following redirect to #{uri}."
-          else
-            puts "Got an unexpected response (#{response.code}).  Retrying download."
-            puts response.inspect
-            sleep 1
           end
         end
       end

data/assets/rakelib/ruboto.rake

@@ -93,7 +93,9 @@ JAVA_SOURCE_FILES = Dir[File.expand_path 'src/**/*.java']
 RUBY_SOURCE_FILES = Dir[File.expand_path 'src/**/*.rb']
 OTHER_SOURCE_FILES = Dir[File.expand_path 'src/**/*'] - JAVA_SOURCE_FILES - RUBY_SOURCE_FILES
 CLASSES_CACHE = "#{PROJECT_DIR}/bin/#{build_project_name}-debug-unaligned.apk.d"
-APK_DEPENDENCIES = [:patch_dex, MANIFEST_FILE, RUBOTO_CONFIG_FILE, BUNDLE_JAR, CLASSES_CACHE] + JRUBY_JARS + JARS + JAVA_SOURCE_FILES + RESOURCE_FILES + RUBY_SOURCE_FILES + OTHER_SOURCE_FILES
+BUILD_XML_FILE = "#{PROJECT_DIR}/build.xml"
+APK_DEPENDENCIES = [:patch_dex, MANIFEST_FILE, BUILD_XML_FILE, RUBOTO_CONFIG_FILE, BUNDLE_JAR, CLASSES_CACHE] + JRUBY_JARS + JARS + JAVA_SOURCE_FILES + RESOURCE_FILES + RUBY_SOURCE_FILES + OTHER_SOURCE_FILES
+QUICK_APK_DEPENDENCIES = APK_DEPENDENCIES - RUBY_SOURCE_FILES
 KEYSTORE_FILE = (key_store = File.readlines('ant.properties').grep(/^key.store=/).first) ? File.expand_path(key_store.chomp.sub(/^key.store=/, '').sub('${user.home}', '~')) : "#{build_project_name}.keystore"
 KEYSTORE_ALIAS = (key_alias = File.readlines('ant.properties').grep(/^key.alias=/).first) ? key_alias.chomp.sub(/^key.alias=/, '') : build_project_name
 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+(.*)$/
@@ -137,7 +139,7 @@ task :debug => APK_FILE
 
 namespace :debug do
   desc 'build debug package if compiled files have changed'
-  task :quick => APK_DEPENDENCIES - RUBY_SOURCE_FILES do |t|
+  task :quick => QUICK_APK_DEPENDENCIES do |t|
     build_apk(t, false)
   end
 end
@@ -236,6 +238,107 @@ end
 
 file RUBOTO_CONFIG_FILE
 
+task :build_xml => BUILD_XML_FILE
+file BUILD_XML_FILE => RUBOTO_CONFIG_FILE do
+  puts 'patching build.xml'
+
+  require 'yaml'
+
+  multi_dex = (YAML.load(File.read(RUBOTO_CONFIG_FILE)) || {})['multi_dex']
+  ant_script = File.read(BUILD_XML_FILE)
+
+  # FIXME(uwe):  There is no output from this DEX helper.  Difficult to debug.
+  # FIXME(uwe):  Ensure that pre-dexed jars are not dexed again.
+  # FIXME(uwe):  Move this logic to the rakelib to enable reacting to ruboto.yml changes.
+  # https://android.googlesource.com/platform/tools/base/+/master/legacy/ant-tasks/src/main/java/com/android/ant/DexExecTask.java
+  # def patch_ant_script(min_sdk, ant_script = File.read('build.xml'))
+  start_marker = '<!-- BEGIN added by Ruboto -->'
+  end_marker = '<!-- END added by Ruboto -->'
+  dx_override = <<-EOF
+#{start_marker}
+    <macrodef name="dex-helper">
+        <element name="external-libs" optional="yes" />
+        <element name="extra-parameters" optional="yes" />
+        <sequential>
+            <!-- set the secondary dx input: the project (and library) jar files
+                If a pre-dex task sets it to something else this has no effect -->
+            <if>
+                <condition>
+                    <isreference refid="out.dex.jar.input.ref" />
+                </condition>
+                <else>
+                    <path id="out.dex.jar.input.ref">
+                        <path refid="project.all.jars.path" />
+                    </path>
+                </else>
+            </if>
+            <condition property="verbose.option" value="--verbose" else="">
+                <istrue value="${verbose}" />
+            </condition>
+
+            <union id="out.dex.jar.input.ref.union">
+                <resources refid="out.dex.jar.input.ref"/>
+            </union>
+            <if>
+                <condition>
+                    <uptodate targetfile="${out.absolute.dir}/classes.dex" >
+                        <srcfiles dir="${out.classes.absolute.dir}" includes="**/*.class"/>
+                        <srcresources refid="out.dex.jar.input.ref.union"/>
+                    </uptodate>
+                </condition>
+                <then>
+                    <echo>Java classes and jars are unchanged.</echo>
+                </then>
+                <else>
+                    <echo>Converting compiled files and external libraries into ${intermediate.dex.file} (multi-dex)</echo>
+                    <delete file="${out.absolute.dir}/classes2.dex"/>
+                    <echo>Dexing from ${out.classes.absolute.dir} and ${toString:out.dex.jar.input.ref} to ${out.absolute.dir}</echo>
+                    <apply executable="${dx}" failonerror="true" parallel="true">
+                        <arg value="--dex" />
+                        <arg value="--multi-dex" />
+                        <arg value="--output=${out.absolute.dir}" />
+                        <extra-parameters />
+                        <arg line="${verbose.option}" />
+                        <arg path="${out.classes.absolute.dir}" />
+                        <path refid="out.dex.jar.input.ref" />
+                        <external-libs />
+                    </apply>
+
+                    <delete file="assets/classes2.jar"/>
+                    <if>
+                        <condition>
+                            <available file="${out.absolute.dir}/classes2.dex" />
+                        </condition>
+                        <then>
+                            <echo>Zipping extra classes in ${out.absolute.dir} into assets/classes2.jar</echo>
+                            <mkdir dir="${out.absolute.dir}/../assets"/>
+                            <!-- FIXME(uwe):  This is hardcoded for one extra dex file.
+                                              It should iterate over all classes?.dex files -->
+                            <copy file="${out.absolute.dir}/classes2.dex" tofile="classes.dex"/>
+                            <zip destfile="${out.absolute.dir}/../assets/classes2.jar" basedir="." includes="classes.dex" />
+                            <delete file="classes.dex"/>
+                        </then>
+                    </if>
+                </else>
+            </if>
+        </sequential>
+    </macrodef>
+#{end_marker}
+  EOF
+
+  ant_script.gsub!(/\s*#{start_marker}.*?#{end_marker}\s*/m, '')
+  if multi_dex
+    if sdk_level >= 16
+      unless ant_script.gsub!(/\s*(<\/project>)/, "\n\n#{dx_override}\n\n\\1")
+        raise 'Bad ANT script'
+      end
+    else
+      raise "I am sorry, but the 'multi_dex' option is only available for projects targeting api level android-16 (Android 4.1) or higher due to a bug in earlier versions of Android."
+    end
+  end
+  File.open(BUILD_XML_FILE, 'w') { |f| f << ant_script }
+end
+
 task :jruby_adapter => JRUBY_ADAPTER_FILE
 file JRUBY_ADAPTER_FILE => RUBOTO_CONFIG_FILE do
   require 'yaml'
@@ -255,8 +358,8 @@ file JRUBY_ADAPTER_FILE => RUBOTO_CONFIG_FILE do
     comment = '// '
   end
   config = <<EOF
-            #{begin_marker}
-            #{comment}@SuppressWarnings("unused")
+#{begin_marker}
+  #{comment}@SuppressWarnings("unused")
             #{comment}byte[] arrayForHeapAllocation = new byte[#{heap_alloc} * 1024 * 1024];
             #{comment}arrayForHeapAllocation = null;
             #{end_marker}
@@ -277,10 +380,11 @@ EOF
   end
   ruby_version = ruby_version.to_s
   ruby_version['.'] = '_'
+  indent = ' ' * 12
   config = <<EOF
-            #{begin_marker}
-            #{comment}System.setProperty("jruby.compat.version", "RUBY#{ruby_version}"); // RUBY1_9 is the default in JRuby 1.7
-            #{end_marker}
+#{indent}#{begin_marker}
+  #{indent}#{comment}System.setProperty("jruby.compat.version", "RUBY#{ruby_version}"); // RUBY1_9 is the default in JRuby 1.7
+#{indent}#{end_marker}
 EOF
   pattern = %r{^\s*#{begin_marker}\n.*^\s*#{end_marker}\n}m
   source = source.sub(pattern, config)
@@ -288,6 +392,8 @@ EOF
   File.open(JRUBY_ADAPTER_FILE, 'w') { |f| f << source }
 end
 
+task apk_dependencies: APK_DEPENDENCIES
+
 file APK_FILE => APK_DEPENDENCIES do |t|
   build_apk(t, false)
 end
@@ -315,7 +421,7 @@ task :boing => %w(update_scripts:reload)
 
 namespace :update_scripts do
   desc 'Copy scripts to emulator and restart the app'
-  task :restart => APK_DEPENDENCIES - RUBY_SOURCE_FILES do |t|
+  task :restart => QUICK_APK_DEPENDENCIES do |t|
     if build_apk(t, false) || !stop_app
       install_apk
     else
@@ -325,7 +431,7 @@ namespace :update_scripts do
   end
 
   desc 'Copy scripts to emulator and restart the app'
-  task :start => APK_DEPENDENCIES - RUBY_SOURCE_FILES do |t|
+  task :start => QUICK_APK_DEPENDENCIES do |t|
     if build_apk(t, false)
       install_apk
     else
@@ -335,18 +441,16 @@ namespace :update_scripts do
   end
 
   desc 'Copy scripts to emulator and reload'
-  task :reload => APK_DEPENDENCIES - RUBY_SOURCE_FILES do |t|
+  task :reload => QUICK_APK_DEPENDENCIES do |t|
     if build_apk(t, false)
       install_apk
       start_app
     else
       scripts = update_scripts
-      if scripts
-        if app_running?
-          reload_scripts(scripts)
-        else
-          start_app
-        end
+      if app_running?
+        reload_scripts(scripts)
+      else
+        start_app
       end
     end
   end
@@ -687,7 +791,7 @@ def build_apk(t, release)
   apk_file = release ? RELEASE_APK_FILE : APK_FILE
   if File.exist?(apk_file)
     changed_prereqs = t.prerequisites.select do |pr|
-      File.file?(pr) && !Dir[pr].empty? && Dir[pr].map { |f| File.mtime(f) }.max >= File.mtime(apk_file)
+      File.file?(pr) && !Dir[pr].empty? && Dir[pr].map { |f| File.mtime(f) }.max > File.mtime(apk_file)
     end
     return false if changed_prereqs.empty?
     changed_prereqs.each { |f| puts "#{f} changed." }
@@ -786,17 +890,29 @@ def uninstall_apk
 end
 
 def update_scripts
-  puts(`adb shell mkdir -p #{scripts_path}`) unless device_path_exists?(scripts_path)
+  # FIXME(uwe): Simplify when we stop supporting Android 2.3
+  if sdk_level < 15
+    scripts_path.split('/').tap do |parts|
+      parts.size.times do |i|
+        path = parts[0..i].join('/')
+        puts(`adb shell mkdir #{path}`) unless device_path_exists?(path)
+      end
+    end
+  else
+    puts(`adb shell mkdir -p #{scripts_path}`) unless device_path_exists?(scripts_path)
+  end
+  # EMXIF
+
   raise "Unable to create device scripts dir: #{scripts_path}" unless device_path_exists?(scripts_path)
   last_update = File.exists?(UPDATE_MARKER_FILE) ? Time.parse(File.read(UPDATE_MARKER_FILE)) : Time.parse('1970-01-01T00:00:00')
   Dir.chdir('src') do
     source_files = Dir['**/*.rb']
     changed_files = source_files.select { |f| !File.directory?(f) && File.mtime(f) >= last_update && f !~ /~$/ }
     unless changed_files.empty?
-      puts 'Pushing files to apk public file area.'
+      puts 'Pushing files to apk public file area:'
       changed_files.each do |script_file|
         print "#{script_file}: "; $stdout.flush
-        `adb push #{script_file} #{scripts_path}/#{script_file}`
+        system "adb push #{script_file} #{scripts_path}/#{script_file}"
       end
       mark_update
       return changed_files
@@ -815,7 +931,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