Remove GraalVM build (#74)

trinity-xai · Sep 21, 2024 · 338307f · 338307f
1 parent 1822186
commit 338307f
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 2,686 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -209,91 +209,3 @@ jobs:
             exit 1
           fi
           gh release upload "${{ github.ref_name }}" "$RELEASE_NAME-jpackage.zip"
-
-  build-native:
-
-    name: native / ${{ matrix.os }} / ${{ matrix.jdk-version }}
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        jdk-version: [ 21 ]
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-14 # ARM64 OSX
-          # - macos-13 # Intel OSX (TODO Not Supported)
-
-
-    steps:
-
-      - uses: actions/checkout@v4
-
-      # https://github.com/gluonhq/substrate
-      - name: Linux Only - Install Additional Dependencies needed by substrate
-        if: runner.os == 'Linux'
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          sudo apt-get update
-          sudo apt-get install --yes --no-install-recommends libasound2-dev libavcodec-dev libavformat-dev libavutil-dev libfreetype6-dev
-          sudo apt-get install --yes --no-install-recommends libgl-dev libglib2.0-dev libgtk-3-dev libpango1.0-dev libx11-dev libxtst-dev zlib1g-dev
-
-      # Setup CL, msbuild, etc.
-      - name: Windows Only - Enable Windows Developer Command Prompt
-        uses: ilammy/msvc-dev-cmd@v1.13.0
-        if: runner.os == 'Windows'
-        with:
-          arch: x64
-
-      - name: Set Up JDK ${{ matrix.jdk-version }}
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{ matrix.jdk-version }}
-          distribution: 'temurin'
-
-      - name: Set Up GraalVM ${{ matrix.jdk-version }}
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: ${{ matrix.jdk-version }}
-          distribution: 'graalvm'
-          #components: 'native-image' # default
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          native-image-job-reports: 'true'
-
-      - name: Gradle Build Native
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          add-job-summary: 'on-failure'
-          arguments: clean nativeBuild --stacktrace -Penv=prod-graal
-
-      - name: Upload Native
-        uses: actions/upload-artifact@v4
-        continue-on-error: true
-        with:
-          name: java-${{ matrix.jdk-version }}-${{ runner.os }}-${{ runner.arch }}-native
-          path: build/gluonfx/**/trinity*
-          retention-days: 10
-          if-no-files-found: error
-
-      - name: Release Native
-        if: github.event_name == 'release'
-        env:
-          GH_TOKEN: ${{ github.token }}
-          GH_REPO: ${{ github.repository }}
-          RELEASE_NAME: trinity-${{ runner.os }}-${{ runner.arch }}-java-${{ matrix.jdk-version }}
-        shell: bash
-        run: |
-          if [[ "$RUNNER_OS" == "macOS" ]]; then
-            mv build/gluonfx/**/trinity* "Trinity.app"
-            zip "$RELEASE_NAME-native.zip" "Trinity.app"
-          elif [[ "$RUNNER_OS" == "Windows" ]]; then
-            mv build/gluonfx/**/trinity*.exe "Trinity.exe"
-            7z a "$RELEASE_NAME-native.zip" "Trinity.exe"
-          elif [[ "$RUNNER_OS" == "Linux" ]]; then
-            mv build/gluonfx/**/trinity* "Trinity.elf"
-            zip "$RELEASE_NAME-native.zip" "Trinity.elf"
-          else
-            exit 1
-          fi
-          gh release upload "${{ github.ref_name }}" "$RELEASE_NAME-native.zip"
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -67,73 +67,3 @@ jobs:
           path: target/*-assembly.jar
           retention-days: 10
           if-no-files-found: error
-
-  build-graal:
-
-    name: graal / ${{ matrix.os }} / ${{ matrix.jdk-version }}
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        jdk-version: [ 21 ]
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-14 # ARM64 OSX
-          #- macos-13 # Intel OSX (TODO Not Supported)
-
-    steps:
-
-      - uses: actions/checkout@v4
-
-      # https://github.com/gluonhq/substrate
-      - name: Linux Only - Install Additional Dependencies needed by substrate
-        if: runner.os == 'Linux'
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          sudo apt-get update
-          sudo apt-get install --yes --no-install-recommends libasound2-dev libavcodec-dev libavformat-dev libavutil-dev libfreetype6-dev
-          sudo apt-get install --yes --no-install-recommends libgl-dev libglib2.0-dev libgtk-3-dev libpango1.0-dev libx11-dev libxtst-dev zlib1g-dev
-
-      # Setup CL, msbuild, etc.
-      - name: Windows Only - Enable Windows Developer Command Prompt
-        uses: ilammy/msvc-dev-cmd@v1.13.0
-        if: runner.os == 'Windows'
-        with:
-          arch: x64
-
-      - name: Set Up JDK ${{ matrix.jdk-version }}
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{ matrix.jdk-version }}
-          distribution: 'temurin'
-
-      - name: Set Up GraalVM ${{ matrix.jdk-version }}
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: ${{ matrix.jdk-version }}
-          distribution: 'graalvm'
-          #components: 'native-image' # default
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          native-image-job-reports: 'true'
-
-      - name: Cache Maven repository
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-${{ runner.arch }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-maven-
-
-      - name: Maven Build Graal VM
-        run: ./mvnw -V -B -e -ff -ntp clean gluonfx:compile gluonfx:link
-
-      - name: Upload Native
-        uses: actions/upload-artifact@v4
-        continue-on-error: true
-        with:
-          name: java-${{ matrix.jdk-version }}-${{ runner.os }}-${{ runner.arch }}-graal
-          path: target/gluonfx/**/trinity*
-          retention-days: 10
-          if-no-files-found: error
diff --git a/.idea/runConfigurations/trinity__clean_gluonfx_compile____.xml b/.idea/runConfigurations/trinity__clean_gluonfx_compile____.xml
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,6 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.51.0'
     id 'net.nemerosa.versioning' version '3.1.0'
     id 'org.openjfx.javafxplugin' version '0.1.0'
-    id 'com.gluonhq.gluonfx-gradle-plugin' version '1.0.23'
     id 'org.gradlex.extra-java-module-info' version '1.8'
     id 'org.beryx.jlink' version '3.0.1'
 }
@@ -19,11 +18,7 @@ ext {
     mainClassJarLauncher = 'edu.jhuapl.trinity.TrinityMain'
     isProdJar = findProperty('env') == 'prod-jar'
     isProdJlink = findProperty('env') == 'prod-jlink'
-    isProdGraal = findProperty('env') == 'prod-graal'
     isDevelopment = findProperty('env') == 'dev'
-    // Only used for packaging on Intel hardware...
-    isAppleSiliconBuild = providers.environmentVariable('APPLE_SILICON').isPresent()
-    appleSiliconJavaHome = providers.environmentVariable('APPLE_SILICON_JAVA_HOME').getOrElse("")
     fxVersion = findProperty('javafx.version')
     fxStaticVersion = findProperty('javafx.static.version')
 }
@@ -152,7 +147,7 @@ idea {
 }
 
 tasks.named('wrapper', Wrapper) {
-    gradleVersion = '8.9'
+    gradleVersion = '8.10.1'
     distributionType = Wrapper.DistributionType.BIN
 }
 
@@ -182,6 +177,8 @@ compileJava {
     }
 }
 
+// List of Prism Settings
+// https://github.com/openjdk/jfx/blob/master/modules/javafx.graphics/src/main/java/com/sun/prism/impl/PrismSettings.java
 run {
     jvmArgs += ['-Dprism.maxvram=2G', '-Djavafx.animation.fullspeed=true']
 }
@@ -206,15 +203,6 @@ tasks.register('debug', JavaExec) {
 javafx {
     version = "$fxVersion"
     modules = ['javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.media']
-    // For custom packaging on Intel Hardware
-    if (project.isAppleSiliconBuild) {
-        platform = 'osx-aarch64'
-    }
-}
-
-gluonfx {
-    target = "host"
-    javafxStaticSdkVersion = "$fxStaticVersion"
 }
 
 // </editor-fold>
@@ -352,11 +340,6 @@ jlink {
         jvmArgs += ["-Dlogback.configurationFile={{BIN_DIR}}${fileSep}logback.xml"]
         //jvmArgs += ["--add-exports external.module.name/external.package.name=$sModuleName", ...]
     }
-    if (project.isAppleSiliconBuild) {
-        targetPlatform("osx-arm64") {
-            jdkHome = project.appleSiliconJavaHome
-        }
-    }
     //forceMerge('javafx')
     //addExtraDependencies("javafx")
     jpackage {
@@ -397,12 +380,6 @@ tasks.jlink.doLast {
         from("$sourceSets.main.output.resourcesDir/logback.xml")
         into("$imageDir/bin")
     }
-    if (project.isAppleSiliconBuild) {
-        copy {
-            from("$sourceSets.main.output.resourcesDir/logback.xml")
-            into("$imageDir/${artifactNameUpper}-osx-arm64/bin")
-        }
-    }
 }
 
 tasks.jpackageImage.doLast {

diff --git a/gradle.properties b/gradle.properties
@@ -9,4 +9,3 @@ org.gradle.java.installations.auto-detect=true
 # Project Build Properties
 env=dev
 javafx.version=21.0.4
-javafx.static.version=21-ea+11.2
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,6 @@
         <maven.surefire.plugin.version>3.3.1</maven.surefire.plugin.version>
         <maven.site.plugin.version>4.0.0-M16</maven.site.plugin.version>
         <javafx.maven.plugin.version>0.0.8</javafx.maven.plugin.version>
-        <gluonfx.maven.plugin.version>1.0.23</gluonfx.maven.plugin.version>
         <codehaus.license.plugin.version>2.4.0</codehaus.license.plugin.version>
         <codehaus.flatten.plugin.version>1.6.0</codehaus.flatten.plugin.version>
         <codehaus.build.helper.maven.plugin.version>3.6.0</codehaus.build.helper.maven.plugin.version>
@@ -264,18 +263,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>com.gluonhq</groupId>
-                <artifactId>gluonfx-maven-plugin</artifactId>
-                <version>${gluonfx.maven.plugin.version}</version>
-                <configuration>
-                    <nativeImageArgs>
-                        <arg>--allow-incomplete-classpath</arg>
-                    </nativeImageArgs>
-                    <javafxStaticSdkVersion>${javafx.static.version}</javafxStaticSdkVersion>
-                    <mainClass>${mainClassName}</mainClass>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>io.github.git-commit-id</groupId>
                 <artifactId>git-commit-id-maven-plugin</artifactId>

diff --git a/src/main/resources/META-INF/native-image/filter-file.json b/src/main/resources/META-INF/native-image/filter-file.json