Small fixes for 1.6 release

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

diff --git a/android-integration/build.xml b/android-integration/build.xml
index 988025c..58a844c 100644 (file)
--- a/android-integration/build.xml
+++ b/android-integration/build.xml
@@ -34,7 +34,7 @@
            debug="true"
            deprecation="true">
       <classpath>
-        <pathelement location="${android-home}/platforms/android-1.5/android.jar"/>
+        <pathelement location="${android-home}/platforms/android-3/android.jar"/>
       </classpath>
     </javac>
     <jar jarfile="android-integration.jar" basedir="build"/>

diff --git a/build.xml b/build.xml
index f2ededa..45a99fd 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -55,7 +55,7 @@
       <zipfileset dir="." prefix="zxing-${version}">
         <exclude name="**/.*"/> <!-- exclude hidden files -->
         <exclude name="**/.svn"/>
-        <exclude name="**/.iml"/>
+        <exclude name="**/*.iml"/>
         <include name="AUTHORS"/>
         <include name="COPYING"/>
         <include name="README"/>
@@ -107,7 +107,7 @@
         <pathelement location="${WTK-home}/lib/midp_2.0.jar"/>
         <pathelement location="${WTK-home}/lib/jsr135_1.2.jar"/>
         <pathelement location="${WTK-home}/lib/jsr234_1.0.jar"/>
-        <pathelement location="${android-home}/platforms/android-8/android.jar"/>
+        <pathelement location="${android-home}/platforms/android-3/android.jar"/>
         <pathelement location="${tomcat-home}/lib/servlet-api.jar"/>
         <fileset dir="zxingorg/web/WEB-INF/lib">
           <include name="*.jar"/>

diff --git a/core/build.xml b/core/build.xml
index 1a6e05d..ad307cc 100644 (file)
--- a/core/build.xml
+++ b/core/build.xml
@@ -79,7 +79,7 @@
       <!-- Needed for Mac OS. -->
       <!--<arg value="-libraryjars ${java.home}/../Classes/classes.jar"/>-->
       <!-- Needed for other Android apps besides Barcode Scanner. -->
-      <!--<arg value="-libraryjars ${android-home}/platforms/android-1.6/android.jar"/>-->
+      <!--<arg value="-libraryjars ${android-home}/platforms/android-3/android.jar"/>-->
       <arg value="-keep class com.google.zxing.* {public protected *;}"/>
       <arg value="-keep class com.google.zxing.common.*Binarizer {public protected *;}"/>
       <!-- Remove this line is you only use the Result base object and want the smallest jar. -->