diff options
| author | Haibo Huang <hhb@google.com> | 2018-08-28 11:18:22 -0700 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2018-08-28 11:20:15 -0700 |
| commit | bfaaf2b15f18ec4f73641d11539db4829f5b15e2 (patch) | |
| tree | cb03f0d7b72d492f6f29457cbe0d5b5eee636f54 /common.xml | |
| parent | 9b878813d48dee9b08a1cdc8c8b607a602752659 (diff) | |
| download | guice-bfaaf2b15f18ec4f73641d11539db4829f5b15e2.tar.gz | |
Upgrade guice to 4.2
Test: m checkbuild
Change-Id: I7df64e3d67f5b6c586ff444f45636cd7b2935c1f
Diffstat (limited to 'common.xml')
| -rw-r--r-- | common.xml | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -14,7 +14,7 @@ <javac srcdir="${src.dir}" debug="on" destdir="${build.dir}/classes" - source="1.6" target="1.6" includeantruntime="false"> + source="1.7" target="1.7" includeantruntime="false"> <compilerarg value="-Xlint:all,-serial"/> <classpath refid="compile.classpath"/> </javac> @@ -39,7 +39,7 @@ <property name="Bundle-DocURL" value="https://github.com/google/guice"/> <property name="Bundle-Copyright" value="Copyright (C) 2006 Google Inc."/> <property name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/> - <property name="Bundle-RequiredExecutionEnvironment" value="JavaSE-1.6"/> + <property name="Bundle-RequiredExecutionEnvironment" value="JavaSE-1.7"/> <property name="Bundle-Vendor" value="Google, Inc."/> <property name="Export-Package" value="!${module}.internal.*,${module}.*;version=${api.version}"/> @@ -76,7 +76,7 @@ <javac srcdir="${test.dir}" debug="on" destdir="${build.dir}/test" - source="1.6" target="1.6" includeantruntime="false"> + source="1.7" target="1.7" includeantruntime="false"> <classpath path="${build.dir}/classes"/> <classpath path="${build.dir}/test"/> <classpath refid="compile.classpath"/> @@ -144,8 +144,8 @@ classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/> <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar"> <fileset dir="${build.dir}/classes"/> - <zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar"/> - <zipfileset src="${common.basedir}/lib/build/asm-5.0.3.jar"/> + <zipfileset src="${common.basedir}/lib/build/cglib-3.2.6.jar"/> + <zipfileset src="${common.basedir}/lib/build/asm-6.0.jar"/> <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/> <rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/> <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/> |