mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-09 20:44:03 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Target Android 5.1 (don't require it); bump BS app number for next release; update plugins

Browse source
This commit is contained in:
Sean Owen 2015-03-21 16:44:46 +00:00
parent 717c53ddbe
commit bc3c8e3ffd
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/AndroidManifest.xml
View file

@ -16,8 +16,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.zxing.client.android"
android:versionName="4.7.3"
android:versionCode="103"
android:versionName="4.7.4"
android:versionCode="104"
android:installLocation="auto">
<uses-permission android:name="android.permission.CAMERA"/>
@ -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="21"/>
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="22"/>
<!-- 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
android/pom.xml
View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>android</artifactId>
<version>4.7.3</version>
<version>4.7.4</version>
<packaging>apk</packaging>
<dependencies>

2
androidtest/AndroidManifest.xml
View file

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

10
pom.xml
View file

@ -177,7 +177,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<version>2.10.2</version>
<configuration>
<javadocVersion>${java.version}</javadocVersion>
</configuration>
@ -228,12 +228,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
<version>1.3.2</version>
<version>1.4</version>
<executions>
<execution>
<id>signing</id>
@ -345,7 +345,7 @@
</executions>
<configuration>
<sdk>
<platform>21</platform>
<platform>22</platform>
</sdk>
<proguard>
<skip>true</skip>
@ -442,7 +442,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.3.201502191951</version>
<version>0.7.4.201502262128</version>
<executions>
<execution>
<goals>

2
zxingorg/pom.xml
View file

@ -61,7 +61,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.3.0.M1</version>
<version>9.3.0.M2</version>
</plugin>
</plugins>
</build>