From 72f8ce5968f2726b37afdeae8d7ea0f10fde83d4 Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Wed, 19 Aug 2015 12:09:39 +0100
Subject: [PATCH] Update to target Android 23; brief 3.2.1 release note

---
 CHANGES                         | 4 ++++
 android/AndroidManifest.xml     | 2 +-
 androidtest/AndroidManifest.xml | 2 +-
 pom.xml                         | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9c9996aef..0fe754a4c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -351,3 +351,7 @@
   - Several bug fixes, especially for Data Matrix and PDF417 parsing
   - Retired jruby binding
   - Barcode Scanner can now disable history
+
+3.2.1 (20 Aug 2015)
+
+  - Small bug fixes
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index bd25a7d26..3ea9e72d0 100755
--- a/android/AndroidManifest.xml
+++ b/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="15" android:targetSdkVersion="22"/>
+  <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="23"/>
 
   <!-- 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"/>
diff --git a/androidtest/AndroidManifest.xml b/androidtest/AndroidManifest.xml
index 5758fa4aa..dd674696f 100755
--- a/androidtest/AndroidManifest.xml
+++ b/androidtest/AndroidManifest.xml
@@ -22,7 +22,7 @@
 
   <uses-permission android:name="android.permission.CAMERA"/>
 
-  <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="22"/>
+  <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="23"/>
 
   <supports-screens android:xlargeScreens="true"
                     android:largeScreens="true"
diff --git a/pom.xml b/pom.xml
index 069d4eb34..537efbf09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -362,7 +362,7 @@
           </executions>
           <configuration>
             <sdk>
-              <platform>22</platform>
+              <platform>23</platform>
             </sdk>
             <proguard>
               <skip>true</skip>