Skip to content
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.

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

Update to Java 13 (compiles, but crashes) #49

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ build: off

install:
- git submodule update --init
- choco install openjdk --version 11.0.2.01
- SET JAVA_HOME=C:\Program Files\OpenJDK\jdk-11.0.2
- SET PATH=C:\Program Files\OpenJDK\jdk-11.0.2\bin;%PATH%
- curl -o jdk.packager-windows.zip http://download2.gluonhq.com/jpackager/11/jdk.packager-windows.zip
- choco install openjdk --version 13.0.101
- SET JAVA_HOME=C:\Program Files\OpenJDK\jdk-13.0.1
- SET PATH=C:\Program Files\OpenJDK\jdk-13.0.1\bin;%PATH%
- curl -o jdk.packager-windows.zip http://download2.gluonhq.com/jpackager/13/jdk.packager-windows.zip
- 7z e jdk.packager-windows.zip
- curl -o jmods.zip https://download2.gluonhq.com/openjfx/11.0.2/openjfx-11.0.2_windows-x64_bin-jmods.zip
- curl -o jmods.zip https://download2.gluonhq.com/openjfx/13.0.1/openjfx-13.0.1_windows-x64_bin-jmods.zip
- 7z x jmods.zip
- mv jpackager.exe "%JAVA_HOME%\bin"
- mv jdk.packager.jar "%JAVA_HOME%\jmods"
Expand All @@ -19,7 +19,7 @@ cache:
test_script:
- cd pretixscan
- gradlew --no-daemon -version
- gradlew --no-daemon --stacktrace clean createBundle -PjavafxJmodsPath=../../javafx-jmods-11.0.2/
- gradlew --no-daemon --stacktrace clean createBundle -PjavafxJmodsPath=../../javafx-jmods-13.0.1/
- mkdir dist
- '"C:\Program Files (x86)\NSIS\makensis.exe" packaging\build\resources\main\windows.nsi'

Expand Down
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ variables:
package:
before_script:
- apt update && apt -y install fakeroot
- wget https://download2.gluonhq.com/openjfx/11.0.2/openjfx-11.0.2_linux-x64_bin-jmods.zip
- unzip openjfx-11.0.2_linux-x64_bin-jmods.zip
- wget https://download2.gluonhq.com/jpackager/11/jdk.packager-linux.zip
- wget https://download2.gluonhq.com/openjfx/13.0.1/openjfx-13.0.1_linux-x64_bin-jmods.zip
- unzip openjfx-13.0.1_linux-x64_bin-jmods.zip
- wget https://download2.gluonhq.com/jpackager/13/jdk.packager-linux.zip
- unzip jdk.packager-linux.zip
script:
- cd pretixscan
- ./gradlew clean createBundle -PjavafxJmodsPath=../../javafx-jmods-11.0.2/ -PjavaPackagerPath=../../
- ./gradlew clean createBundle -PjavafxJmodsPath=../../javafx-jmods-13.0.1/ -PjavaPackagerPath=../../
tags:
- java
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion pretixscan/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildscript {
classpath "net.ltgt.gradle:gradle-apt-plugin:0.17"
classpath group: 'de.dynamicfiles.projects.gradle.plugins', name: 'javafx-gradle-plugin', version: '8.8.2'
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
classpath 'org.openjfx:javafx-plugin:0.0.7'
classpath 'org.openjfx:javafx-plugin:0.0.8'
}
}

Expand Down
Binary file modified pretixscan/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions pretixscan/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Mon Jul 22 15:25:38 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
18 changes: 17 additions & 1 deletion pretixscan/gradlew
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
## Gradle start up script for UN*X
Expand Down Expand Up @@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
18 changes: 17 additions & 1 deletion pretixscan/gradlew.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
Expand All @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
8 changes: 4 additions & 4 deletions pretixscan/gui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ dependencies {
}
testCompile group: 'junit', name: 'junit', version: '4.12'

javafxCompile "org.openjfx:javafx-base:11.0.2:${platform}"
javafxCompile "org.openjfx:javafx-graphics:11.0.2:${platform}"
javafxCompile "org.openjfx:javafx-controls:11.0.2:${platform}"
javafxCompile "org.openjfx:javafx-fxml:11.0.2:${platform}"
javafxCompile "org.openjfx:javafx-base:13.0.1:${platform}"
javafxCompile "org.openjfx:javafx-graphics:13.0.1:${platform}"
javafxCompile "org.openjfx:javafx-controls:13.0.1:${platform}"
javafxCompile "org.openjfx:javafx-fxml:13.0.1:${platform}"

compileOnly configurations.javafxCompile
}
Expand Down