Update for Android API 18, latest SDK

git-svn-id: https://zxing.googlecode.com/svn/trunk@2848 59b500cc-1b3d-0410-9834-0bbf25fbcc57

android/AndroidManifest.xml

@@ -30,7 +30,7 @@
   <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 
-  <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
+  <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="18"/>
 
   <!-- Don't require camera, as this requires a rear camera. This allows it to work on the Nexus 7 -->
   <uses-feature android:name="android.hardware.camera" android:required="false"/>

android/proguard-android-optimize.txt

@@ -10,7 +10,7 @@
 # be complete or up to date. (The "arithmetic" optimization can be
 # used if you are only targeting Android 2.0 or later.)  Make sure you
 # test thoroughly if you go this route.
--optimizations !code/simplification/cast,!code/allocation/*,!field/*,!class/merging/*
+-optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable
 -optimizationpasses 5
 -allowaccessmodification
 -dontpreverify

android/project.properties

@@ -11,4 +11,4 @@
 proguard.config=proguard-android-optimize.txt
 
 # Project target.
-target=android-17
+target=android-18

androidtest/AndroidManifest.xml

@@ -23,7 +23,7 @@
   <uses-permission android:name="android.permission.CAMERA"/>
 
   <uses-sdk android:minSdkVersion="10"
-            android:targetSdkVersion="17"/>
+            android:targetSdkVersion="18"/>
 
   <supports-screens android:xlargeScreens="true"
                     android:largeScreens="true"

androidtest/project.properties

@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-17
+target=android-18
 proguard.config=proguard.cfg