diff --git a/.appveyor.yml b/.appveyor.yml index db3f6f6..7610697 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -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" @@ -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' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c7c8a3..041c19b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/pretixscan/build.gradle b/pretixscan/build.gradle index c45ec3d..2ccd065 100644 --- a/pretixscan/build.gradle +++ b/pretixscan/build.gradle @@ -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' } } diff --git a/pretixscan/gradle/wrapper/gradle-wrapper.jar b/pretixscan/gradle/wrapper/gradle-wrapper.jar index ed88a04..5c2d1cf 100644 Binary files a/pretixscan/gradle/wrapper/gradle-wrapper.jar and b/pretixscan/gradle/wrapper/gradle-wrapper.jar differ diff --git a/pretixscan/gradle/wrapper/gradle-wrapper.properties b/pretixscan/gradle/wrapper/gradle-wrapper.properties index 9ed2250..9492014 100644 --- a/pretixscan/gradle/wrapper/gradle-wrapper.properties +++ b/pretixscan/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/pretixscan/gradlew b/pretixscan/gradlew index cccdd3d..8e25e6c 100755 --- a/pretixscan/gradlew +++ b/pretixscan/gradlew @@ -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 @@ -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" diff --git a/pretixscan/gradlew.bat b/pretixscan/gradlew.bat index e95643d..24467a1 100644 --- a/pretixscan/gradlew.bat +++ b/pretixscan/gradlew.bat @@ -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 @@ -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 diff --git a/pretixscan/gui/build.gradle b/pretixscan/gui/build.gradle index a1b4107..dd8c569 100644 --- a/pretixscan/gui/build.gradle +++ b/pretixscan/gui/build.gradle @@ -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 }