* Set correct project min-sdk and target on update

* Bumped version to 0.5.0.rc.3
ruboto · Oct 28, 2011 · 6648bb1 · 6648bb1
1 parent 9aaf710
commit 6648bb1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/lib/ruboto.rb b/lib/ruboto.rb
@@ -12,4 +12,5 @@
 module Ruboto
   GEM_ROOT = File.dirname(File.dirname(__FILE__))
   ASSETS = File.join(GEM_ROOT, "assets")
+  MINIMUM_SUPPORTED_SDK = 'android-7'
 end
diff --git a/lib/ruboto/commands/base.rb b/lib/ruboto/commands/base.rb
@@ -44,7 +44,7 @@ def self.main
               }
               option("target") {
                 argument :required
-                defaults 'android-7'
+                defaults MINIMUM_SUPPORTED_SDK
                 description "Android version to target. Must begin with 'android-' (e.g., 'android-8' for froyo)"
               }
               option("min-sdk") {

diff --git a/lib/ruboto/util/update.rb b/lib/ruboto/util/update.rb
@@ -215,6 +215,9 @@ def update_manifest(min_sdk, target, force = false)
           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
+            target ||= MINIMUM_SUPPORTED_SDK
           end
           app_element = verify_manifest.elements['application']
           app_element.attributes['android:icon'] ||= '@drawable/icon'