lib/ruboto/util/update.rb in ruboto-0.9.0.rc.0 vs lib/ruboto/util/update.rb in ruboto-0.9.0.rc.1

@@ -134,17 +134,17 @@
           end
           # EMXIF
         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
 
         begin
@@ -182,9 +182,13 @@
         puts "JRuby version is now: #{new_jruby_version}"
         true
       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
         return if !jar_file && !force