ruboto 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bc93dda49229814d2889824399ff50031071d5a
-  data.tar.gz: 69ec9f1793ddb2d08e0f715b495d3ec7ec5a5758
+  metadata.gz: adc0e9e39a3342af8a9ad5bdd60da98f76052857
+  data.tar.gz: d3a242735722909b2e3cee69a018e873b3d02fb9
 SHA512:
-  metadata.gz: 5a7416a14f651cee7d9318c4342438c982c8d8a529b79e7dea044424eae1e2abe07461fc9ed5f12ff174dc23be32ade650fa1c9d9c1a9b13370b427ecd992504
-  data.tar.gz: eb20558feac71d3fa8fd7f513e39c69eac3f965f79547bbbb39992f326925b5ea258a092cdf2c438ece7c244760f6647b69eb0b7be87c436e4898edb9a106457
+  metadata.gz: 7e703d5354259b4c66a6f5a25d9f52b16234b8fa42086c7fcd6b9f7900f3a46c9060348153b5e07236b2119b272b6d260bec74fbbd2555bbc6293d823fbc5d17
+  data.tar.gz: b85734194cb9a84e1c78f9dbf98e2798228ce8c1c4d7efd42ef23f8d979ad015b74d2ed9b4ef8099280ad24bf2c009c17ca42d7cbb09eb6bc35ef9dc46e545f4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruboto (1.1.0)
+    ruboto (1.1.1)
       main (~> 5.2)
       rake (~> 10.0)
       rubyzip (~> 1.0)
@@ -18,7 +18,7 @@ GEM
       fattr (>= 2.2.0)
       map (>= 5.1.0)
     map (6.5.3)
-    rake (10.3.0)
+    rake (10.3.2)
     rubyzip (1.1.3)
 
 PLATFORMS

data/RELEASE_CANDICATE_DOC.md

@@ -1,27 +1,12 @@
-Subject: [ANN] Ruboto 1.1.0 release candidate
+Subject: [ANN] Ruboto 1.1.1 release candidate
 
 Hi all!
 
-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.
+The Ruboto 1.1.1 release candidate is now available.
+
+This release introduces a significant speedup of all UI actions by only
+overriding those Java methods actually implemented in Ruby code.  There
+are also some bug fixes and improvements to the SSL and big-app features.
 
 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.1.0 released!
+Subject: [ANN] Ruboto 1.1.1 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 1.1.0.
+The Ruboto team is pleased to announce the release of Ruboto 1.1.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,87 +8,27 @@ 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.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.
+New in version 1.1.1:
+
+This release introduces a significant speedup of all UI actions by only
+overriding those Java methods actually implemented in Ruby code.  There
+are also some bug fixes and improvements to the SSL and big-app features.
 
 Features:
 
-* 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 #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)
+* Issue #619 Automatically switch multi-dex build on and off
+* Issue #625 Avoid storing extra dex files in assets since they are not
+  source.
+* Issue #628 Set tmpdir location
 
 Performance:
 
-* Issue #599 Speed up displaying Options Menu
-* Issue #616 Speed up Activity#setContentView
-
-Support:
-
-* 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)
-
-Other:
-
-* Issue #607 Remove the deprecated "ruboto update ruboto" command
+* Issue #574 Will Android 4.4 ART influence Ruboto APP?
+* Issue #629 Disable RubotoActivity methods that are not in use
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=19
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=33
 
 
 Installation:

data/Rakefile

@@ -620,3 +620,22 @@ task :get_jruby_jars_snapshot do
   end
   File.open(current_gem, 'wb') { |f| f << body }
 end
+
+task '.travis.yml' do
+  puts "Regenerating #{'.travis.yml'}"
+  source = File.read('.travis.yml')
+  matrix = ''
+  [17, 16, 15].each.with_index do |api, i|
+    n = i
+    [['CURRENT', [nil]],['FROM_GEM', [nil]],['STANDALONE', [nil, '1.7.13', '1.7.12'].rotate(-i)]].each do |platform, versions|
+      versions.each do |v|
+        n = (n  % 5) + 1
+        matrix << "    - ANDROID_TARGET=#{api} RUBOTO_PLATFORM=#{platform.ljust(10)} TEST_PART=#{n}of5#{" JRUBY_JARS_VERSION=#{v}" if v}\n"
+      end
+    end
+    matrix << "\n"
+  end
+  matrix << "    - ANDROID_TARGET=10 RUBOTO_PLATFORM=CURRENT\n"
+  matrix_str = "  matrix:\n#{matrix}\nmatrix:"
+  File.write('.travis.yml', source.sub(/^  matrix:.*?matrix:/m, matrix_str))
+end

data/assets/rakelib/ruboto.rake

@@ -91,6 +91,7 @@ JARS = Dir[File.expand_path 'libs/*.jar'] - JRUBY_JARS
 RESOURCE_FILES = Dir[File.expand_path 'res/**/*']
 JAVA_SOURCE_FILES = Dir[File.expand_path 'src/**/*.java']
 RUBY_SOURCE_FILES = Dir[File.expand_path 'src/**/*.rb']
+RUBY_ACTIVITY_SOURCE_FILES = RUBY_SOURCE_FILES.select { |fn| fn =~ /_activity.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"
 BUILD_XML_FILE = "#{PROJECT_DIR}/build.xml"
@@ -100,6 +101,7 @@ KEYSTORE_FILE = (key_store = File.readlines('ant.properties').grep(/^key.store=/
 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+(.*)$/
 JRUBY_ADAPTER_FILE = "#{PROJECT_DIR}/src/org/ruboto/JRubyAdapter.java"
+RUBOTO_ACTIVITY_FILE = "#{PROJECT_DIR}/src/org/ruboto/RubotoActivity.java"
 
 CLEAN.include('bin', 'gen', 'test/bin', 'test/gen')
 
@@ -241,41 +243,23 @@ 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.
+  # FIXME(uwe):  Move this logic to ruboto/util/update.rb since it is independent of 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'))
+  indent = '    '
   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>
+#{indent}#{start_marker}
+    <property name="second_dex_file" value="${out.absolute.dir}/classes2.dex" />
 
+    <macrodef name="multi-dex-helper">
+      <element name="external-libs" optional="yes" />
+      <sequential>
             <union id="out.dex.jar.input.ref.union">
                 <resources refid="out.dex.jar.input.ref"/>
             </union>
@@ -290,50 +274,191 @@ file BUILD_XML_FILE => RUBOTO_CONFIG_FILE do
                     <echo>Java classes and jars are unchanged.</echo>
                 </then>
                 <else>
-                    <echo>Converting compiled files and external libraries into ${intermediate.dex.file} (multi-dex)</echo>
+                    <echo>Converting compiled files and external libraries into ${out.absolute.dir} (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>
+                    <echo>Dexing ${out.classes.absolute.dir} and ${toString:out.dex.jar.input.ref}</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="${jumbo.option}" />
                         <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>
+                    <sleep seconds="1"/>
                 </else>
             </if>
-        </sequential>
+      </sequential>
     </macrodef>
-#{end_marker}
+
+    <macrodef name="dex-helper">
+      <element name="external-libs" optional="yes" />
+      <attribute name="nolocals" default="false" />
+      <sequential>
+          <!-- sets the primary input for dex. If a pre-dex task sets it to
+               something else this has no effect -->
+        <property name="out.dex.input.absolute.dir" value="${out.classes.absolute.dir}" />
+
+        <!-- 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>
+        <condition property="jumbo.option" value="--force-jumbo" else="">
+          <istrue value="${dex.force.jumbo}" />
+        </condition>
+
+        <if>
+          <condition>
+            <not>
+              <available file="${second_dex_file}" />
+            </not>
+          </condition>
+          <then>
+            <!-- Regular DEX process.  We would prefer to use the Android SDK
+                 ANT target, but we need to detect the "use multidex" error.
+                 https://android.googlesource.com/platform/sdk/+/tools_r21.1/anttasks/src/com/android/ant/DexExecTask.java
+            -->
+            <mapper id="pre-dex-mapper" type="glob" from="libs/*.jar" to="bin/dexedLibs/*-dexed.jar"/>
+
+
+            <!-- FIXME(uwe): Output something about what we are doing -->
+
+            <apply executable="${dx}" failonerror="true" parallel="false" dest="${out.dexed.absolute.dir}" relative="true">
+                        <arg value="--dex" />
+                        <arg value="--output" />
+                        <targetfile/>
+                        <arg line="${jumbo.option}" />
+                        <arg line="${verbose.option}" />
+                        <fileset dir="." includes="libs/*" />
+                        <external-libs />
+                        <mapper refid="pre-dex-mapper"/>
+            </apply>
+
+            <apply executable="${dx}" resultproperty="dex.merge.result" outputproperty="dex.merge.output" parallel="true">
+                <arg value="--dex" />
+                <arg value="--output=${intermediate.dex.file}" />
+                <arg line="${jumbo.option}" />
+                <arg line="${verbose.option}" />
+                <arg path="${out.classes.absolute.dir}" />
+                <fileset dir="${out.dexed.absolute.dir}" includes="*-dexed.jar" />
+                <external-libs />
+            </apply>
+
+            <if>
+              <condition>
+                <contains string="${dex.merge.output}" substring="method ID not in [0, 0xffff]: 65536"/>
+              </condition>
+              <then>
+                <echo message="The package contains too many methods.  Switching to multi-dex build." />
+                <multi-dex-helper>
+                  <external-libs>
+                    <external-libs/>
+                  </external-libs>
+                </multi-dex-helper>
+              </then>
+              <else>
+                <echo message="${dex.merge.output}"/>
+                <fail status="${dex.merge.result}">
+                  <condition>
+                    <not>
+                      <equals arg1="${dex.merge.result}" arg2="0"/>
+                    </not>
+                  </condition>
+                </fail>
+              </else>
+            </if>
+
+          </then>
+          <else>
+            <multi-dex-helper>
+              <external-libs>
+                <external-libs/>
+              </external-libs>
+            </multi-dex-helper>
+          </else>
+        </if>
+      </sequential>
+    </macrodef>
+
+    <!-- This is copied directly from <android-sdk>/tools/ant/build.xml,
+         just added the "-post-package-resources" dependency -->
+    <target name="-package" depends="-dex, -package-resources, -post-package-resources">
+        <!-- only package apk if *not* a library project -->
+        <do-only-if-not-library elseText="Library project: do not package apk..." >
+            <if condition="${build.is.instrumented}">
+                <then>
+                    <package-helper>
+                        <extra-jars>
+                            <!-- Injected from external file -->
+                            <jarfile path="${emma.dir}/emma_device.jar" />
+                        </extra-jars>
+                    </package-helper>
+                </then>
+                <else>
+                    <package-helper />
+                </else>
+            </if>
+        </do-only-if-not-library>
+    </target>
+
+    <target name="-post-package-resources">
+        <!-- FIXME(uwe):  This is hardcoded for one extra dex file.
+                          It should iterate over all classes?.dex files -->
+        <property name="second_dex_path" value="assets/classes2.jar" />
+        <property name="second_dex_jar" value="${out.dexed.absolute.dir}/${second_dex_path}" />
+        <property name="second_dex_copy" value="${out.dexed.absolute.dir}/classes.dex" />
+        <if>
+            <condition>
+              <and>
+                <available file="${second_dex_file}" />
+                <or>
+                  <not>
+                    <uptodate srcfile="${second_dex_file}" targetfile="${out.absolute.dir}/${resource.package.file.name}" />
+                  </not>
+                  <uptodate srcfile="${out.absolute.dir}/${resource.package.file.name}" targetfile="${out.absolute.dir}/${resource.package.file.name}.d" />
+                </or>
+              </and>
+            </condition>
+            <then>
+                <echo>Adding ${second_dex_path} to ${resource.package.file.name}</echo>
+                <exec executable="aapt" dir="${out.dexed.absolute.dir}">
+                  <arg line='remove -v "${out.absolute.dir}/${resource.package.file.name}" ${second_dex_path}'/>
+                </exec>
+                <copy file="${second_dex_file}" tofile="${second_dex_copy}"/>
+                <mkdir dir="${out.dexed.absolute.dir}/assets"/>
+                <zip destfile="${second_dex_jar}" basedir="${out.dexed.absolute.dir}" includes="classes.dex" />
+                <delete file="${second_dex_copy}"/>
+
+                <!-- FIXME(uwe): Use zip instead of aapt? -->
+                <exec executable="aapt" dir="${out.dexed.absolute.dir}" failonerror="true">
+                  <arg line='add -v "${out.absolute.dir}/${resource.package.file.name}" ${second_dex_path}'/>
+                </exec>
+                <!-- EMXIF -->
+
+            </then>
+        </if>
+    </target>
+    #{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."
+  # FIXME(uwe): Remove condition when we stop supporting Android 4.0 and older.
+  if sdk_level >= 16
+    unless ant_script.gsub!(/\s*(<\/project>)/, "\n\n#{dx_override}\n\n\\1")
+      raise 'Bad ANT script'
     end
   end
   File.open(BUILD_XML_FILE, 'w') { |f| f << ant_script }
@@ -357,12 +482,13 @@ file JRUBY_ADAPTER_FILE => RUBOTO_CONFIG_FILE do
     heap_alloc = 13
     comment = '// '
   end
+  indent = ' ' * 12
   config = <<EOF
-#{begin_marker}
-  #{comment}@SuppressWarnings("unused")
-            #{comment}byte[] arrayForHeapAllocation = new byte[#{heap_alloc} * 1024 * 1024];
-            #{comment}arrayForHeapAllocation = null;
-            #{end_marker}
+#{indent}#{begin_marker}
+#{indent}#{comment}@SuppressWarnings("unused")
+#{indent}#{comment}byte[] arrayForHeapAllocation = new byte[#{heap_alloc} * 1024 * 1024];
+#{indent}#{comment}arrayForHeapAllocation = null;
+#{indent}#{end_marker}
 EOF
   pattern = %r{^\s*#{begin_marker}\n.*^\s*#{end_marker}\n}m
   source = source.sub(pattern, config)
@@ -380,10 +506,9 @@ EOF
   end
   ruby_version = ruby_version.to_s
   ruby_version['.'] = '_'
-  indent = ' ' * 12
   config = <<EOF
 #{indent}#{begin_marker}
-  #{indent}#{comment}System.setProperty("jruby.compat.version", "RUBY#{ruby_version}"); // RUBY1_9 is the default in JRuby 1.7
+#{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
@@ -392,6 +517,23 @@ EOF
   File.open(JRUBY_ADAPTER_FILE, 'w') { |f| f << source }
 end
 
+task :ruboto_activity => RUBOTO_ACTIVITY_FILE
+file RUBOTO_ACTIVITY_FILE => RUBY_ACTIVITY_SOURCE_FILES do |task|
+  original_source = File.read(RUBOTO_ACTIVITY_FILE)
+  next unless original_source =~ %r{\A(.*Generated Methods.*?\*/\n*)(.*)\B}m
+  intro, generated_methods = $1, $2.scan(/(?:\s*\n*)(^\s*?public.*?^  }\n)/m).flatten
+  implemented_methods = task.prerequisites.map { |f| File.read(f).scan(/(?:^\s*def\s+)([^\s(]+)/) }.flatten.sort
+  commented_methods = generated_methods.map do |gm|
+    implemented_methods.
+        any? { |im| gm.upcase.include?(" #{im.upcase.gsub('_', '')}(") } ?
+        gm : "/*\n#{gm}*/\n"
+  end
+  new_source = "#{intro}#{commented_methods.join("\n")}\n}\n"
+  if new_source != original_source
+    File.open(RUBOTO_ACTIVITY_FILE, 'w') { |f| f << new_source }
+  end
+end
+
 task apk_dependencies: APK_DEPENDENCIES
 
 file APK_FILE => APK_DEPENDENCIES do |t|
@@ -447,7 +589,7 @@ namespace :update_scripts do
       start_app
     else
       scripts = update_scripts
-      if app_running?
+      if scripts && app_running?
         reload_scripts(scripts)
       else
         start_app
@@ -690,8 +832,12 @@ task :log, [:filter] do |t, args|
     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}"
+    android_4_2_noise_regex = /Unexpected value from nativeGetEnabledTags/
     pid_regex = nil
     logcat.each_line do |line|
+      # FIXME(uwe): Remove when we stop supporting Ancdroid 4.2
+      next if line =~ android_4_2_noise_regex
+      # EMXIF
       if (activity_start_match = started_regex.match(line) || restarted_regex.match(line))
         activity_started = true
         pid = activity_start_match[:pid]

data/assets/ruboto.yml

@@ -59,14 +59,3 @@
 # - webrick
 # - win32
 # - Win32API
-
-###################################
-#
-# multi_dex
-#
-#    Switch on use of multiple classes.dex files when building.
-#    This will allow you to have more than 65535 methods in your app.
-#    WARNING:  This disables pre-dex during build which will increase your
-#    incremental build time substantially.
-#
-# multi_dex: true

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

@@ -35,7 +35,7 @@ public class EntryPointActivity extends org.ruboto.RubotoActivity {
     // The Intent to to call when done. Defaults to calling this Activity again.
     // Override to change.
     protected Intent futureIntent() {
-        if (!getIntent().getAction().equals(Intent.ACTION_VIEW)) {
+        if (getIntent().getAction() == null || !getIntent().getAction().equals(Intent.ACTION_VIEW)) {
             return new Intent(getIntent()).setAction(Intent.ACTION_VIEW);
         } else {
             return getIntent();

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

@@ -157,6 +157,7 @@ public class JRubyAdapter {
             System.setProperty("jruby.ji.proxyClassFactory", "org.ruboto.DalvikProxyClassFactory");
             System.setProperty("jruby.ji.upper.case.package.name.allowed", "true");
             System.setProperty("jruby.class.cache.path", appContext.getDir("dex", 0).getAbsolutePath());
+            System.setProperty("java.io.tmpdir", appContext.getCacheDir().getAbsolutePath());
 
             // FIXME(uwe): Simplify when we stop supporting android-15
             if (Build.VERSION.SDK_INT >= 16) {
@@ -392,7 +393,8 @@ public class JRubyAdapter {
         //try {
         //    t.printStackTrace(output);
         //} catch (NullPointerException npe) {
-            // TODO(uwe): printStackTrace should not fail
+            // TODO(uwe): t.printStackTrace() should not fail
+            System.err.println(t.getClass().getName() + ": " + t);
             for (java.lang.StackTraceElement ste : t.getStackTrace()) {
                 output.append(ste.toString() + "\n");
             }

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

@@ -7,11 +7,11 @@
 #######################################################
 
 Java::android.content.Context.class_eval do
-  def toast(text, duration=android.widget.Toast::LENGTH_SHORT)
+  def toast(text, duration=Java::android.widget.Toast::LENGTH_SHORT)
     Java::android.widget.Toast.makeText(self, text, duration).show
   end
 
-  def toast_result(result, success, failure, duration=android.widget.Toast::LENGTH_SHORT)
+  def toast_result(result, success, failure, duration=Java::android.widget.Toast::LENGTH_SHORT)
     toast(result ? success : failure, duration)
   end
 end

data/lib/ruboto/commands/base.rb

@@ -389,7 +389,7 @@ module Ruboto
                   update_test force
                 end
 
-                update_assets
+                update_assets old_version
                 update_ruboto force
                 update_classes old_version, force
                 update_dx_jar force

data/lib/ruboto/util/build.rb

@@ -202,6 +202,7 @@ module Ruboto
      *
      *  Generated Methods
      */
+
 EOF
       end
 

data/lib/ruboto/util/emulator.rb

@@ -186,7 +186,7 @@ module Ruboto
             end
             puts
             break if device_ready?
-            puts 'Device started, but failed to respond.'
+            puts 'Emulator started, but failed to respond.'
             unless no_snapshot
               puts 'Retrying without loading snapshot.'
               no_snapshot = true

data/lib/ruboto/util/update.rb

@@ -234,7 +234,15 @@ module Ruboto
         log_action('Copying dx.jar to libs') { copier.copy 'libs' }
       end
 
-      def update_assets
+      def update_assets(old_version = nil)
+        # FIXME(uwe):  Remove when we stop support for updating from Ruboto 1.1.0
+        old_extra_classes = 'assets/classes2.jar'
+        if old_version == '1.1.0' && File.exists?(old_extra_classes)
+          puts "Deleting old extra dex file #{old_extra_classes}."
+          File.delete(string)
+        end
+        # EMXIF
+
         puts "\nCopying files:"
         weak_copier = Ruboto::Util::AssetCopier.new Ruboto::ASSETS, '.', false
         %w{.gitignore Rakefile ruboto.yml}.each { |f| log_action(f) { weak_copier.copy f } }
@@ -373,8 +381,9 @@ module Ruboto
         if File.exists?('ruboto.yml')
           sleep 1
           FileUtils.touch 'ruboto.yml'
-          system 'rake build_xml jruby_adapter'
         end
+        Dir['src/*_activity.rb'].each{|f|FileUtils.touch(f)}
+        system 'rake build_xml jruby_adapter ruboto_activity'
       end
 
       def read_ruboto_version
@@ -488,7 +497,7 @@ module Ruboto
                     'yaml.rb', # This looks like 1.8 stdlib...
                 ]
               elsif gem_version >= Gem::Version.new('1.7.12')
-                excluded_core_packages = %w(**/*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/ext/tracepoint org/jruby/javasupport/bsf org/yecht yaml.rb)
+                excluded_core_packages = %w(**/*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)
               elsif gem_version >= Gem::Version.new('1.7.5')
                 # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.5
                 excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius 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/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/io org/jruby/ext/ffi/jffi org/jruby/ext/tracepoint org/jruby/javasupport/bsf org/yecht)

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/activity/ssl_activity.rb

@@ -29,7 +29,6 @@ class SslActivity
         @open_uri_thread.join
         run_on_ui_thread { @response_view.text = 'open-uri loaded OK!' }
         puts 'before open'
-        ENV['TMPDIR'] = files_dir.absolute_path
         open('https://google.com/', ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE) do |f|
           puts 'inside open'
           body = f.read

data/test/ruboto_gen_test.rb

@@ -50,10 +50,11 @@ class RubotoGenTest < Test::Unit::TestCase
   end
 
   # APK was    59.6KB.  PLATFORM: CURRENT, ANDROID_TARGET: 10
-  # APK was    60.2KB.  PLATFORM: CURRENT, ANDROID_TARGET: 15
+  # APK was    66.6KB.  PLATFORM: CURRENT, ANDROID_TARGET: 15
   # APK was    74.9KB.  PLATFORM: CURRENT, ANDROID_TARGET: 16
   # APK was    80.4KB.  PLATFORM: CURRENT, ANDROID_TARGET: 19
   # APK was    65.0KB.  PLATFORM: FROM_GEM, ANDROID_TARGET: 10
+  # APK was    81.0KB.  PLATFORM: FROM_GEM, ANDROID_TARGET: 16
   # APK was    80.2KB.  PLATFORM: FROM_GEM, ANDROID_TARGET: 17
   # APK was  8428.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.4
   # APK was  7405.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.4
@@ -92,8 +93,8 @@ class RubotoGenTest < Test::Unit::TestCase
     else
       upper_limit = {
           10 => 66.0,
-          15 => 62.0,
-          16 => 75.0,
+          15 => 67.0,
+          16 => 82.0,
           17 => 81.0,
           19 => 81.0,
       }[ANDROID_TARGET] || 75.0

data/test/ruboto_setup_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'net/http'
 
-class SetupTest < Test::Unit::TestCase
+class RubotoSetupTest < Test::Unit::TestCase
   SDK_DOWNLOAD_PAGE = 'http://developer.android.com/sdk/index.html?hl=sk'
 
   def test_if_page_still_exists
@@ -15,7 +15,7 @@ class SetupTest < Test::Unit::TestCase
     regex = '(\>installer_.*.exe)'
     page_content = Net::HTTP.get(URI.parse(SDK_DOWNLOAD_PAGE))
     link = page_content.scan(/#{regex}/).to_s
-    assert_match /(\d+).(\d+).(\d+)/, link 
+    assert_match /\d+(\.\d+)?(\.\d+)?/, link
   end
 
 end

data/test/test_helper.rb

@@ -160,8 +160,6 @@ class Test::Unit::TestCase
     standalone = options.delete(:standalone) || !!included_stdlibs || !!excluded_stdlibs || ENV['RUBOTO_PLATFORM'] == 'STANDALONE'
     update = options.delete(:update) || false
     ruby_version = options.delete(:ruby_version) || (JRUBY_JARS_VERSION.to_s[0..0] == '9' ? 2.1 : 1.9)
-    multi_dex = options.has_key?(:multi_dex) ? options.delete(:multi_dex) :
-        (standalone && !example && ANDROID_TARGET >= 16)
 
     raise "Unknown options: #{options.inspect}" unless options.empty?
     raise 'Inclusion/exclusion of libs requires standalone mode.' if (included_stdlibs || excluded_stdlibs) && !standalone
@@ -177,7 +175,6 @@ class Test::Unit::TestCase
     template_dir << "_bundle_#{[*bundle].join('_')}" if bundle
     template_dir << '_updated' if update
     template_dir << '_standalone' if standalone
-    template_dir << '_multi-dex' if multi_dex
     template_dir << "_without_#{excluded_stdlibs.map { |ed| ed.gsub(/[.\/]/, '_') }.join('_')}" if excluded_stdlibs
     template_dir << "_with_#{included_stdlibs.map { |ed| ed.gsub(/[.\/]/, '_') }.join('_')}" if included_stdlibs
     if File.exists?(template_dir)
@@ -192,8 +189,8 @@ class Test::Unit::TestCase
           File.open('local.properties', 'w') { |f| f.puts "sdk.dir=#{ANDROID_HOME}" }
           File.open('test/local.properties', 'w') { |f| f.puts "sdk.dir=#{ANDROID_HOME}" }
           if standalone
-            if included_stdlibs || excluded_stdlibs || heap_alloc || ruby_version || multi_dex
-              write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version, multi_dex)
+            if included_stdlibs || excluded_stdlibs || heap_alloc || ruby_version
+              write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version)
             end
             FileUtils.touch 'libs/jruby-core-x.x.x.jar'
             FileUtils.touch 'libs/jruby-stdlib-x.x.x.jar'
@@ -216,13 +213,13 @@ class Test::Unit::TestCase
         end
         Dir.chdir APP_DIR do
           write_gemfile(bundle) if bundle
-          if included_stdlibs || excluded_stdlibs || heap_alloc || ruby_version || multi_dex
+          if included_stdlibs || excluded_stdlibs || heap_alloc || ruby_version
             sleep 1
-            write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version, multi_dex)
+            write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version)
             system 'rake build_xml jruby_adapter'
           end
           if standalone
-            system "#{RUBOTO_CMD} gen jruby"
+            system "#{RUBOTO_CMD} gen jruby #{JRUBY_JARS_VERSION}"
             raise "update jruby failed with return code #$?" if $? != 0
           end
         end
@@ -291,12 +288,11 @@ class Test::Unit::TestCase
     end
   end
 
-  def write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version, multi_dex)
+  def write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version)
     yml = YAML.dump({'included_stdlibs' => included_stdlibs,
         'excluded_stdlibs' => excluded_stdlibs,
         # 'ruby_version' => ruby_version,
         'heap_alloc' => heap_alloc,
-        'multi_dex' => multi_dex,
     })
     puts "Adding ruboto.yml:\n#{yml}"
     File.open('ruboto.yml', 'w') { |f| f << yml }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -240,3 +240,4 @@ signing_key:
 specification_version: 4
 summary: A platform for developing apps using JRuby on Android.
 test_files: []
+has_rdoc: