mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update for Android 5; use Proguard 5

Browse source
This commit is contained in:
Sean Owen 2014-10-21 18:05:08 +01:00
parent 1b3f32f54b
commit b8bafbe5c9
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/AndroidManifest.xml
View file

@ -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="19"/>
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="21"/>
<!-- 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"/>

2
androidtest/AndroidManifest.xml
View file

@ -22,7 +22,7 @@
<uses-permission android:name="android.permission.CAMERA"/>
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="19"/>
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="21"/>
<supports-screens android:xlargeScreens="true"
android:largeScreens="true"

4
pom.xml
View file

@ -339,7 +339,7 @@
</executions>
<configuration>
<sdk>
<platform>15</platform>
<platform>21</platform>
</sdk>
<proguard>
<skip>true</skip>
@ -361,7 +361,7 @@
<dependency>
<groupId>net.sf.proguard</groupId>
<artifactId>proguard-base</artifactId>
<version>4.10</version>
<version>5.0</version>
</dependency>
</dependencies>
</plugin>