update.rb in ruboto-0.11.0.rc.1

- old
+ new

@@ -269,11 +269,11 @@
         end
       end
 
       def update_manifest(min_sdk, target, force = false)
         log_action("\nAdding RubotoActivity, RubotoDialog, RubotoService, and SDK versions to the manifest") do
-          if sdk_element = verify_manifest.elements['uses-sdk']
+          if (sdk_element = verify_manifest.elements['uses-sdk'])
             min_sdk ||= sdk_element.attributes['android:minSdkVersion']
             target ||= sdk_element.attributes['android:targetSdkVersion']
           else
             min_sdk ||= MINIMUM_SUPPORTED_SDK_LEVEL
             target ||= MINIMUM_SUPPORTED_SDK_LEVEL
@@ -360,10 +360,11 @@
               FileUtils.move "../#{jruby_core}", '.'
               `jar -xf #{jruby_core}`
               raise "Unpacking jruby-core jar failed: #$?" unless $? == 0
               File.delete jruby_core
               if Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.3.dev')
+                #noinspection RubyLiteralArrayInspection
                 excluded_core_packages = [
                     '**/*Darwin*',
                     '**/*Solaris*',
                     '**/*windows*',
                     '**/*Windows*',
@@ -413,133 +414,24 @@
                     #'org/jruby/ir/transformations',
                     #'org/jruby/ir/util',
                     'org/jruby/javasupport/bsf',
                     # 'org/jruby/management', # should be excluded
                     # 'org/jruby/runtime/invokedynamic', # Should be excluded
+                    'org/yecht',
                 ]
                 elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.2')
-                  excluded_core_packages = [
-                      '**/*Darwin*',
-                      '**/*Ruby20*',
-                      '**/*Solaris*',
-                      '**/*windows*',
-                      '**/*Windows*',
-                      'META-INF',
-                      'com/headius',
-                      'com/kenai/constantine',
-                      'com/kenai/jffi',
-                      'com/martiansoftware',
-                      'jline', '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/provider', 'jnr/ffi/util',
-                      'jnr/ffi/Struct$*',
-                      'jnr/ffi/types',
-                      'jnr/posix/MacOS*',
-                      'jnr/posix/OpenBSD*',
-                      'org/apache',
-                      'org/fusesource',
-                      'org/jruby/ant',
-                      'org/jruby/cext',
-                      'org/jruby/compiler/util',
-                      'org/jruby/demo',
-                      'org/jruby/embed/bsf',
-                      'org/jruby/embed/jsr223',
-                      'org/jruby/embed/osgi',
-                      'org/jruby/ext/ffi/io',
-                      'org/jruby/ext/ffi/jffi',
-                      'org/jruby/javasupport/bsf',
-                  ]
+                  excluded_core_packages = %w(**/*Darwin* **/*Ruby20* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/martiansoftware jline 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/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/MacOS* jnr/posix/OpenBSD* org/apache org/fusesource org/jruby/ant org/jruby/cext org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/javasupport/bsf)
                 elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.1')
-                  excluded_core_packages = [
-                      '**/*Darwin*',
-                      '**/*Ruby20*',
-                      '**/*Solaris*',
-                      '**/*windows*',
-                      '**/*Windows*',
-                      'META-INF',
-                      'com/headius',
-                      'com/kenai/constantine', 'com/kenai/jffi', 'com/martiansoftware',
-                      'jline', '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/provider', 'jnr/ffi/util',
-                      'jnr/ffi/Struct$*',
-                      'jnr/ffi/types',
-                      'jnr/posix/MacOS*',
-                      'jnr/posix/OpenBSD*',
-                      'org/apache',
-                      'org/fusesource',
-                      'org/jruby/ant',
-                      'org/jruby/cext',
-                      'org/jruby/compiler/util',
-                      'org/jruby/demo',
-                      'org/jruby/embed/bsf',
-                      'org/jruby/embed/jsr223',
-                      'org/jruby/embed/osgi',
-                      'org/jruby/ext/ffi/io',
-                      'org/jruby/ext/ffi/jffi',
-                      'org/jruby/ext/openssl', # TODO(uwe): Issue #154 Add back when we add jruby-openssl.
-                      'org/jruby/javasupport/bsf',
-                      'org/jruby/org/bouncycastle', # TODO(uwe): Issue #154 Add back when we add jruby-openssl.  The bouncycastle included in Android is cripled.
-                  ]
+                  excluded_core_packages = %w(**/*Darwin* **/*Ruby20* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/martiansoftware jline 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/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/MacOS* jnr/posix/OpenBSD* org/apache org/fusesource org/jruby/ant org/jruby/cext org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/ext/openssl org/jruby/javasupport/bsf org/jruby/org/bouncycastle)
               elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.0')
                 # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.0
-                excluded_core_packages = [
-                    '**/*Darwin*',
-                    '**/*Solaris*',
-                    '**/*windows*',
-                    '**/*Windows*',
-                    'META-INF',
-                    'com/headius',
-                    'com/kenai/constantine', 'com/kenai/jffi', 'com/martiansoftware',
-                    'jline', '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/provider', 'jnr/ffi/util',
-                    'jnr/ffi/Struct$*',
-                    'jnr/ffi/types',
-                    'jnr/posix/MacOS*',
-                    'jnr/posix/OpenBSD*',
-                    'org/apache',
-                    'org/bouncycastle',
-                    'org/fusesource',
-                    'org/jruby/ant',
-                    'org/jruby/cext',
-                    'org/jruby/compiler/util',
-                    'org/jruby/demo',
-                    'org/jruby/embed/bsf',
-                    'org/jruby/embed/jsr223',
-                    'org/jruby/embed/osgi',
-                    'org/jruby/ext/ffi/io',
-                    'org/jruby/ext/ffi/jffi',
-                    'org/jruby/ext/openssl',
-                    'org/jruby/javasupport/bsf',
-                ]
+                excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/martiansoftware jline 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/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/MacOS* jnr/posix/OpenBSD* org/apache org/bouncycastle org/fusesource org/jruby/ant org/jruby/cext org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/ext/openssl org/jruby/javasupport/bsf)
                 # ODOT
               elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.6.0')
                 # TODO(uwe): Remove when we stop supporting jruby-jars 1.6.x
                 print 'Retaining com.kenai.constantine and removing jnr for JRuby 1.6.x...'
-                excluded_core_packages = [
-                    'META-INF', 'cext',
-                    'com/kenai/jffi', 'com/martiansoftware', 'ext', 'java',
-                    'jline', 'jni',
-                    'jnr',
-                    'jnr/constants/platform/darwin', 'jnr/constants/platform/fake', 'jnr/constants/platform/freebsd',
-                    'jnr/constants/platform/openbsd', 'jnr/constants/platform/sunos', 'jnr/constants/platform/windows',
-                    'jnr/ffi/annotations', 'jnr/ffi/byref', 'jnr/ffi/provider', 'jnr/ffi/util',
-                    'jnr/netdb', 'jnr/ffi/posix/util',
-                    'org/apache', 'org/jruby/ant',
-                    'org/jruby/compiler/ir',
-                    'org/jruby/compiler/util',
-                    'org/jruby/demo', 'org/jruby/embed/bsf',
-                    'org/jruby/embed/jsr223', 'org/jruby/embed/osgi', 'org/jruby/ext/ffi', 'org/jruby/javasupport/bsf',
-                    'org/jruby/runtime/invokedynamic',
-                ]
+                excluded_core_packages = %w(META-INF cext com/kenai/jffi com/martiansoftware ext java jline jni jnr jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/constants/platform/windows jnr/ffi/annotations jnr/ffi/byref jnr/ffi/provider jnr/ffi/util jnr/netdb jnr/ffi/posix/util org/apache org/jruby/ant org/jruby/compiler/ir org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi org/jruby/javasupport/bsf org/jruby/runtime/invokedynamic)
                 # ODOT
               else
                 raise "Unsupported JRuby version: #{jruby_core_version.inspect}."
               end
 
@@ -755,9 +647,10 @@
             Dir.chdir 'tmp' do
               FileUtils.move "../#{dx_jar}", '.'
               `jar -xf #{dx_jar}`
               raise "Unpacking dx.jar jar failed: #$?" unless $? == 0
               File.delete dx_jar
+              #noinspection RubyLiteralArrayInspection
               excluded_core_packages = [
                   'com/android/dx/command',
                   # 'com/android/dx/ssa', # Tests run OK without this package, but we may loose some optimizations.
                   'junit',
               ]