Skip to content

Commit

Permalink
Update libGDX dep to 1.9.11, anim8 dep to 0.1.6, tweak build files
Browse files Browse the repository at this point in the history
If this builds OK in JitPack, I'll probably clean up the README and release 3.0.0
  • Loading branch information
tommyettinger committed Jul 21, 2020
1 parent de7cb0b commit 4871996
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 17 deletions.
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@
<maven.compiler.version>3.8.1</maven.compiler.version>
<maven.javadoc.version>3.2.0</maven.javadoc.version>
<maven.resources.version>3.1.0</maven.resources.version>
<maven.source.version>3.2.1</maven.source.version>
<maven.source.version>3.2.0</maven.source.version>
<maven.gpg.version>1.6</maven.gpg.version>
<maven.pmd.version>3.9.0</maven.pmd.version>
<findbugs.version>3.0.2</findbugs.version>
<cobertura.version>2.7</cobertura.version>
<jdk.version>1.7</jdk.version>
<!-- As in build.gradle-->
<gdx.version>1.9.10</gdx.version>
<gdx.version>1.9.11</gdx.version>
<junit.version>4.12</junit.version>
<regexodus.version>0.1.10</regexodus.version>
<anim8.version>0.1.5</anim8.version>
<anim8.version>0.1.6</anim8.version>
</properties>

<issueManagement>
Expand Down Expand Up @@ -214,10 +214,10 @@
<windowtitle>${project.name} ${project.version}</windowtitle>
<splitindex>true</splitindex>
<encoding>${project.build.sourceEncoding}</encoding>
<javadocVersion>${jdk.version}</javadocVersion>
<javadocVersion>14</javadocVersion>
<links>
<!--<link>http://docs.oracle.com/javase/8/docs/api/</link>-->
<link>https://docs.oracle.com/en/java/javase/13/docs/api/</link>
<link>https://docs.oracle.com/en/java/javase/14/docs/api/</link>
<link>https://squidpony.github.io/SquidLib/squidlib-util/apidocs/</link>
<link>https://squidpony.github.io/SquidLib/squidlib/apidocs/</link>
<link>https://squidpony.github.io/SquidLib/squidlib-extra/apidocs/</link>
Expand All @@ -227,7 +227,7 @@
<detectJavaApiLink>false</detectJavaApiLink>
<detectOfflineLinks>false</detectOfflineLinks>
<excludePackageNames>emu.squidpony;emu.squidpony.squidmath</excludePackageNames>
<!-- <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>-->
<javadocExecutable>${env.JAVA_HOME}/bin/javadoc</javadocExecutable>
</configuration>
</plugin>
</plugins>
Expand Down
5 changes: 3 additions & 2 deletions squidlib-extra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>squidlib-parent</artifactId>
<groupId>com.squidpony</groupId>
<artifactId>squidlib-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -50,4 +51,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>
14 changes: 7 additions & 7 deletions squidlib-performance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ THE POSSIBILITY OF SUCH DAMAGE.

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.version>3.8.0</maven.compiler.version>
<maven.javadoc.version>3.0.1</maven.javadoc.version>
<maven.compiler.version>3.8.1</maven.compiler.version>
<maven.javadoc.version>3.2.0</maven.javadoc.version>
<maven.resources.version>3.1.0</maven.resources.version>
<maven.source.version>3.0.1</maven.source.version>
<maven.source.version>3.2.0</maven.source.version>
<jmh.version>1.23</jmh.version>
<jdk.version>1.7</jdk.version>
<!--<javac.target>11</javac.target>-->
Expand Down Expand Up @@ -201,19 +201,19 @@ THE POSSIBILITY OF SUCH DAMAGE.
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<version>3.0.0-M1</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<version>3.0.0-M1</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.0</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
Expand All @@ -225,7 +225,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.0</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion squidlib-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.squidpony</groupId>
<artifactId>squidlib-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>squidlib-util</artifactId>
<name>squidlib-util</name>
Expand Down
2 changes: 1 addition & 1 deletion squidlib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.squidpony</groupId>
<artifactId>squidlib-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>squidlib</artifactId>
<name>squidlib</name>
Expand Down

0 comments on commit 4871996

Please sign in to comment.