external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Guavafix' into 'master'

Browse Source 
The guava fix

See merge request core-developers/forge!217
This commit is contained in:
Michael Kamensky
2018-02-18 07:17:15 +00:00
parent b5ae52a3b6 b6395aa463
commit a9e15c2d33
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-core/pom.xml
View File

@@ -16,7 +16,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>16.0.1</version> <version>23.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>

3
forge-game/src/main/java/forge/game/player/PlayerView.java
View File

@@ -3,6 +3,7 @@ package forge.game.player;
import java.util.*; import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.google.common.base.MoreObjects;
import forge.card.CardType; import forge.card.CardType;
import forge.card.mana.ManaAtom; import forge.card.mana.ManaAtom;
import forge.game.card.CounterType; import forge.game.card.CounterType;
@@ -91,7 +92,7 @@ public class PlayerView extends GameEntityView {
} }
public FCollectionView<PlayerView> getOpponents() { public FCollectionView<PlayerView> getOpponents() {
return Objects.firstNonNull(this.<FCollectionView<PlayerView>>get(TrackableProperty.Opponents), new FCollection<PlayerView>()); return MoreObjects.firstNonNull(this.<FCollectionView<PlayerView>>get(TrackableProperty.Opponents), new FCollection<PlayerView>());
} }
void updateOpponents(Player p) { void updateOpponents(Player p) {
set(TrackableProperty.Opponents, PlayerView.getCollection(p.getOpponents())); set(TrackableProperty.Opponents, PlayerView.getCollection(p.getOpponents()));

2
forge-gui-android/pom.xml
View File

@@ -81,7 +81,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>16.0.1</version> <version>23.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>

2
forge-gui-desktop/pom.xml
View File

@@ -190,7 +190,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>16.0.1</version> <version>23.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>

2
forge-gui-mobile/pom.xml
View File

@@ -48,7 +48,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>16.0.1</version> <version>23.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>

2
forge-gui/pom.xml
View File

@@ -39,7 +39,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>16.0.1</version> <version>23.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>