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 glass version, some plugins

Browse source
This commit is contained in:
Sean Owen 2014-09-26 11:12:15 +01:00
parent b0bf36f42c
commit 1992bd069e
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
glass/AndroidManifest.xml
View file

@ -16,8 +16,8 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.zxing.client.glass" package="com.google.zxing.client.glass"
android:versionCode="3" android:versionCode="4"
android:versionName="0.2.1"> android:versionName="0.2.2">
<uses-permission android:name="android.permission.CAMERA"/> <uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="com.google.android.glass.permission.DEVELOPMENT" /> <uses-permission android:name="com.google.android.glass.permission.DEVELOPMENT" />

11
pom.xml
View file

@ -75,7 +75,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12-beta-1</version> <version>4.12-beta-2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -212,7 +212,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>2.5</version> <version>2.6</version>
<configuration> <configuration>
<filesets> <filesets>
<fileset> <fileset>
@ -254,12 +254,12 @@
<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</version> <version>2.5.1</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.maven.scm</groupId> <groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId> <artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9.1</version> <version>1.9.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
@ -316,7 +316,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version> <version>2.9</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -355,6 +355,7 @@
<androidManifestFile>AndroidManifest.xml</androidManifestFile> <androidManifestFile>AndroidManifest.xml</androidManifestFile>
<resourceDirectory>res</resourceDirectory> <resourceDirectory>res</resourceDirectory>
<assetsDirectory>assets</assetsDirectory> <assetsDirectory>assets</assetsDirectory>
<nativeLibrariesDirectory>libs</nativeLibrariesDirectory>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>

2
zxingorg/pom.xml
View file

@ -61,7 +61,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.2.3.v20140905</version> <version>9.3.0.M0</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>