assets/rakelib/ruboto.rake in ruboto-1.3.1 vs assets/rakelib/ruboto.rake in ruboto-1.4.0

- old
+ new

@@ -468,11 +468,11 @@ #{end_marker} EOF ant_script.gsub!(/\s*#{start_marker}.*?#{end_marker}\s*/m, '') # FIXME(uwe): Remove condition when we stop supporting Android 4.0 and older. - if sdk_level >= 16 + if sdk_level >= 15 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 } @@ -982,10 +982,10 @@ `adb shell am start -a android.intent.action.MAIN -n #{package}/.#{main_activity}` end # Triggers reload of updated scripts and restart of the current activity def reload_scripts(scripts) - s = scripts.map { |s| s.gsub(/[&;]/) { |m| "&#{m[0]}" } }.join('\;') + s = scripts.map { |s| s.gsub(/[&;]/) { |m| "&#{m[0]}" } }.join(';') cmd = %Q{adb shell am broadcast -a android.intent.action.VIEW -e reload '#{s}'} puts cmd system cmd end