Skip to content

Commit

Permalink
port bcozy to java 17 and latest bco version. Fix build issues. Updat…
Browse files Browse the repository at this point in the history 
…e deps and make sure win and mac are supported as well.
  • Loading branch information
@DivineThreepwood
DivineThreepwood committed Nov 20, 2023
1 parent 6894e9a commit 3626b81
Show file tree
Hide file tree
Showing 12 changed files with 170 additions and 61 deletions.
17 changes: 17 additions & 0 deletions .idea/aws.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions .idea/compiler.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions .idea/jarRepositories.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/jpa-buddy.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/kotlinc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions .idea/modules.xml
View file

This file was deleted.

146 changes: 119 additions & 27 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.openbase</groupId>
<artifactId>bco.bcozy</artifactId>
<version>2.0-SNAPSHOT</version>
<version>3.1-SNAPSHOT</version>

<name>BCO BCozy</name>
<inceptionYear>2015</inceptionYear>
Expand Down Expand Up @@ -102,27 +102,18 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${java.source.version}</source>
<target>${java.target.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<version>3.1.0</version>
<configuration>
<executable>java</executable>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
<version>2.0.0</version>
<version>2.1.0</version>
<executions>
<execution>
<phase>install</phase>
Expand All @@ -147,7 +138,7 @@
<plugin>
<groupId>com.zenjava</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>8.1.4</version>
<version>8.8.3</version>
<configuration>
<mainClass>org.openbase.bco.bcozy.BCozyLauncher</mainClass>
<needMenu>true</needMenu>
Expand All @@ -156,7 +147,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.0</version>
<configuration>
<archive>
<manifest>
Expand Down Expand Up @@ -185,7 +176,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -198,7 +189,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>${plugin.javadoc.version}</version>
<configuration>
<source>${java.source.version}</source>
</configuration>
Expand All @@ -211,6 +202,69 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<sourceDirs>
<source>src/main/java</source>
<source>target/generated-sources/annotations</source>
</sourceDirs>
</configuration>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
<configuration>
<jvmTarget>1.8</jvmTarget>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<executions>
<execution>
<id>default-compile</id>
<phase>none</phase>
</execution>
<execution>
<id>default-testCompile</id>
<phase>none</phase>
</execution>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<source>${java.source.version}</source>
<target>${java.target.version}</target>
</configuration>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -242,7 +296,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<version>3.0.1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>true</useReleaseProfile>
Expand All @@ -260,7 +314,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -274,7 +328,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand All @@ -293,12 +347,13 @@
<java.target.version>17</java.target.version>
<java.source.version>17</java.source.version>
<plugin.checkstyle.version>2.15</plugin.checkstyle.version>
<plugin.javadoc.version>2.10.3</plugin.javadoc.version>
<logback.version>[1.2,1.3-alpha)</logback.version>
<plugin.javadoc.version>3.5.0</plugin.javadoc.version>
<logback.version>[1.4,1.5-alpha)</logback.version>
<dependency.bco.version>3.1-SNAPSHOT</dependency.bco.version>
<dependency.jul.version>3.2-SNAPSHOT</dependency.jul.version>
<dependency.jul.version>3.3-SNAPSHOT</dependency.jul.version>
<dependency.bco.dal.version>${dependency.bco.version}</dependency.bco.dal.version>
<dependency.bco.authentication.version>${dependency.bco.version}</dependency.bco.authentication.version>
<kotlin.version>1.9.20</kotlin.version>
</properties>

<pluginRepositories>
Expand Down Expand Up @@ -327,15 +382,15 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.6.2</version>
<version>5.10.0</version>
<scope>test</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/org.junit.vintage/junit-vintage-engine -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.6.2</version>
<version>5.10.0</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -383,21 +438,47 @@
<!-- required for scenic view debugging -->
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
<version>11.0.2</version>
<version>17.0.9</version>
<classifier>linux</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>11.0.2</version>
<version>17.0.9</version>
<classifier>linux</classifier>
</dependency>
<dependency>
<!-- required for scenic view debugging -->
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
<version>17.0.9</version>
<classifier>win</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>17.0.9</version>
<classifier>win</classifier>
</dependency>
<dependency>
<!-- required for scenic view debugging -->
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
<version>17.0.9</version>
<classifier>mac</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>17.0.9</version>
<classifier>mac</classifier>
</dependency>

<!-- https://mvnrepository.com/artifact/eu.hansolo/tilesfx -->
<dependency>
<groupId>eu.hansolo</groupId>
<artifactId>tilesfx</artifactId>
<version>11.1</version>
<version>17.1.21</version>
</dependency>

<!-- https://mvnrepository.com/artifact/eu.hansolo/charts -->
Expand All @@ -406,6 +487,17 @@
<artifactId>charts</artifactId>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>

</dependencies>

Expand Down
13 changes: 7 additions & 6 deletions src/main/java/org/openbase/bco/bcozy/controller/ContextMenuController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,14 @@ public ContextMenuController(final ForegroundPane foregroundPane, final Location

final UnitMenu unitMenu = foregroundPane.getUnitMenu();

try {
powerTerminalSidebarPaneAndController = FXMLProcessor.loadFxmlPaneAndControllerPair(PowerTerminalSidebarPaneController.class);
// This part is disabled since the power terminal uses some outdated libs that are no longer supported by java 17
// try {
// powerTerminalSidebarPaneAndController = FXMLProcessor.loadFxmlPaneAndControllerPair(PowerTerminalSidebarPaneController.class);
// ((PowerTerminalSidebarPaneController) powerTerminalSidebarPaneAndController.getValue()).init(unitMenu);
unitMenu.setPowerTerminalSidebarPane(powerTerminalSidebarPaneAndController.getKey());
} catch (final CouldNotPerformException ex) {
ExceptionPrinter.printHistory("Content could not be loaded", ex, LOGGER);
}
// unitMenu.setPowerTerminalSidebarPane(powerTerminalSidebarPaneAndController.getKey());
// } catch (final CouldNotPerformException ex) {
// ExceptionPrinter.printHistory("Content could not be loaded", ex, LOGGER);
// }

BCozy.appModeProperty.addListener((observable, oldValue, newValue) -> {
switch (newValue) {
Expand Down
Loading

0 comments on commit 3626b81

Please sign in to comment.