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

Update plugin and minor deps; catch additional Android error in app

Browse source
This commit is contained in:
Sean Owen 2017-03-15 11:08:07 +00:00
parent 0a542b9e9e
commit b5f6d3f73c
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/google/zxing/client/android/HttpHelper.java
View file

@ -216,8 +216,8 @@ public final class HttpHelper {
private static int safelyConnect(HttpURLConnection connection) throws IOException { private static int safelyConnect(HttpURLConnection connection) throws IOException {
try { try {
connection.connect(); connection.connect();
} catch (NullPointerException | IllegalArgumentException | IndexOutOfBoundsException | SecurityException e) { } catch (RuntimeException e) {
// this is an Android bug: http://code.google.com/p/android/issues/detail?id=16895 // These are, generally, Android bugs
throw new IOException(e); throw new IOException(e);
} }
try { try {

2
javase/pom.xml
View file

@ -29,7 +29,7 @@
<dependency> <dependency>
<groupId>com.beust</groupId> <groupId>com.beust</groupId>
<artifactId>jcommander</artifactId> <artifactId>jcommander</artifactId>
<version>1.60</version> <version>1.64</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.jai-imageio</groupId> <groupId>com.github.jai-imageio</groupId>

8
pom.xml
View file

@ -89,8 +89,8 @@
<java.version>1.7</java.version> <java.version>1.7</java.version>
<maven.version.min>3.2.1</maven.version.min> <maven.version.min>3.2.1</maven.version.min>
<proguard.version>5.3.2</proguard.version> <proguard.version>5.3.2</proguard.version>
<proguard.plugin.version>2.0.13</proguard.plugin.version> <proguard.plugin.version>2.0.14</proguard.plugin.version>
<slf4j.version>1.7.22</slf4j.version> <slf4j.version>1.7.24</slf4j.version>
<!-- This can't reference project.version as some subprojects version differently --> <!-- This can't reference project.version as some subprojects version differently -->
<zxing.version>3.3.1-SNAPSHOT</zxing.version> <zxing.version>3.3.1-SNAPSHOT</zxing.version>
<android.platform>22</android.platform> <android.platform>22</android.platform>
@ -439,7 +439,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>1.12</version> <version>3.0.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -523,7 +523,7 @@
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.8</version> <version>0.7.9</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>

2
zxingorg/pom.xml
View file

@ -57,7 +57,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>9.4.1.v20170120</version> <version>9.4.2.v20170220</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>