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

Fix duplicate dependencies

Browse Source 
-xstream greater than 1.4.9 needs higher android.jar (would remove support for devices lower than Android 8 unless we use the java 7 variant), latest guava and maybe other higher libs needs desugaring for android to work.
This commit is contained in:
Anthony Calosa
2021-03-24 10:22:43 +08:00
parent 9ca66c213d
commit c3dd154ef5
6 changed files with 1 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,21 +78,6 @@
<artifactId>forge-gui-mobile</artifactId> <artifactId>forge-gui-mobile</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.1-android</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.9</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
</dependency>
<dependency> <dependency>
<groupId>xmlpull</groupId> <groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId> <artifactId>xmlpull</artifactId>

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

@@ -139,16 +139,6 @@
<artifactId>java-image-scaling</artifactId> <artifactId>java-image-scaling</artifactId>
<version>0.8.5</version> <version>0.8.5</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.1-android</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.11.1</version>
</dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
@@ -167,26 +157,6 @@
<version>1.5.4</version> <version>1.5.4</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.11.2</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.11.2</version>
</dependency>
<dependency>
<groupId>com.googlecode</groupId>
<artifactId>minlog</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
</dependency>
<dependency> <dependency>
<groupId>org.freemarker</groupId> <groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId> <artifactId>freemarker</artifactId>

5
forge-gui-ios/pom.xml
View File

@@ -65,11 +65,6 @@
<artifactId>forge-gui-mobile</artifactId> <artifactId>forge-gui-mobile</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.googlecode</groupId>
<artifactId>minlog</artifactId>
<version>1.2</version>
</dependency>
<dependency> <dependency>
<groupId>com.badlogicgames.gdx</groupId> <groupId>com.badlogicgames.gdx</groupId>
<artifactId>gdx-backend-robovm</artifactId> <artifactId>gdx-backend-robovm</artifactId>

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

@@ -45,21 +45,6 @@
<artifactId>forge-gui</artifactId> <artifactId>forge-gui</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.1-android</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.9</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
</dependency>
<dependency> <dependency>
<groupId>com.badlogicgames.gdx</groupId> <groupId>com.badlogicgames.gdx</groupId>
<artifactId>gdx</artifactId> <artifactId>gdx</artifactId>

12
forge-gui/pom.xml
View File

@@ -36,20 +36,10 @@
<artifactId>forge-ai</artifactId> <artifactId>forge-ai</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.1-android</version>
</dependency>
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId> <artifactId>xstream</artifactId>
<version>1.4.11.1</version> <version>1.4.9</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>

6
pom.xml
View File

@@ -293,12 +293,6 @@
<artifactId>wagon-ftp</artifactId> <artifactId>wagon-ftp</artifactId>
<version>2.6</version> <version>2.6</version>
</dependency> </dependency>
<dependency>
<groupId>com.sipgate</groupId>
<artifactId>mp3-wav</artifactId>
<version>1.0.3</version>
</dependency>
</dependencies> </dependencies>
</plugin> </plugin>