ruboto 0.9.0.rc.0 → 0.9.0.rc.1

data/assets/rakelib/ruboto.rake

@@ -1,4 +1,8 @@
-if `ant -version` !~ /version (\d+)\.(\d+)\.(\d+)/ || $1.to_i < 1 || ($1.to_i == 1 && $2.to_i < 8)
+require 'rbconfig'
+
+ANT_CMD = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw/i) ? "ant.bat" : "ant"
+
+if `#{ANT_CMD} -version` !~ /version (\d+)\.(\d+)\.(\d+)/ || $1.to_i < 1 || ($1.to_i == 1 && $2.to_i < 8)
   puts "ANT version 1.8.0 or later required.  Version found: #{$1}.#{$2}.#{$3}"
   exit 1
 end
@@ -182,7 +186,7 @@ task :test => :uninstall do
   Dir.chdir('test') do
     puts 'Running tests'
     sh "adb uninstall #{package}.tests"
-    sh "ant instrument install test"
+    sh "#{ANT_CMD} instrument install test"
   end
 end
 
@@ -190,9 +194,9 @@ namespace :test do
   task :quick => :update_scripts do
     Dir.chdir('test') do
       puts 'Running quick tests'
-      sh 'ant instrument'
-      sh 'ant installi'
-      sh "ant run-tests-quick"
+      sh "#{ANT_CMD} instrument"
+      sh "#{ANT_CMD} installi"
+      sh "#{ANT_CMD} run-tests-quick"
     end
   end
 end
@@ -398,9 +402,9 @@ def build_apk(t, release)
     puts "Forcing rebuild of #{apk_file}."
   end
   if release
-    sh 'ant release'
+    sh "#{ANT_CMD} release"
   else
-    sh 'ant debug'
+    sh "#{ANT_CMD} debug"
   end
   return true
 end

data/lib/ruboto/commands/base.rb

@@ -365,7 +365,7 @@ module Ruboto
                 update_core_classes "exclude"
                 update_bundle
               when "jruby" then
-                update_jruby(params['force'].value) || abort
+                update_jruby(params['force'].value, true) || abort
               # FIXME(uwe): Deprecated in Ruboto 0.8.1.  Remove september 2013.
               when "ruboto" then
                 puts "\nThe 'ruboto update ruboto' command has been deprecated.  Use\n\n    ruboto update app\n\ninstead.\n\n"

data/lib/ruboto/util/update.rb

@@ -136,13 +136,13 @@ module Ruboto
         end
       end
 
-      def update_jruby(force=nil)
+      def update_jruby(force=nil, explicit = false)
         jruby_core = Dir.glob("libs/jruby-core-*.jar")[0]
         jruby_stdlib = Dir.glob("libs/jruby-stdlib-*.jar")[0]
 
         unless force
           if !jruby_core || !jruby_stdlib
-            puts "Cannot find existing jruby jars in libs. Make sure you're in the root directory of your app."
+            puts "Cannot find existing jruby jars in libs. Make sure you're in the root directory of your app." if explicit
             return false
           end
         end
@@ -184,6 +184,10 @@ module Ruboto
       end
 
       def update_dx_jar(force=nil)
+        # FIXME(uwe): Remove when we stop updating from Ruboto 0.8.1 and older.
+        FileUtils.rm(Dir['libs/dexmaker*.jar'])
+        # EMXIF
+
         jar_file = Dir.glob("libs/dx.jar")[0]
 
         # FIXME(uwe):  Skip copying dx.jar to apps using RubotoCore when we include dx.jar in RubotoCore

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '0.9.0.rc.0'
+  VERSION = '0.9.0.rc.1'
   UPDATE_VERSION_LIMIT = '0.5.2'
 end

data/test/activity/stack_activity_test.rb

@@ -23,12 +23,13 @@ test('stack depth') do |activity|
     jruby_offset = {
         '0.4.7' => [0, 0, 0, 0],
         '0.4.8.dev' => [0, 0, -4, -4],
+        '0.4.8' => [0, 0, -4, -4],
     }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
   else # STANDALONE
     jruby_offset = {
         '1.7.0.dev' => [1, 1, 1, 1],
         '1.7.0.preview2' => [0, 0, -4, -4],
-        '1.7.0.rc1' => [0, 0, -4, -4],
+        '1.7.0.RC1' => [0, 0, -4, -4],
     }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
   end
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.JRubyAdapter.uses_platform_apk ? org.ruboto.JRubyAdapter.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"

data/test/block_def_activity/stack_activity_test.rb

@@ -16,12 +16,13 @@ test('stack depth') do |activity|
     jruby_offset = {
         '0.4.7' => [0, 0, 0, 0],
         '0.4.8.dev' => [0, -1, 0, 0],
+        '0.4.8' => [0, -1, 0, 0],
     }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
   else # STANDALONE
     jruby_offset = {
         '1.7.0.preview1' => [0, -1, -1, -1],
         '1.7.0.preview2' => [0, -1, 0, 0],
-        '1.7.0.rc1' => [0, -1, 0, 0],
+        '1.7.0.RC1' => [0, -1, 0, 0],
     }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
   end
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.JRubyAdapter.uses_platform_apk ? org.ruboto.JRubyAdapter.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"

data/test/handle_activity/stack_activity_test.rb

@@ -21,13 +21,14 @@ test('stack depth') do |activity|
     jruby_offset = {
         '0.4.7'     => [0, 0, 0, 0],
         '0.4.8.dev' => [0, -1, -1, -1],
+        '0.4.8' => [0, -1, -1, -1],
     }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
   else # STANDALONE
     jruby_offset = {
         '1.7.0.dev' => [1, 0, 0, 0],
         '1.7.0.preview1' => [0, -1, -1, -1],
         '1.7.0.preview2' => [0, -1, -1, -1],
-        '1.7.0.rc1' => [0, -1, -1, -1],
+        '1.7.0.RC1' => [0, -1, -1, -1],
     }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
   end
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.JRubyAdapter.uses_platform_apk ? org.ruboto.JRubyAdapter.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"

data/test/updated_example_test_methods.rb

@@ -29,4 +29,12 @@ module UpdatedExampleTestMethods
     end
   end
 
+  # FIXME(uwe): Remove when we stop updating from Ruboto 0.8.1 and older.
+  def test_dexmaker_jar_is_removed
+    Dir.chdir APP_DIR do
+      assert_equal [], Dir['libs/dexmaker*.jar']
+    end
+  end
+  # EMXIF
+
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto
 version: !ruby/object:Gem::Version 
-  hash: 752453167
+  hash: -3487987620
   prerelease: 6
   segments: 
   - 0
   - 9
   - 0
   - rc
-  - 0
-  version: 0.9.0.rc.0
+  - 1
+  version: 0.9.0.rc.1
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-28 00:00:00 Z
+date: 2012-09-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main