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

Disable Android, proguard, appspot for JDK 9

Browse source
This commit is contained in:
Sean Owen 2017-09-22 17:50:34 +01:00
parent ea6111c7f9
commit 05093ed3d2
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/pom.xml
View file

@ -42,7 +42,7 @@
<profile> <profile>
<id>proguard-library</id> <id>proguard-library</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <jdk>[,9)</jdk> <!-- Proguard won't work with JDK 9 -->
</activation> </activation>
<build> <build>
<plugins> <plugins>

12
pom.xml
View file

@ -74,8 +74,8 @@
<module>core</module> <module>core</module>
<module>javase</module> <module>javase</module>
<!-- android modules are activated by a profile below --> <!-- android modules are activated by a profile below -->
<module>zxing.appspot.com</module>
<module>zxingorg</module> <module>zxingorg</module>
<!-- appspot app activated by a profile below -->
</modules> </modules>
<properties> <properties>
@ -709,6 +709,7 @@
<property> <property>
<name>env.ANDROID_HOME</name> <name>env.ANDROID_HOME</name>
</property> </property>
<jdk>[,9)</jdk> <!-- Android won't necessarily work with JDK 9 -->
</activation> </activation>
<modules> <modules>
<module>android-core</module> <module>android-core</module>
@ -809,6 +810,15 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>appspot</id>
<activation>
<jdk>[,9)</jdk> <!-- Appspot won't work with JDK 9 -->
</activation>
<modules>
<module>zxing.appspot.com</module>
</modules>
</profile>
</profiles> </profiles>
</project> </project>