From 275e1be6be66dd3661fa687ca21803635817ed55 Mon Sep 17 00:00:00 2001
From: Michael Kamensky <stavdev@mail.ru>
Date: Sun, 18 Feb 2018 18:54:20 +0000
Subject: [PATCH] Revert "Merge branch 'Guavafix' into 'master'"

This reverts merge request !217
---
 forge-core/pom.xml                                         | 2 +-
 forge-game/src/main/java/forge/game/player/PlayerView.java | 3 +--
 forge-gui-android/pom.xml                                  | 2 +-
 forge-gui-desktop/pom.xml                                  | 2 +-
 forge-gui-mobile/pom.xml                                   | 2 +-
 forge-gui/pom.xml                                          | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/forge-core/pom.xml b/forge-core/pom.xml
index 28e542a3d7f..2ab7ea37121 100644
--- a/forge-core/pom.xml
+++ b/forge-core/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>23.0</version>
+            <version>16.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/forge-game/src/main/java/forge/game/player/PlayerView.java b/forge-game/src/main/java/forge/game/player/PlayerView.java
index b4d9351deb4..f8dffa5482b 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerView.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerView.java
@@ -3,7 +3,6 @@ package forge.game.player;
 import java.util.*;
 import java.util.Map.Entry;
 
-import com.google.common.base.MoreObjects;
 import forge.card.CardType;
 import forge.card.mana.ManaAtom;
 import forge.game.card.CounterType;
@@ -92,7 +91,7 @@ public class PlayerView extends GameEntityView {
     }
 
     public FCollectionView<PlayerView> getOpponents() {
-        return MoreObjects.firstNonNull(this.<FCollectionView<PlayerView>>get(TrackableProperty.Opponents), new FCollection<PlayerView>());
+        return Objects.firstNonNull(this.<FCollectionView<PlayerView>>get(TrackableProperty.Opponents), new FCollection<PlayerView>());
     }
     void updateOpponents(Player p) {
         set(TrackableProperty.Opponents, PlayerView.getCollection(p.getOpponents()));
diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index 4c3c26dc89c..68285925405 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>23.0</version>
+            <version>16.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
index 5a012cfbf95..6bbf0a9f388 100644
--- a/forge-gui-desktop/pom.xml
+++ b/forge-gui-desktop/pom.xml
@@ -190,7 +190,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-            <version>23.0</version>
+			<version>16.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml
index a1aa62d3030..ca67267b34a 100644
--- a/forge-gui-mobile/pom.xml
+++ b/forge-gui-mobile/pom.xml
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-            <version>23.0</version>
+			<version>16.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml
index 76309b63deb..631365299ba 100644
--- a/forge-gui/pom.xml
+++ b/forge-gui/pom.xml
@@ -39,7 +39,7 @@
 	    <dependency>
 	        <groupId>com.google.guava</groupId>
 	        <artifactId>guava</artifactId>
-            <version>23.0</version>
+	        <version>16.0.1</version>
 	    </dependency>
 	    <dependency>
 	        <groupId>com.thoughtworks.xstream</groupId>