Compare commits

...

3 Commits

Author SHA1 Message Date
Hammer cf80c16b93 Fix remaining version mismatches in build
Hook battery / PR-target hook battery (push) Successful in 11s
2026-07-16 18:53:34 -04:00
Hammer 7de09e35e1 Snip -SNAPSHOT and its 1.7.3
Hook battery / PR-target hook battery (push) Successful in 10s
2026-07-16 18:51:09 -04:00
Hammer 2f78d57fbd Fix compile errors
Hook battery / PR-target hook battery (push) Has been cancelled
2026-07-11 15:41:28 -04:00
6 changed files with 21 additions and 9 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.threerings</groupId> <groupId>com.threerings</groupId>
<artifactId>nenya-parent</artifactId> <artifactId>nenya-parent</artifactId>
<version>1.7-SNAPSHOT</version> <version>1.7.3</version>
</parent> </parent>
<artifactId>nenyalib</artifactId> <artifactId>nenyalib</artifactId>
+7 -3
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.threerings</groupId> <groupId>com.threerings</groupId>
<artifactId>nenya-parent</artifactId> <artifactId>nenya-parent</artifactId>
<version>1.7.3-SNAPSHOT</version> <version>1.7.3</version>
</parent> </parent>
<artifactId>nenya</artifactId> <artifactId>nenya</artifactId>
@@ -16,14 +16,18 @@
<dependency> <dependency>
<groupId>com.samskivert</groupId> <groupId>com.samskivert</groupId>
<artifactId>samskivert</artifactId> <artifactId>samskivert</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>33.4.0-jre</version> <version>33.4.0-jre</version>
</dependency> </dependency>
<dependency>
<groupId>com.threerings</groupId>
<artifactId>ooo-util</artifactId>
<version>1.6</version>
</dependency>
<!-- optional dependencies --> <!-- optional dependencies -->
<dependency> <dependency>
<groupId>com.threerings</groupId> <groupId>com.threerings</groupId>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.threerings</groupId> <groupId>com.threerings</groupId>
<artifactId>nenya-parent</artifactId> <artifactId>nenya-parent</artifactId>
<version>1.7.3-SNAPSHOT</version> <version>1.7.3</version>
</parent> </parent>
<artifactId>nenya-maven-plugin</artifactId> <artifactId>nenya-maven-plugin</artifactId>
+10 -2
View File
@@ -5,7 +5,7 @@
<groupId>com.threerings</groupId> <groupId>com.threerings</groupId>
<artifactId>nenya-parent</artifactId> <artifactId>nenya-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.7.3-SNAPSHOT</version> <version>1.7.3</version>
<name>Nenya Parent</name> <name>Nenya Parent</name>
<description>Facilities for making Java games.</description> <description>Facilities for making Java games.</description>
@@ -36,10 +36,18 @@
<url>https://github.com/threerings/nenya/</url> <url>https://github.com/threerings/nenya/</url>
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>
<repositories>
<repository>
<id>affliction-public</id>
<name>affliction-public</name>
<url>https://mvn.afflictionid.com/repository/public-repo/</url>
</repository>
</repositories>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<narya.version>1.20-SNAPSHOT</narya.version> <narya.version>1.22</narya.version>
</properties> </properties>
<modules> <modules>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.threerings</groupId> <groupId>com.threerings</groupId>
<artifactId>nenya-parent</artifactId> <artifactId>nenya-parent</artifactId>
<version>1.7.3-SNAPSHOT</version> <version>1.7.3</version>
</parent> </parent>
<artifactId>nenya-tools</artifactId> <artifactId>nenya-tools</artifactId>
@@ -309,7 +309,7 @@ public abstract class ComponentBundler {
info[0] = path.substring(0, slsidx); info[0] = path.substring(0, slsidx);
// we need to turn file separator characters (platform dependent) into jar path separator // we need to turn file separator characters (platform dependent) into jar path separator
// characters (always forward slash) // characters (always forward slash)
info[0].replace(File.separatorChar, '/'); info[0] = info[0].replace(File.separatorChar, '/');
return info; return info;
} }