From 08e7375c2cb2f7fb3e768935278afd935b4b0adc Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Tue, 4 Mar 2014 16:45:52 +0000
Subject: [PATCH] Experiment with building Android through Maven

---
 android/AndroidManifest.xml               |   4 +-
 android/ant.properties                    |  23 -----
 android/build.xml                         | 108 ----------------------
 android/pom.xml                           |  47 ++--------
 android/proguard-android-optimize.txt     |   1 -
 android/proguard.cfg                      |   3 +-
 android/project.properties                |  14 ---
 androidtest/AndroidManifest.xml           |   4 +-
 androidtest/ant.properties                |  23 -----
 androidtest/build.xml                     | 108 ----------------------
 androidtest/pom.xml                       |  49 +++-------
 androidtest/proguard-android-optimize.txt |   1 -
 androidtest/proguard.cfg                  |   3 +-
 androidtest/project.properties            |  14 ---
 pom.xml                                   |  76 +++++++++++++++
 15 files changed, 105 insertions(+), 373 deletions(-)
 delete mode 100644 android/ant.properties
 delete mode 100644 android/build.xml
 delete mode 120000 android/proguard-android-optimize.txt
 delete mode 100644 android/project.properties
 delete mode 100644 androidtest/ant.properties
 delete mode 100644 androidtest/build.xml
 delete mode 120000 androidtest/proguard-android-optimize.txt
 delete mode 100644 androidtest/project.properties

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index c619f12f3..c17aaefb7 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -16,8 +16,8 @@
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="4.6.2"
-          android:versionCode="97"
+          android:versionName="4.6.3"
+          android:versionCode="98"
           android:installLocation="auto">
 
   <uses-permission android:name="android.permission.CAMERA"/>
diff --git a/android/ant.properties b/android/ant.properties
deleted file mode 100644
index 623e74126..000000000
--- a/android/ant.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
-application-package=com.google.zxing.client.android
-external-libs-folder=libs
-key.store=../private/ZXing.keystore
-key.alias=zxing
-java.source=7
-java.target=7
\ No newline at end of file
diff --git a/android/build.xml b/android/build.xml
deleted file mode 100644
index 9cf123d1f..000000000
--- a/android/build.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2008 ZXing authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project name="BarcodeScanner" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <loadproperties srcFile="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
-            unless="sdk.dir"
-    />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-<!--
-    <target name="-pre-build">
-    </target>
-    <target name="-pre-compile">
-    </target>
-
-    /* This is typically used for code obfuscation.
-       Compiled code location: ${out.classes.absolute.dir}
-       If this is not done in place, override ${out.dex.input.absolute.dir} */
-    <target name="-post-compile">
-    </target>
--->
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-    <!-- These targets only exist so they will be visible in IntelliJ. -->
-    <target name="ij-debug" depends="clean,debug"/>
-    <target name="ij-release" depends="clean,release"/>
-    <target name="ij-install" depends="clean">
-      <exec command="ant debug install"/>
-    </target>
-    <target name="ij-uninstall" depends="uninstall"/>
-
-</project>
diff --git a/android/pom.xml b/android/pom.xml
index a3db02045..5c29207f6 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -18,60 +18,33 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>android</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
+  <version>4.6.3</version>
+  <packaging>apk</packaging>
 
   <dependencies>
     <dependency>
       <groupId>com.google.zxing</groupId>
       <artifactId>core</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>android</artifactId>
     </dependency>
   </dependencies>
 
   <parent>
     <groupId>com.google.zxing</groupId>
     <artifactId>zxing-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
 
   <build>
     <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <configuration>
-              <target>
-                <property name="build.compiler" value="extJavac"/>
-                <ant target="debug"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>gen</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
+        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+        <artifactId>android-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/android/proguard-android-optimize.txt b/android/proguard-android-optimize.txt
deleted file mode 120000
index c8e96d649..000000000
--- a/android/proguard-android-optimize.txt
+++ /dev/null
@@ -1 +0,0 @@
-proguard.cfg
\ No newline at end of file
diff --git a/android/proguard.cfg b/android/proguard.cfg
index 7a324d9ce..3dc25f17f 100644
--- a/android/proguard.cfg
+++ b/android/proguard.cfg
@@ -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,!field/*,!class/merging/*,!code/allocation/variable
+-optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable,!method/marking/private
 -optimizationpasses 5
 -allowaccessmodification
 -dontpreverify
@@ -24,6 +24,7 @@
 -verbose
 
 # ADDED
+-dontshrink
 -dontobfuscate
 
 -keepattributes *Annotation*
diff --git a/android/project.properties b/android/project.properties
deleted file mode 100644
index ff8fa0636..000000000
--- a/android/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-proguard.config=proguard-android-optimize.txt
-
-# Project target.
-target=android-19
diff --git a/androidtest/AndroidManifest.xml b/androidtest/AndroidManifest.xml
index f82d96e64..1e3112807 100755
--- a/androidtest/AndroidManifest.xml
+++ b/androidtest/AndroidManifest.xml
@@ -16,8 +16,8 @@
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.androidtest"
-          android:versionName="1.4.1"
-          android:versionCode="10"
+          android:versionName="1.4.2"
+          android:versionCode="11"
           android:installLocation="auto">
 
   <uses-permission android:name="android.permission.CAMERA"/>
diff --git a/androidtest/ant.properties b/androidtest/ant.properties
deleted file mode 100644
index 315008716..000000000
--- a/androidtest/ant.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
-application-package=com.google.zxing.client.androidtest
-external-libs-folder=libs
-key.store=../private/ZXing.keystore
-key.alias=zxing
-java.source=7
-java.target=7
\ No newline at end of file
diff --git a/androidtest/build.xml b/androidtest/build.xml
deleted file mode 100644
index 85cee7162..000000000
--- a/androidtest/build.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2008 ZXing authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project name="ZXingTest" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <loadproperties srcFile="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
-            unless="sdk.dir"
-    />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-<!--
-    <target name="-pre-build">
-    </target>
-    <target name="-pre-compile">
-    </target>
-
-    /* This is typically used for code obfuscation.
-       Compiled code location: ${out.classes.absolute.dir}
-       If this is not done in place, override ${out.dex.input.absolute.dir} */
-    <target name="-post-compile">
-    </target>
--->
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-    <!-- These targets only exist so they will be visible in IntelliJ. -->
-    <target name="ij-debug" depends="clean,debug"/>
-    <target name="ij-release" depends="clean,release"/>
-    <target name="ij-install" depends="clean">
-      <exec command="ant debug install"/>
-    </target>
-    <target name="ij-uninstall" depends="uninstall"/>
-
-</project>
diff --git a/androidtest/pom.xml b/androidtest/pom.xml
index 2d2740a10..52874111a 100644
--- a/androidtest/pom.xml
+++ b/androidtest/pom.xml
@@ -18,65 +18,38 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>androidtest</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
+  <version>1.4.2</version>
+  <packaging>apk</packaging>
 
   <dependencies>
     <dependency>
       <groupId>com.google.zxing</groupId>
       <artifactId>core</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.zxing</groupId>
       <artifactId>android-integration</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>android</artifactId>
     </dependency>
   </dependencies>
 
   <parent>
     <groupId>com.google.zxing</groupId>
     <artifactId>zxing-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.0.1-SNAPSHOT</version>
   </parent>
 
   <build>
     <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <configuration>
-              <target>
-                <property name="build.compiler" value="extJavac"/>
-                <ant target="debug"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>gen</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
+        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+        <artifactId>android-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/androidtest/proguard-android-optimize.txt b/androidtest/proguard-android-optimize.txt
deleted file mode 120000
index c8e96d649..000000000
--- a/androidtest/proguard-android-optimize.txt
+++ /dev/null
@@ -1 +0,0 @@
-proguard.cfg
\ No newline at end of file
diff --git a/androidtest/proguard.cfg b/androidtest/proguard.cfg
index 7a324d9ce..3dc25f17f 100644
--- a/androidtest/proguard.cfg
+++ b/androidtest/proguard.cfg
@@ -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,!field/*,!class/merging/*,!code/allocation/variable
+-optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable,!method/marking/private
 -optimizationpasses 5
 -allowaccessmodification
 -dontpreverify
@@ -24,6 +24,7 @@
 -verbose
 
 # ADDED
+-dontshrink
 -dontobfuscate
 
 -keepattributes *Annotation*
diff --git a/androidtest/project.properties b/androidtest/project.properties
deleted file mode 100644
index ff8fa0636..000000000
--- a/androidtest/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-proguard.config=proguard-android-optimize.txt
-
-# Project target.
-target=android-19
diff --git a/pom.xml b/pom.xml
index e6193a9ac..79115f0f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,12 @@
         <version>6.0</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.android</groupId>
+        <artifactId>android</artifactId>
+        <version>4.1.1.4</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -84,6 +90,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <slf4j.version>1.7.6</slf4j.version>
+    <android.sdk.path>/Applications/adt-bundle-mac-x86_64-20131030/sdk</android.sdk.path>
   </properties>
 
   <build>
@@ -191,6 +198,11 @@
           <artifactId>maven-jar-plugin</artifactId>
           <version>2.4</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jarsigner-plugin</artifactId>
+          <version>1.3.1</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
@@ -263,6 +275,24 @@
           <artifactId>maven-war-plugin</artifactId>
           <version>2.4</version>
         </plugin>
+        <plugin>
+          <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+          <artifactId>android-maven-plugin</artifactId>
+          <version>3.9.0-rc.1</version>
+          <extensions>true</extensions>
+          <configuration>
+            <sdk>
+              <platform>15</platform>
+            </sdk>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>net.sf.proguard</groupId>
+              <artifactId>proguard-base</artifactId>
+              <version>4.10</version>
+            </dependency>
+          </dependencies>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
@@ -480,6 +510,52 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>android-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jarsigner-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>signing</id>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <includes>
+                    <include>target/*.apk</include>
+                  </includes>
+                  <keystore>../private/ZXing.keystore</keystore>
+                  <alias>zxing</alias>
+                  <arguments>
+                    <argument>-sigalg</argument>
+                    <argument>MD5withRSA</argument>
+                    <argument>-digestalg</argument>
+                    <argument>SHA1</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+            <artifactId>android-maven-plugin</artifactId>
+            <configuration>
+              <proguard>
+                <skip>false</skip>
+                <config>proguard.cfg</config>
+              </proguard>
+              <sign>
+                <debug>false</debug>
+              </sign>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
 </project>