Skip to content

Commit

Permalink
Upgrade Java and Netbeans versions. (#2336)
Browse files Browse the repository at this point in the history
Retired the DowelModule as it can no longer be compiled with later Java versions.
  • Loading branch information
breiler committed Oct 9, 2023
1 parent 5d596ff commit 48ebeee
Show file tree
Hide file tree
Showing 20 changed files with 534 additions and 868 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/nightly.yaml
Expand Up @@ -11,10 +11,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'

- name: Cache the Maven packages to speed up build
Expand All @@ -31,19 +31,15 @@ jobs:
run: |
sudo apt-get install -qq genisoimage
mvn package -pl ugs-classic assembly:assembly -DskipTests=true
mvn package -pl ugs-platform/application -P create-macosx-package -DskipTests=true
mvn package -pl ugs-platform/application -P create-win32-package -DskipTests=true
mvn package -pl ugs-platform/application -P create-win64-package -DskipTests=true
mvn package -pl ugs-platform/application -P create-linux-package -DskipTests=true
mvn package -pl ugs-platform/application -P create-pi-package -DskipTests=true
mvn package -pl ugs-platform/application -P create-macosx-x64-package,create-macosx-aarch64-package,create-win32-package,create-win64-package,create-linux-x64-package,create-linux-arm-package,create-linux-aarch64-package -DskipTests=true
# https://github.com/marketplace/actions/upload-to-github-release
- name: Upload binaries to snapshot release
uses: xresloader/upload-to-github-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
file: "ugs-classic/target/UniversalGcodeSender.zip;ugs-platform/application/target/ios-ugs-platform-app-*.dmg;ugs-platform/application/target/linux-ugs-platform-app*.tar.gz;ugs-platform/application/target/pi-ugs-platform-app*.tar.gz;ugs-platform/application/target/win-ugs-platform-app-*.zip;ugs-platform/application/target/win64-ugs-platform-app-*.zip;ugs-platform/application/target/ugs-platform-app-*.zip"
file: "ugs-classic/target/UniversalGcodeSender.zip;ugs-platform/application/target/macosx-*-ugs-platform-app-*.dmg;ugs-platform/application/target/linux-*-ugs-platform-app*.tar.gz;ugs-platform/application/target/win-ugs-platform-app-*.zip;ugs-platform/application/target/win64-ugs-platform-app-*.zip;ugs-platform/application/target/ugs-platform-app-*.zip"
prerelease: true
tag_name: "nightly"
overwrite: true
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Expand Up @@ -8,10 +8,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'

- name: Cache the Maven packages to speed up build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Expand Up @@ -11,10 +11,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'

- name: Cache the Maven packages to speed up build
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
file: "ugs-classic/target/UniversalGcodeSender.zip;ugs-platform/application/target/ios-ugs-platform-app-*.dmg;ugs-platform/application/target/linux-ugs-platform-app*.tar.gz;ugs-platform/application/target/pi-ugs-platform-app*.tar.gz;ugs-platform/application/target/win-ugs-platform-app-*.zip;ugs-platform/application/target/win64-ugs-platform-app-*.zip;ugs-platform/application/target/ugs-platform-app-*.zip"
file: "ugs-classic/target/UniversalGcodeSender.zip;ugs-platform/application/target/macosx-*-ugs-platform-app-*.dmg;ugs-platform/application/target/linux-*-ugs-platform-app*.tar.gz;ugs-platform/application/target/win-ugs-platform-app-*.zip;ugs-platform/application/target/win64-ugs-platform-app-*.zip;ugs-platform/application/target/ugs-platform-app-*.zip"
prerelease: true
tag_name: ${GITHUB_REF_NAME}
overwrite: true
4 changes: 2 additions & 2 deletions .idea/runConfigurations/UGS_Platform.xml

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

37 changes: 35 additions & 2 deletions README.md
Expand Up @@ -95,7 +95,7 @@ UGS Classic with visualizer
<details><summary>Show details on how to compile the software</summary>
<p>

For development we use [Maven](http://maven.apache.org) and [Java](https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/tag/jdk-13.0.1%2B9) for compiling. We rely on a specific version of Java 13.0.1-9 is needed due to compatibility issues with a library we depend on.
For development we use [Maven](http://maven.apache.org) and [Java 17](https://adoptium.net/) for compiling.

#### Compiling and starting the application

Expand Down Expand Up @@ -141,7 +141,40 @@ If you are more used to IntelliJ, you can also build, run and debug it there.
- Import the Source, `File` -> `New` -> `Project from existing Sources`
- Setup a new "Run Configuration", `Java Application`, with following settings:
- Main Class: `org.netbeans.Main`
- VM Options: `-Dnetbeans.user=$ProjectFileDir$/ugs-platform/application/target/userdir -Dnetbeans.home=$ProjectFileDir$/ugs-platform/application/target/ugsplatform/platform -Dnetbeans.logger.console=true -Dnetbeans.indexing.noFileRefresh=true -Dnetbeans.dirs="$ProjectFileDir$/ugs-platform/application/target/ugsplatform/ugsplatform:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/platform:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/ide:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/extra:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/java"`
- VM Options:
```
-Dpolyglot.engine.WarnInterpreterOnly=false
-Dnetbeans.user=$ProjectFileDir$/ugs-platform/application/target/userdir
-Dnetbeans.home=$ProjectFileDir$/ugs-platform/application/target/ugsplatform/platform
-Dnetbeans.logger.console=true
-Dnetbeans.indexing.noFileRefresh=true
-Dnetbeans.moduleitem.dontverifyclassloader=true
-Dnetbeans.dirs=$ProjectFileDir$/ugs-platform/application/target/ugsplatform/ugsplatform:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/platform:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/ide:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/extra:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/java
--add-opens=java.base/java.net=ALL-UNNAMED
--add-opens=java.base/java.lang.ref=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.security=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.nio=ALL-UNNAMED
--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED
--add-opens=java.prefs/java.util.prefs=ALL-UNNAMED
--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED
--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED
--add-opens=java.desktop/javax.swing=ALL-UNNAMED
--add-opens=java.desktop/java.awt=ALL-UNNAMED
--add-opens=java.desktop/java.awt.event=ALL-UNNAMED
--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED
--add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED
--add-opens=java.desktop/com.sun.java.swing.plaf.gtk=ALL-UNNAMED
--add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED
--add-opens=java.desktop/sun.awt.im=ALL-UNNAMED
--add-exports=java.desktop/sun.awt=ALL-UNNAMED
--add-exports=java.desktop/java.awt.peer=ALL-UNNAMED
--add-exports=java.desktop/com.sun.beans.editors=ALL-UNNAMED
--add-exports=java.desktop/sun.swing=ALL-UNNAMED
--add-exports=java.desktop/sun.awt.im=ALL-UNNAMED
--add-exports=java.desktop/com.sun.java.swing.plaf.motif=ALL-UNNAMED
```
- Program arguments: `--branding ugsplatform`
- Working dir: `$ProjectFileDir$`
- Use classpath of module: `ugs-platform-app`
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -89,7 +89,7 @@
<timestamp>${maven.build.timestamp}</timestamp>

<ugs.maven-compiler-plugin.version>3.6.1</ugs.maven-compiler-plugin.version>
<ugs.jvm.version>1.8</ugs.jvm.version>
<ugs.jvm.version>17</ugs.jvm.version>
<ugs.kotlin.version>1.3.61</ugs.kotlin.version>

<!-- cloud storage plugin -->
Expand Down
12 changes: 12 additions & 0 deletions ugs-core/pom.xml
Expand Up @@ -112,6 +112,18 @@
<artifactId>core</artifactId>
<version>${zxing.version}</version>
</dependency>

<!-- For scripting -->
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
<version>23.0.1</version>
</dependency>
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js-scriptengine</artifactId>
<version>23.1.0</version>
</dependency>
</dependencies>

<build>
Expand Down
Expand Up @@ -85,7 +85,7 @@ public void appendResponseWithErrorCodes() throws InterruptedException {
command.appendResponse("ok");

// Wait for the listener to complete
Thread.sleep(100);
Thread.sleep(200);

assertTrue(command.isOk());
assertEquals(1, eventsCounter.get());
Expand Down
91 changes: 0 additions & 91 deletions ugs-platform/DowelModule/pom.xml

This file was deleted.

This file was deleted.

0 comments on commit 48ebeee

Please sign in to comment.