ruboto 1.0.3 → 1.1.0

data/test/test_helper.rb

@@ -92,7 +92,7 @@ module RubotoTest
   puts "RUBOTO_PLATFORM: #{RUBOTO_PLATFORM}"
 
   if RUBOTO_PLATFORM == 'CURRENT'
-    JRUBY_JARS_VERSION = Gem::Version.new('1.7.4')
+    JRUBY_JARS_VERSION = Gem::Version.new('1.7.12')
   elsif ENV['JRUBY_JARS_VERSION']
     JRUBY_JARS_VERSION = Gem::Version.new(ENV['JRUBY_JARS_VERSION'])
   else
@@ -159,9 +159,11 @@ class Test::Unit::TestCase
     package = options.delete(:package) || PACKAGE
     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)
-    raise "Unknown options: #{options.inspect}" unless options.empty?
+    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
 
     Dir.mkdir TMP_DIR unless File.exists? TMP_DIR
@@ -170,11 +172,12 @@ class Test::Unit::TestCase
     template_dir = "#{APP_DIR}_template_#{$$}"
     template_dir << "_package_#{package}" if package != PACKAGE
     template_dir << "_heap_alloc_#{heap_alloc}" if heap_alloc
-#    template_dir << "_ruby_version_#{ruby_version.to_s.gsub('.', '_')}" if ruby_version
+    #    template_dir << "_ruby_version_#{ruby_version.to_s.gsub('.', '_')}" if ruby_version
     template_dir << "_example_#{example}" if example
     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)
@@ -189,7 +192,9 @@ 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
-            write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version) if included_stdlibs || excluded_stdlibs || heap_alloc || ruby_version
+            if included_stdlibs || excluded_stdlibs || heap_alloc || ruby_version || multi_dex
+              write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version, multi_dex)
+            end
             FileUtils.touch 'libs/jruby-core-x.x.x.jar'
             FileUtils.touch 'libs/jruby-stdlib-x.x.x.jar'
             install_jruby_jars_gem
@@ -211,7 +216,11 @@ class Test::Unit::TestCase
         end
         Dir.chdir APP_DIR do
           write_gemfile(bundle) if bundle
-          write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version) if included_stdlibs || excluded_stdlibs || heap_alloc || ruby_version
+          if included_stdlibs || excluded_stdlibs || heap_alloc || ruby_version || multi_dex
+            sleep 1
+            write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version, multi_dex)
+            system 'rake build_xml jruby_adapter'
+          end
           if standalone
             system "#{RUBOTO_CMD} gen jruby"
             raise "update jruby failed with return code #$?" if $? != 0
@@ -219,17 +228,10 @@ class Test::Unit::TestCase
         end
       end
 
-      # FIXME(uwe): Installation with dx.jar fails on Android < 4.0.3 due to complex interface structure
-      # Fixme(uwe): Remove when solved
-      #if standalone && ANDROID_OS < 15
-      #  Dir.chdir APP_DIR do
-      #    puts "Removing dx.jar for android-#{ANDROID_OS}"
-      #    FileUtils.rm(Dir['libs/dx.jar'])
-      #  end
-      #end
-      # EMXIF
-
       Dir.chdir APP_DIR do
+        File.write('AndroidManifest.xml',
+            File.read('AndroidManifest.xml').sub(%r{</manifest>},
+                "    <uses-permission android:name='android.permission.INTERNET'/>\n</manifest>"))
         if update
           update_app
         end
@@ -289,11 +291,13 @@ class Test::Unit::TestCase
     end
   end
 
-  def write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version)
+  def write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version, multi_dex)
     yml = YAML.dump({'included_stdlibs' => included_stdlibs,
-                     'excluded_stdlibs' => excluded_stdlibs,
- #                    'ruby_version' => ruby_version,
-                     'heap_alloc' => heap_alloc})
+        '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 }
   end
@@ -303,7 +307,7 @@ class Test::Unit::TestCase
     puts "Adding Gemfile.apk: #{gems.join(' ')}"
     File.open('Gemfile.apk', 'w') do |f|
       f << "source 'http://rubygems.org/'\n\n"
-      gems.each { |g| f << "gem #{[*g].map{|gp|"'#{gp}'"}.join(', ')}\n" }
+      gems.each { |g| f << "gem #{[*g].map { |gp| "'#{gp}'" }.join(', ')}\n" }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,9 +78,9 @@ files:
 - assets/Rakefile
 - assets/libs/dx.jar
 - assets/rakelib/ruboto.rake
-- assets/rakelib/stdlib.rake
-- assets/rakelib/stdlib.yml
-- assets/rakelib/stdlib_dependencies.rb
+- assets/rakelib/ruboto.stdlib.rake
+- assets/rakelib/ruboto.stdlib.rb
+- assets/rakelib/ruboto.stdlib.yml
 - assets/res/.DS_Store
 - assets/res/drawable-hdpi/.DS_Store
 - assets/res/drawable-hdpi/ic_launcher.png
@@ -105,7 +105,9 @@ files:
 - assets/src/RubotoActivity.java
 - assets/src/RubotoBroadcastReceiver.java
 - assets/src/RubotoService.java
+- assets/src/org/ruboto/DexDex.java
 - assets/src/org/ruboto/EntryPointActivity.java
+- assets/src/org/ruboto/FrameworkHack.java
 - assets/src/org/ruboto/JRubyAdapter.java
 - assets/src/org/ruboto/Log.java
 - assets/src/org/ruboto/RubotoComponent.java
@@ -203,6 +205,7 @@ files:
 - test/rake_test.rb
 - test/ruboto_activity_test.rb
 - test/ruboto_gen_test.rb
+- test/ruboto_setup_test.rb
 - test/ruboto_update_test.rb
 - test/sample_broadcast_receiver_test.rb
 - test/service_test.rb