mirror of
https://github.com/zxing/zxing.git
synced 2024-09-19 21:17:33 -07:00
Remove unneeded .gitignore, and unneeded libs copy step for Android targets. Update plugins. Fix javadoc warning / checkstyle problem.
This commit is contained in:
parent
032e1547ae
commit
58f748a451
2
android-integration/.gitignore
vendored
2
android-integration/.gitignore
vendored
|
@ -1,2 +0,0 @@
|
|||
target/
|
||||
*.iml
|
|
@ -34,36 +34,6 @@
|
|||
<version>3.2.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-androidtest</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>copy</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>com.google.zxing</groupId>
|
||||
<artifactId>android-integration</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>jar</type>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
<outputDirectory>../androidtest/libs</outputDirectory>
|
||||
<overWriteIfNewer>true</overWriteIfNewer>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<name>ZXing Android Integration lib</name>
|
||||
<description>Integration helper classes for Android applications wanting to create/scan barcodes</description>
|
||||
|
||||
|
|
6
android/.gitignore
vendored
6
android/.gitignore
vendored
|
@ -1,6 +0,0 @@
|
|||
target/
|
||||
*.iml
|
||||
bin/
|
||||
gen/
|
||||
libs/
|
||||
local.properties
|
6
androidtest/.gitignore
vendored
6
androidtest/.gitignore
vendored
|
@ -1,6 +0,0 @@
|
|||
target/
|
||||
*.iml
|
||||
bin/
|
||||
gen/
|
||||
libs/
|
||||
local.properties
|
2
core/.gitignore
vendored
2
core/.gitignore
vendored
|
@ -1,2 +0,0 @@
|
|||
target/
|
||||
*.iml
|
49
core/pom.xml
49
core/pom.xml
|
@ -35,55 +35,6 @@
|
|||
<version>3.2.2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-android</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>copy</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>com.google.zxing</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>jar</type>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
<outputDirectory>../android/libs</outputDirectory>
|
||||
<overWriteIfNewer>true</overWriteIfNewer>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>copy-androidtest</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>copy</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>com.google.zxing</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>jar</type>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
<outputDirectory>../androidtest/libs</outputDirectory>
|
||||
<overWriteIfNewer>true</overWriteIfNewer>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<name>ZXing Core</name>
|
||||
<description>Core barcode encoding/decoding library</description>
|
||||
|
||||
|
|
|
@ -84,6 +84,8 @@ public abstract class AbstractRSSReader extends OneDReader {
|
|||
}
|
||||
|
||||
/**
|
||||
* @param array values to sum
|
||||
* @return sum of values
|
||||
* @deprecated call {@link MathUtils#sum(int[])}
|
||||
*/
|
||||
@Deprecated
|
||||
|
|
|
@ -43,6 +43,8 @@ public final class PDF417Common {
|
|||
}
|
||||
|
||||
/**
|
||||
* @param moduleBitCount values to sum
|
||||
* @return sum of values
|
||||
* @deprecated call {@link MathUtils#sum(int[])}
|
||||
*/
|
||||
@Deprecated
|
||||
|
|
6
glass/.gitignore
vendored
6
glass/.gitignore
vendored
|
@ -1,6 +0,0 @@
|
|||
target/
|
||||
*.iml
|
||||
bin/
|
||||
gen/
|
||||
libs/
|
||||
local.properties
|
2
javase/.gitignore
vendored
2
javase/.gitignore
vendored
|
@ -1,2 +0,0 @@
|
|||
target/
|
||||
*.iml
|
17
pom.xml
17
pom.xml
|
@ -216,10 +216,6 @@
|
|||
<fileset>
|
||||
<directory>.</directory>
|
||||
<includes>
|
||||
<include>**/bin/**</include>
|
||||
<include>**/gen/**</include>
|
||||
<include>**/libs/*</include>
|
||||
<include>**/out/**</include>
|
||||
<include>**/classes/**</include>
|
||||
<include>**/gwt-unitCache/**</include>
|
||||
<include>**/webapp/generator/**</include>
|
||||
|
@ -240,7 +236,7 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<version>3.0.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
@ -341,11 +337,6 @@
|
|||
</systemPropertyVariables>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<version>2.10</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
|
@ -354,7 +345,7 @@
|
|||
<plugin>
|
||||
<groupId>com.simpligility.maven.plugins</groupId>
|
||||
<artifactId>android-maven-plugin</artifactId>
|
||||
<version>4.4.1</version>
|
||||
<version>4.4.2</version>
|
||||
<extensions>true</extensions>
|
||||
<executions>
|
||||
<execution>
|
||||
|
@ -426,7 +417,7 @@
|
|||
<configuration>
|
||||
<configLocation>src/checkstyle/checkstyle.xml</configLocation>
|
||||
<!-- Android generated files -->
|
||||
<excludes>**/R.java,**/BuildConfig.java</excludes>
|
||||
<excludes>**/R.java,**/BuildConfig.java,**/Manifest.java</excludes>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
|
@ -507,7 +498,7 @@
|
|||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<version>0.7.6.201602180812</version>
|
||||
<version>0.7.7.201606060606</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
|
|
2
zxing.appspot.com/.gitignore
vendored
2
zxing.appspot.com/.gitignore
vendored
|
@ -1,2 +0,0 @@
|
|||
target/
|
||||
*.iml
|
2
zxingorg/.gitignore
vendored
2
zxingorg/.gitignore
vendored
|
@ -1,2 +0,0 @@
|
|||
target/
|
||||
*.iml
|
|
@ -61,7 +61,7 @@
|
|||
<plugin>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-maven-plugin</artifactId>
|
||||
<version>9.3.9.M1</version>
|
||||
<version>9.4.0.M0</version>
|
||||
<configuration>
|
||||
<webAppSourceDirectory>src/web</webAppSourceDirectory>
|
||||
</configuration>
|
||||
|
|
Loading…
Reference in a new issue