Skip to content

Draft: Attempt to fix build #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jtaub wants to merge 6 commits into
base: main
Choose a base branch
from
+37 −433
Draft

Draft: Attempt to fix build #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80276c1
update to java 17
jtaub Oct 12, 2024
d0300f9
remove dependency on non-existent repo
jtaub Oct 12, 2024
05b753f
fix most build issues
jtaub Oct 12, 2024
60bccdf
remove raster plugin
jtaub Oct 12, 2024
3dc6d23
getting a lot closer now
jtaub Oct 12, 2024
e76266a
can be final
jtaub Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 8 additions & 37 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>16</maven.compiler.source>
<maven.compiler.target>16</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>

<licenses>
Expand Down Expand Up @@ -59,7 +59,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<release>16</release>
<release>${maven.compiler.target}</release>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -89,22 +89,13 @@
</build>
<repositories>
<repository>
<id>javassh-opensource-snapshots</id>
<name>artifactory.javassh.com-snapshots</name>
<url>http://artifactory.javassh.com/opensource-snapshots</url>
<snapshots />
<releases>
<enabled>false</enabled>
</releases>
<id>central</id>
<url>https://repo.maven.apache.org/maven2</url>
</repository>
<!-- This is required to find the com.sshtools artifacts. -->
<repository>
<id>javassh-opensource-releases</id>
<name>artifactory.javassh.com-releases</name>
<url>http://artifactory.javassh.com/opensource-releases</url>
<releases />
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>jadaptive-os-repo</id>
<url>https://artifactory.jadaptive.com/opensource-releases/</url>
</repository>
<repository>
<id>oss-snapshots</id>
Expand All @@ -115,26 +106,6 @@
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>javassh-opensource-snapshots</id>
<name>artifactory.javassh.com-snapshots</name>
<url>http://artifactory.javassh.com/opensource-snapshots</url>
<snapshots />
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
<pluginRepository>
<id>javassh-opensource-releases</id>
<name>artifactory.javassh.com-releases</name>
<url>http://artifactory.javassh.com/opensource-releases</url>
<releases />
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<name>Snake - Parent</name>
<description>The parent module for all Snake modules.</description>
</project>
4 changes: 2 additions & 2 deletions snake-app-linux/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>9</source>
<target>9</target>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand Down
14 changes: 8 additions & 6 deletions snake-backend-openrazer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@
<artifactId>snake</artifactId>
</parent>
<dependencies>
<!-- https://mvnrepository.com/artifact/com.github.hypfvieh/dbus-java -->
<dependency>
<groupId>com.github.hypfvieh</groupId>
<artifactId>dbus-java</artifactId>
<version>4.0.0-SNAPSHOT</version>
<version>3.3.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.github.hypfvieh/dbus-java-transport-native-unixsocket -->
<dependency>
<groupId>com.github.hypfvieh</groupId>
<artifactId>dbus-java-transport-native-unixsocket</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>com.github.hypfvieh</groupId>
<artifactId>dbus-java-transport-native-unixsocket</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
Expand Down
193 changes: 0 additions & 193 deletions snake-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,199 +51,6 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.sshtools</groupId>
<artifactId>forker-updater-maven-plugin</artifactId>
<version>1.7-SNAPSHOT</version>
<executions>
<execution>
<id>updater</id>
<phase>package</phase>
<goals>
<goal>updates</goal>
</goals>
<configuration>
<version>${project.version}-${buildNumber}</version>
<repositoryDirectory>${project.build.directory}/repository</repositoryDirectory>
<launcherScriptName>snake</launcherScriptName>
<remoteBase>${snakeRemote}</remoteBase>
<mainClass>uk.co.bithatch.snake.app.linux/uk.co.bithatch.snake.app.linux.App</mainClass>
<remotesFromOriginalSource>false</remotesFromOriginalSource>
<splash>${basedir}/src/main/images/splash.png</splash>
<image>true</image>
<vmArgs>
<vmArg>-Xmx64m</vmArg>
</vmArgs>
<id>snake</id>
<forkerArgs>
<forkerArg>jvmarg -Dforker.releaseChannel=${snakeRemoteStable}</forkerArg>
<forkerArg>jvmarg -Dforker.betaChannel=${snakeRemoteSnapshot}</forkerArg>
<forkerArg>jvmarg -Djava.system.class.loader=uk.co.bithatch.snake.ui.DynamicClassLoader</forkerArg>
<forkerArg>restart-on 90</forkerArg>
<forkerArg>single-instance-per-user</forkerArg>
<forkerArg>run-on-install</forkerArg>
<forkerArg>install-location ${installer.home}/snake-razer</forkerArg>
<forkerArg>jvmarg --add-modules</forkerArg>
<forkerArg>jvmarg themes.awhitelight,themes.agreenfuture,themes.aredsky,themes.abluelife,themes.ayellowdwarf,themes.anorangetwist,themes.apinkburst,themes.apurplehaze</forkerArg>
<forkerArg>jvmarg -Djfreedesktop.quiet=true</forkerArg>
</forkerArgs>
<bootstrapFiles>
<bootstrapFile>
<source>${basedir}/../README.md</source>
<target>docs</target>
</bootstrapFile>
<bootstrapFile>
<source>${basedir}/target/CHANGES.md</source>
<target>docs</target>
</bootstrapFile>
</bootstrapFiles>
<sharedArtifacts>
<sharedArtifact>javafx-base</sharedArtifact>
<sharedArtifact>javafx-base-linux</sharedArtifact>
<sharedArtifact>javafx-controls</sharedArtifact>
<sharedArtifact>javafx-controls-linux</sharedArtifact>
<sharedArtifact>javafx-fxml</sharedArtifact>
<sharedArtifact>javafx-fxml-linux</sharedArtifact>
<sharedArtifact>javafx-graphics</sharedArtifact>
<sharedArtifact>javafx-graphics-linux</sharedArtifact>
<sharedArtifact>FX-BorderlessScene</sharedArtifact>
<sharedArtifact>ikonli-core</sharedArtifact>
<sharedArtifact>ikonli-javafx</sharedArtifact>
<sharedArtifact>ikonli-fontawesome-pack</sharedArtifact>
</sharedArtifacts>
<bootstrapArtifacts>
<bootstrapArtifact>snake-updater</bootstrapArtifact>
</bootstrapArtifacts>
<automaticArtifacts>
<automaticArtifact>svgSalamander</automaticArtifact>
<automaticArtifact>kotlin-stdlib</automaticArtifact>
<automaticArtifact>kotlin-stdlib-common</automaticArtifact>
<automaticArtifact>annotations</automaticArtifact>
<automaticArtifact>kotlinx-coroutines-core-jvm</automaticArtifact>
<automaticArtifact>kotlin-logging-jvm</automaticArtifact>
</automaticArtifacts>
<systemModules>
<systemModule>java.prefs</systemModule>
<systemModule>java.xml</systemModule>
<systemModule>jdk.unsupported</systemModule>
<systemModule>jdk.crypto.ec</systemModule>
<systemModule>jdk.zipfs</systemModule>

<systemModule>java.instrument</systemModule>
<systemModule>jdk.xml.dom</systemModule>
<systemModule>java.scripting</systemModule>
<systemModule>jdk.jsobject</systemModule>
<systemModule>java.net.http</systemModule>
<systemModule>jdk.net</systemModule>
<systemModule>jdk.security.auth</systemModule>
<systemModule>jdk.management.agent</systemModule>
<systemModule>java.management</systemModule>

<!-- TODO separate this in forker? -->
<systemModule>java.desktop</systemModule>

<!-- TODO Because of Gson, consider finding a library that doesnt
link to SQL -->
<systemModule>java.sql</systemModule>
</systemModules>
</configuration>
</execution>

<execution>
<id>updater-noruntime</id>
<phase>package</phase>
<goals>
<goal>updates</goal>
</goals>
<configuration>
<version>${project.version}-${buildNumber}</version>
<repositoryDirectory>${project.build.directory}/repository-noruntime</repositoryDirectory>
<launcherScriptName>snake</launcherScriptName>
<remoteBase>${snakeRemoteNoRuntime}</remoteBase>
<mainClass>uk.co.bithatch.snake.app.linux/uk.co.bithatch.snake.app.linux.App</mainClass>
<remotesFromOriginalSource>false</remotesFromOriginalSource>
<imageDirectory>${project.build.directory}/image-noruntime</imageDirectory>
<splash>${basedir}/src/main/images/splash.png</splash>
<image>true</image>
<link>false</link>
<vmArgs>
<vmArg>-Xmx64m</vmArg>
</vmArgs>
<id>snake</id>
<forkerArgs>
<forkerArg>jvmarg -Dforker.releaseChannel=${snakeRemoteNoRuntimeStable}</forkerArg>
<forkerArg>jvmarg -Dforker.betaChannel=${snakeRemoteNoRuntimeSnapshot}</forkerArg>
<forkerArg>jvmarg -Djava.system.class.loader=uk.co.bithatch.snake.ui.DynamicClassLoader</forkerArg>
<forkerArg>restart-on 90</forkerArg>
<forkerArg>run-on-install</forkerArg>
<forkerArg>single-instance-per-user</forkerArg>
<forkerArg>install-location ${installer.home}/snake-razer</forkerArg>
<forkerArg>jvmarg --add-modules</forkerArg>
<forkerArg>jvmarg themes.awhitelight,themes.agreenfuture,themes.aredsky,themes.abluelife,themes.ayellowdwarf,themes.anorangetwist,themes.apinkburst,themes.apurplehaze</forkerArg>
<forkerArg>jvmarg -Djfreedesktop.quiet=true</forkerArg>
</forkerArgs>
<bootstrapFiles>
<bootstrapFile>
<source>${basedir}/../README.md</source>
<target>docs</target>
</bootstrapFile>
<bootstrapFile>
<source>${basedir}/target/CHANGES.md</source>
<target>docs</target>
</bootstrapFile>
</bootstrapFiles>
<sharedArtifacts>
<sharedArtifact>javafx-base</sharedArtifact>
<sharedArtifact>javafx-base-linux</sharedArtifact>
<sharedArtifact>javafx-controls</sharedArtifact>
<sharedArtifact>javafx-controls-linux</sharedArtifact>
<sharedArtifact>javafx-fxml</sharedArtifact>
<sharedArtifact>javafx-fxml-linux</sharedArtifact>
<sharedArtifact>javafx-graphics</sharedArtifact>
<sharedArtifact>javafx-graphics-linux</sharedArtifact>
<sharedArtifact>FX-BorderlessScene</sharedArtifact>
<sharedArtifact>ikonli-core</sharedArtifact>
<sharedArtifact>ikonli-javafx</sharedArtifact>
<sharedArtifact>ikonli-fontawesome-pack</sharedArtifact>
</sharedArtifacts>
<bootstrapArtifacts>
<bootstrapArtifact>snake-updater</bootstrapArtifact>
</bootstrapArtifacts>
<automaticArtifacts>
<automaticArtifact>svgSalamander</automaticArtifact>
<automaticArtifact>kotlin-stdlib</automaticArtifact>
<automaticArtifact>kotlin-stdlib-common</automaticArtifact>
<automaticArtifact>annotations</automaticArtifact>
<automaticArtifact>kotlinx-coroutines-core-jvm</automaticArtifact>
<automaticArtifact>kotlin-logging-jvm</automaticArtifact>
</automaticArtifacts>
<systemModules>
<systemModule>java.prefs</systemModule>
<systemModule>java.xml</systemModule>
<systemModule>jdk.unsupported</systemModule>
<systemModule>jdk.crypto.ec</systemModule>

<systemModule>java.instrument</systemModule>
<systemModule>java.management</systemModule>
<systemModule>jdk.xml.dom</systemModule>
<systemModule>jdk.jsobject</systemModule>
<systemModule>java.net.http</systemModule>
<systemModule>jdk.net</systemModule>
<systemModule>java.scripting</systemModule>
<systemModule>jdk.management.agent</systemModule>
<systemModule>jdk.security.auth</systemModule>

<!-- TODO separate this in forker? -->
<systemModule>java.desktop</systemModule>

<!-- TODO Because of Gson, consider finding a library that doesnt
link to SQL -->
<systemModule>java.sql</systemModule>
</systemModules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.hazendaz.maven</groupId>
<artifactId>makeself-maven-plugin</artifactId>
Expand Down
9 changes: 1 addition & 8 deletions snake-themes/snake-theme-abluelife/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@
<properties>
<themeName>abluelife</themeName>
</properties>
<build>
<plugins>
<plugin>
<groupId>uk.co.bithatch</groupId>
<artifactId>svg-rasterizer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
9 changes: 1 addition & 8 deletions snake-themes/snake-theme-agreenfuture/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@
<properties>
<themeName>agreenfuture</themeName>
</properties>
<build>
<plugins>
<plugin>
<groupId>uk.co.bithatch</groupId>
<artifactId>svg-rasterizer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
9 changes: 1 addition & 8 deletions snake-themes/snake-theme-anorangetwist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@
<properties>
<themeName>anorangetwist</themeName>
</properties>
<build>
<plugins>
<plugin>
<groupId>uk.co.bithatch</groupId>
<artifactId>svg-rasterizer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
9 changes: 1 addition & 8 deletions snake-themes/snake-theme-apinkburst/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@
<properties>
<themeName>apinkburst</themeName>
</properties>
<build>
<plugins>
<plugin>
<groupId>uk.co.bithatch</groupId>
<artifactId>svg-rasterizer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
9 changes: 1 addition & 8 deletions snake-themes/snake-theme-apurplehaze/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@
<properties>
<themeName>apurplehaze</themeName>
</properties>
<build>
<plugins>
<plugin>
<groupId>uk.co.bithatch</groupId>
<artifactId>svg-rasterizer-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
Loading