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

Update plugins (now requires Maven 3.2); fix javadoc warning

Browse source
This commit is contained in:
Sean Owen 2015-05-02 17:16:31 +01:00
parent 4907c54003
commit 560cba85b0
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/src/main/java/com/google/zxing/common/BitMatrix.java
View file

@ -408,16 +408,27 @@ public final class BitMatrix implements Cloneable {
return hash; return hash;
} }
/**
* @return string representation using "X" for set and " " for unset bits
*/
@Override @Override
public String toString() { public String toString() {
return toString("X ", " "); return toString("X ", " ");
} }
/**
* @param setString representation of a set bit
* @param unsetString representation of an unset bit
* @return string representation of entire matrix utilizing given strings
*/
public String toString(String setString, String unsetString) { public String toString(String setString, String unsetString) {
return toString(setString, unsetString, "\n"); return toString(setString, unsetString, "\n");
} }
/** /**
* @param setString representation of a set bit
* @param unsetString representation of an unset bit
* @param lineSeparator newline character in string representation
* @deprecated call {@link #toString(String,String)} only, which uses \n line separator always * @deprecated call {@link #toString(String,String)} only, which uses \n line separator always
*/ */
@Deprecated @Deprecated

12
pom.xml
View file

@ -94,6 +94,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.7</java.version> <java.version>1.7</java.version>
<maven.version.min>3.2.1</maven.version.min>
<slf4j.version>1.7.12</slf4j.version> <slf4j.version>1.7.12</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.2.1-SNAPSHOT</zxing.version> <zxing.version>3.2.1-SNAPSHOT</zxing.version>
@ -136,7 +137,7 @@
<rules> <rules>
<dependencyConvergence /> <dependencyConvergence />
<requireMavenVersion> <requireMavenVersion>
<version>3.1.1</version> <version>${maven.version.min}</version>
</requireMavenVersion> </requireMavenVersion>
<requireJavaVersion> <requireJavaVersion>
<version>${java.version}</version> <version>${java.version}</version>
@ -177,7 +178,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.2</version> <version>2.10.3</version>
<configuration> <configuration>
<javadocVersion>${java.version}</javadocVersion> <javadocVersion>${java.version}</javadocVersion>
</configuration> </configuration>
@ -260,7 +261,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.5.1</version> <version>2.5.2</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.maven.scm</groupId> <groupId>org.apache.maven.scm</groupId>
@ -332,7 +333,7 @@
<plugin> <plugin>
<groupId>com.simpligility.maven.plugins</groupId> <groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId> <artifactId>android-maven-plugin</artifactId>
<version>4.1.1</version> <version>4.2.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<executions> <executions>
<execution> <execution>
@ -362,6 +363,7 @@
<resourceDirectory>res</resourceDirectory> <resourceDirectory>res</resourceDirectory>
<assetsDirectory>assets</assetsDirectory> <assetsDirectory>assets</assetsDirectory>
<nativeLibrariesDirectory>libs</nativeLibrariesDirectory> <nativeLibrariesDirectory>libs</nativeLibrariesDirectory>
<disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>
@ -570,7 +572,7 @@
</scm> </scm>
<prerequisites> <prerequisites>
<maven>3.1.1</maven> <maven>${maven.version.min}</maven>
</prerequisites> </prerequisites>
<distributionManagement> <distributionManagement>