From d6e70f79876e1636f71ceb1c4ac137ce74826f65 Mon Sep 17 00:00:00 2001
From: icmdaf <hapa@google.com>
Date: Fri, 12 Feb 2021 16:06:18 +0000
Subject: [PATCH] Bump dependency versions (#35)

Using

```
$ mvn versions:use-latest-versions versions:update-properties
```
---
 pom.xml                                       | 26 ++++++++++++-------
 .../GuiceberryCompatibilityModuleTest.java    |  4 +--
 .../java/com/google/acai/TestScopeTest.java   | 12 ++++-----
 version-rules.xml                             |  2 +-
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index e555cb7..8f470ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,13 @@
         <configuration>
           <source>8</source>
           <target>8</target>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>com.google.auto.value</groupId>
+              <artifactId>auto-value</artifactId>
+              <version>${auto-value.version}</version>
+            </path>
+          </annotationProcessorPaths>
         </configuration>
       </plugin>
       <plugin>
@@ -151,50 +158,51 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <auto-value.version>1.7.4</auto-value.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>24.0-jre</version>
+      <version>30.1-jre</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-testlib</artifactId>
-      <version>24.0-jre</version>
+      <version>30.1-jre</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>4.1.0</version>
+      <version>4.2.3</version>
     </dependency>
     <dependency>
       <groupId>com.google.inject.extensions</groupId>
       <artifactId>guice-multibindings</artifactId>
-      <version>4.1.0</version>
+      <version>4.2.3</version>
     </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <version>1.5.3</version>
+      <artifactId>auto-value-annotations</artifactId>
+      <version>${auto-value.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>0.39</version>
+      <version>1.1.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth.extensions</groupId>
       <artifactId>truth-java8-extension</artifactId>
-      <version>0.39</version>
+      <version>1.1.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/src/test/java/com/google/acai/GuiceberryCompatibilityModuleTest.java b/src/test/java/com/google/acai/GuiceberryCompatibilityModuleTest.java
index 282b523..47855f0 100644
--- a/src/test/java/com/google/acai/GuiceberryCompatibilityModuleTest.java
+++ b/src/test/java/com/google/acai/GuiceberryCompatibilityModuleTest.java
@@ -54,7 +54,7 @@ public void sameInstanceInjectedWithinTest() throws Throwable {
         .evaluate();
 
     assertThat(test.instanceOne).isNotNull();
-    assertThat(test.instanceTwo).isSameAs(test.instanceOne);
+    assertThat(test.instanceTwo).isSameInstanceAs(test.instanceOne);
   }
 
   @Test
@@ -69,7 +69,7 @@ public void differentInstanceInjectedAcrossTests() throws Throwable {
         .apply(statement, frameworkMethod, testTwo)
         .evaluate();
 
-    assertThat(testOne.instanceOne).isNotSameAs(testTwo.instanceOne);
+    assertThat(testOne.instanceOne).isNotSameInstanceAs(testTwo.instanceOne);
   }
 
   @Test
diff --git a/src/test/java/com/google/acai/TestScopeTest.java b/src/test/java/com/google/acai/TestScopeTest.java
index b381db9..d06d6c3 100644
--- a/src/test/java/com/google/acai/TestScopeTest.java
+++ b/src/test/java/com/google/acai/TestScopeTest.java
@@ -46,7 +46,7 @@ public void sameInstanceInjectedWithinTest() throws Throwable {
     new Acai(EmptyTestModule.class).apply(statement, frameworkMethod, test).evaluate();
 
     assertThat(test.instanceOne).isNotNull();
-    assertThat(test.instanceTwo).isSameAs(test.instanceOne);
+    assertThat(test.instanceTwo).isSameInstanceAs(test.instanceOne);
   }
 
   @Test
@@ -57,7 +57,7 @@ public void differentInstanceInjectedAcrossTests() throws Throwable {
     new Acai(EmptyTestModule.class).apply(statement, frameworkMethod, testOne).evaluate();
     new Acai(EmptyTestModule.class).apply(statement, frameworkMethod, testTwo).evaluate();
 
-    assertThat(testOne.instanceOne).isNotSameAs(testTwo.instanceOne);
+    assertThat(testOne.instanceOne).isNotSameInstanceAs(testTwo.instanceOne);
   }
 
   @Test
@@ -77,7 +77,7 @@ public void canCallProviderInServiceSetupAndTeardown() throws Throwable {
 
     assertThat(ValidTestingService.valueFromBeforeTest).isNotNull();
     assertThat(ValidTestingService.valueFromAfterTest)
-        .isSameAs(ValidTestingService.valueFromBeforeTest);
+        .isSameInstanceAs(ValidTestingService.valueFromBeforeTest);
   }
 
   @Test
@@ -120,7 +120,7 @@ public void evaluate() throws Throwable {
 
     assertThat(testOne.instanceOne).isNotNull();
     assertThat(testOne.instanceOne).isNotNull();
-    assertThat(testOne.instanceOne).isNotSameAs(testTwo.instanceOne);
+    assertThat(testOne.instanceOne).isNotSameInstanceAs(testTwo.instanceOne);
   }
 
   @Test
@@ -147,7 +147,7 @@ public void evaluate() throws Throwable {
             test)
         .evaluate();
 
-    assertThat(instanceInMainThread.get()).isSameAs(instanceInChildThread.get());
+    assertThat(instanceInMainThread.get()).isSameInstanceAs(instanceInChildThread.get());
   }
 
   @Test
@@ -174,7 +174,7 @@ public void evaluate() throws Throwable {
             test)
         .evaluate();
 
-    assertThat(instanceInMainThread.get()).isSameAs(instanceInChildThread.get());
+    assertThat(instanceInMainThread.get()).isSameInstanceAs(instanceInChildThread.get());
   }
 
   @Test
diff --git a/version-rules.xml b/version-rules.xml
index 28638c3..c28f16f 100644
--- a/version-rules.xml
+++ b/version-rules.xml
@@ -19,6 +19,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
   <ignoreVersions>
-    <ignoreVersion type="regex">.*-beta\d*</ignoreVersion>
+    <ignoreVersion type="regex">(?i).*-beta-?\d*</ignoreVersion>
   </ignoreVersions>
 </ruleset>