mirror of
https://github.com/google/guice.git
synced 2026-10-19 16:16:21 +00:00
Update to Guava 25.1-android.
It's required by Truth 0.41, which we switched to in CL 200574789. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=202732649
This commit is contained in:
@@ -116,8 +116,8 @@
|
||||
<pathelement location="${build.dir}/dist/guice-${version}.jar"/>
|
||||
<pathelement location="lib/javax.inject.jar"/>
|
||||
<pathelement location="lib/aopalliance.jar"/>
|
||||
<pathelement location="lib/guava-19.0.jar"/>
|
||||
<pathelement location="lib/build/guava-testlib-19.0.jar"/>
|
||||
<pathelement location="lib/guava-25.1-android.jar"/>
|
||||
<pathelement location="lib/build/guava-testlib-25.1-android.jar"/>
|
||||
<pathelement location="lib/build/junit.jar"/>
|
||||
<pathelement location="lib/build/servlet-api-2.5.jar"/>
|
||||
<pathelement location="lib/build/truth-0.41.jar"/>
|
||||
|
||||
@@ -52,7 +52,7 @@ public class OSGiContainerTest extends TestCase {
|
||||
/*end[AOP]*/
|
||||
static final String JAVAX_INJECT_JAR =
|
||||
System.getProperty("javax.inject.jar", "lib/javax.inject.jar");
|
||||
static final String GUAVA_JAR = System.getProperty("guava.jar", "lib/guava-19.0.jar");
|
||||
static final String GUAVA_JAR = System.getProperty("guava.jar", "lib/guava-25.1-android.jar");
|
||||
|
||||
// dynamically build test bundles
|
||||
@Override
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -144,12 +144,12 @@ See the Apache License Version 2.0 for the specific language governing permissio
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>23.6-android</version>
|
||||
<version>25.1-android</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava-testlib</artifactId>
|
||||
<version>23.6-android</version>
|
||||
<version>25.1-android</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.ow2.asm</groupId>
|
||||
|
||||
Reference in New Issue
Block a user