From 54f2667e457827e2dd6a4e81ef96c641f342e427 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 31 Oct 2018 15:50:05 +0100 Subject: [PATCH 1/5] openjdk 11 migration --- main/commons/pom.xml | 6 ++++++ main/pom.xml | 20 +++++++++++++++++--- main/ui/pom.xml | 10 ++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 80d96e00c..fbe878d05 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -11,6 +11,12 @@ Shared utilities + + + org.openjfx + javafx-controls + + com.google.guava diff --git a/main/pom.xml b/main/pom.xml index 148c9897e..e136b5c8d 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -31,6 +31,8 @@ 1.0.0 1.0.5 + 11 + 2.5 3.6 @@ -122,6 +124,18 @@ ${cryptomator.jni.version} + + + org.openjfx + javafx-controls + ${javafx.version} + + + org.openjfx + javafx-fxml + ${javafx.version} + + org.slf4j @@ -317,9 +331,9 @@ maven-compiler-plugin 3.8.0 - 10 - 10 - 10 + 11 + 11 + 11 com.google.dagger diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 2421329e6..8418f0953 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -46,6 +46,16 @@ cryptolib + + + org.openjfx + javafx-controls + + + org.openjfx + javafx-fxml + + org.fxmisc.easybind From 744225cf7a072d85b7cfbabb56cb4bb6f288bffa Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 31 Oct 2018 15:51:00 +0100 Subject: [PATCH 2/5] changing build to jdk11 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d3492771a..1f205b58b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: java sudo: false jdk: -- openjdk10 +- openjdk11 cache: directories: - $HOME/.m2 From 26aee9e42c1be64eb0c00e18346826d079955c57 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 14 Feb 2019 18:20:11 +0100 Subject: [PATCH 3/5] create os-dependent buildkit.zip with all java resources required to build a self-contained package --- .idea/encodings.xml | 1 + .idea/misc.xml | 2 +- .travis.yml | 32 ++++- main/ant-kit/pom.xml | 99 -------------- main/ant-kit/src/main/resources/build.xml | 52 ------- .../assembly-linux.xml} | 19 +-- main/buildkit/assembly-mac.xml | 25 ++++ main/buildkit/assembly-win.xml | 25 ++++ main/buildkit/pom.xml | 129 ++++++++++++++++++ main/commons/pom.xml | 2 +- main/pom.xml | 9 +- 11 files changed, 221 insertions(+), 174 deletions(-) delete mode 100644 main/ant-kit/pom.xml delete mode 100644 main/ant-kit/src/main/resources/build.xml rename main/{ant-kit/assembly.xml => buildkit/assembly-linux.xml} (55%) create mode 100644 main/buildkit/assembly-mac.xml create mode 100644 main/buildkit/assembly-win.xml create mode 100644 main/buildkit/pom.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 40b0d6477..be156c7af 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -2,6 +2,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index fd8e48573..c20d5a34e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index c04747c60..bd58d0e39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,13 +61,39 @@ deploy: - provider: script skip_cleanup: true script: >- - curl -T main/ant-kit/target/antkit.zip + curl -T main/buildkit/target/buildkit-linux.zip -u cryptobot:${BINTRAY_API_KEY} - -H "X-Bintray-Package:ant-kit" + -H "X-Bintray-Package:buildkit" -H "X-Bintray-Version:${TRAVIS_TAG}" -H "X-Bintray-Override:1" -H "X-Bintray-Publish:1" - https://api.bintray.com/content/cryptomator/cryptomator/antkit-${TRAVIS_TAG}.zip + https://api.bintray.com/content/cryptomator/cryptomator/buildkit-linux-${TRAVIS_TAG}.zip + on: + repo: cryptomator/cryptomator + tags: true +- provider: script + skip_cleanup: true + script: >- + curl -T main/buildkit/target/buildkit-mac.zip + -u cryptobot:${BINTRAY_API_KEY} + -H "X-Bintray-Package:buildkit" + -H "X-Bintray-Version:${TRAVIS_TAG}" + -H "X-Bintray-Override:1" + -H "X-Bintray-Publish:1" + https://api.bintray.com/content/cryptomator/cryptomator/buildkit-mac-${TRAVIS_TAG}.zip + on: + repo: cryptomator/cryptomator + tags: true +- provider: script + skip_cleanup: true + script: >- + curl -T main/buildkit/target/buildkit-win.zip + -u cryptobot:${BINTRAY_API_KEY} + -H "X-Bintray-Package:buildkit" + -H "X-Bintray-Version:${TRAVIS_TAG}" + -H "X-Bintray-Override:1" + -H "X-Bintray-Publish:1" + https://api.bintray.com/content/cryptomator/cryptomator/buildkit-win-${TRAVIS_TAG}.zip on: repo: cryptomator/cryptomator tags: true diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml deleted file mode 100644 index 090e5142c..000000000 --- a/main/ant-kit/pom.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - 4.0.0 - - org.cryptomator - main - 1.5.0-SNAPSHOT - - ant-kit - pom - Cryptomator Ant Build Kit - Builds a package that can be built with Ant locally - - - - org.cryptomator - launcher - - - - - - - - maven-dependency-plugin - - - copy-libs - prepare-package - - copy-dependencies - - - ${project.build.directory}/libs - - - - - - - - maven-resources-plugin - 3.0.2 - - - copy-resources - prepare-package - - copy-resources - - - ${project.build.directory} - \ - UTF-8 - - - src/main/resources - true - - build.xml - - - - src/main/resources - false - - logback.xml - - - - - - - - - - - maven-assembly-plugin - 3.1.0 - - - make-assembly - package - - single - - - - - - assembly.xml - - false - antkit - - - - - \ No newline at end of file diff --git a/main/ant-kit/src/main/resources/build.xml b/main/ant-kit/src/main/resources/build.xml deleted file mode 100644 index 7ed445448..000000000 --- a/main/ant-kit/src/main/resources/build.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/main/ant-kit/assembly.xml b/main/buildkit/assembly-linux.xml similarity index 55% rename from main/ant-kit/assembly.xml rename to main/buildkit/assembly-linux.xml index 661711fe4..a26ce199b 100644 --- a/main/ant-kit/assembly.xml +++ b/main/buildkit/assembly-linux.xml @@ -15,24 +15,11 @@ libs - target/fixed-binaries - false - fixed-binaries - 755 - - - target/package - false - package - - - target + target/linux-libs - build.xml - logback.xml + *.jar - false - . + libs \ No newline at end of file diff --git a/main/buildkit/assembly-mac.xml b/main/buildkit/assembly-mac.xml new file mode 100644 index 000000000..7920af116 --- /dev/null +++ b/main/buildkit/assembly-mac.xml @@ -0,0 +1,25 @@ + + + tarball + false + + zip + + + + target/libs + + *.jar + + libs + + + target/mac-libs + + *.jar + + libs + + + \ No newline at end of file diff --git a/main/buildkit/assembly-win.xml b/main/buildkit/assembly-win.xml new file mode 100644 index 000000000..cfb0c030c --- /dev/null +++ b/main/buildkit/assembly-win.xml @@ -0,0 +1,25 @@ + + + tarball + false + + zip + + + + target/libs + + *.jar + + libs + + + target/win-libs + + *.jar + + libs + + + \ No newline at end of file diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml new file mode 100644 index 000000000..f84838a75 --- /dev/null +++ b/main/buildkit/pom.xml @@ -0,0 +1,129 @@ + + + 4.0.0 + + org.cryptomator + main + 1.5.0-SNAPSHOT + + buildkit + pom + Cryptomator Build Kit + Builds a package that can be built with Ant locally + + + + org.cryptomator + launcher + + + + + + + + maven-dependency-plugin + 3.1.1 + + + copy-libs + prepare-package + + copy-dependencies + + + ${project.build.directory}/libs + linux,mac,win + + + + copy-linux-libs + prepare-package + + copy-dependencies + + + ${project.build.directory}/linux-libs + org.openjfx + linux + + + + copy-mac-libs + prepare-package + + copy-dependencies + + + ${project.build.directory}/mac-libs + org.openjfx + mac + + + + copy-win-libs + prepare-package + + copy-dependencies + + + ${project.build.directory}/win-libs + org.openjfx + win + + + + + + + + maven-assembly-plugin + 3.1.1 + + + assemble-linux + package + + single + + + + assembly-linux.xml + + false + buildkit-linux + + + + assemble-mac + package + + single + + + + assembly-mac.xml + + false + buildkit-mac + + + + assemble-win + package + + single + + + + assembly-win.xml + + false + buildkit-win + + + + + + + \ No newline at end of file diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 6e3ddc6a3..ebb78e73f 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -14,7 +14,7 @@ org.openjfx - javafx-controls + javafx-base diff --git a/main/pom.xml b/main/pom.xml index d5dce5671..822b0d754 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -31,7 +31,7 @@ 1.1.3 1.0.6 - 11 + 11.0.2 2.6 3.8.1 @@ -125,6 +125,11 @@ + + org.openjfx + javafx-base + ${javafx.version} + org.openjfx javafx-controls @@ -264,7 +269,7 @@ release uber-jar - ant-kit + buildkit From 8831df9242a80c627ba523dd6d727f61d424a766 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 15 Feb 2019 14:45:12 +0100 Subject: [PATCH 4/5] Removed creation of fat jar for now. --- .idea/compiler.xml | 1 - .idea/encodings.xml | 1 - .travis.yml | 37 +++++++++++---- main/pom.xml | 1 - main/uber-jar/pom.xml | 48 -------------------- main/uber-jar/src/main/resources/logback.xml | 20 -------- 6 files changed, 28 insertions(+), 80 deletions(-) delete mode 100644 main/uber-jar/pom.xml delete mode 100644 main/uber-jar/src/main/resources/logback.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 3eb6376b7..eb6e630bd 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -26,7 +26,6 @@ - diff --git a/.idea/encodings.xml b/.idea/encodings.xml index be156c7af..0e7df1ed1 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -6,7 +6,6 @@ - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index bd58d0e39..803e13215 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,27 +38,46 @@ deploy: - provider: script # SNAPSHOTS skip_cleanup: true script: >- - curl -T main/ant-kit/target/antkit.zip + curl -T main/buildkit/target/buildkit-linux.zip -u cryptobot:${BINTRAY_API_KEY} - -H "X-Bintray-Package:ant-kit" + -H "X-Bintray-Package:buildkit" -H "X-Bintray-Version:continuous" -H "X-Bintray-Override:1" -H "X-Bintray-Publish:1" - https://api.bintray.com/content/cryptomator/cryptomator/antkit-continuous.zip + https://api.bintray.com/content/cryptomator/cryptomator/buildkit-linux-continuous.zip on: repo: cryptomator/cryptomator branch: develop condition: $TRAVIS_TAG = '' -- provider: releases # RELEASE - prerelease: false - api_key: $GITHUB_API_KEY - file: - - "main/uber-jar/target/Cryptomator-$TRAVIS_TAG.jar" +- provider: script skip_cleanup: true + script: >- + curl -T main/buildkit/target/buildkit-mac.zip + -u cryptobot:${BINTRAY_API_KEY} + -H "X-Bintray-Package:buildkit" + -H "X-Bintray-Version:continuous" + -H "X-Bintray-Override:1" + -H "X-Bintray-Publish:1" + https://api.bintray.com/content/cryptomator/cryptomator/buildkit-mac-continuous.zip on: repo: cryptomator/cryptomator - tags: true + branch: develop + condition: $TRAVIS_TAG = '' - provider: script + skip_cleanup: true + script: >- + curl -T main/buildkit/target/buildkit-win.zip + -u cryptobot:${BINTRAY_API_KEY} + -H "X-Bintray-Package:buildkit" + -H "X-Bintray-Version:continuous" + -H "X-Bintray-Override:1" + -H "X-Bintray-Publish:1" + https://api.bintray.com/content/cryptomator/cryptomator/buildkit-win-continuous.zip + on: + repo: cryptomator/cryptomator + branch: develop + condition: $TRAVIS_TAG = '' +- provider: script # RELEASE skip_cleanup: true script: >- curl -T main/buildkit/target/buildkit-linux.zip diff --git a/main/pom.xml b/main/pom.xml index 822b0d754..dbd477902 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -268,7 +268,6 @@ release - uber-jar buildkit diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml deleted file mode 100644 index fa28bfada..000000000 --- a/main/uber-jar/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - org.cryptomator - main - 1.5.0-SNAPSHOT - - uber-jar - Single über jar with all dependencies - - - - org.cryptomator - launcher - - - - - - - maven-shade-plugin - 3.0.0 - - - make-assembly - package - - shade - - - - - Cryptomator-${project.version} - false - - - - org.cryptomator.launcher.Cryptomator - ${project.version} - - - - - - - - \ No newline at end of file diff --git a/main/uber-jar/src/main/resources/logback.xml b/main/uber-jar/src/main/resources/logback.xml deleted file mode 100644 index 721175d1c..000000000 --- a/main/uber-jar/src/main/resources/logback.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - - From 5cb4b403cd319ed8f112e59ec4866778908d4e1d Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 15 Feb 2019 15:15:26 +0100 Subject: [PATCH 5/5] updated travis-to-bintray upload config --- .travis-deploy-release.tmpl.json | 19 +++++++ .travis-deploy-snapshot.json | 15 ++++++ .travis.yml | 86 ++++---------------------------- 3 files changed, 45 insertions(+), 75 deletions(-) create mode 100644 .travis-deploy-release.tmpl.json create mode 100644 .travis-deploy-snapshot.json diff --git a/.travis-deploy-release.tmpl.json b/.travis-deploy-release.tmpl.json new file mode 100644 index 000000000..6543a22ba --- /dev/null +++ b/.travis-deploy-release.tmpl.json @@ -0,0 +1,19 @@ +{ + "package": { + "name": "buildkit", + "repo": "cryptomator", + "subject": "cryptomator" + }, + "version": { + "name": "$TRAVIS_TAG", + "desc": "Cryptomator version $TRAVIS_TAG", + "released": "$TODAY", + "vcs_tag": "$TRAVIS_TAG", + "gpgSign": true + }, + "files": + [ + {"includePattern": "main/buildkit/target/(buildkit-[a-z]+\\.deb)", "uploadPattern": "/$1"} + ], + "publish": true +} diff --git a/.travis-deploy-snapshot.json b/.travis-deploy-snapshot.json new file mode 100644 index 000000000..9d0e80c7a --- /dev/null +++ b/.travis-deploy-snapshot.json @@ -0,0 +1,15 @@ +{ + "package": { + "name": "buildkit", + "repo": "cryptomator", + "subject": "cryptomator" + }, + "version": { + "name": "snapshot" + }, + "files": + [ + {"includePattern": "main/buildkit/target/(buildkit-[a-z]+\\.deb)", "uploadPattern": "/$1"} + ], + "publish": true +} diff --git a/.travis.yml b/.travis.yml index 803e13215..dc9e608eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,85 +34,21 @@ before_deploy: mvn -fmain/pom.xml org.codehaus.mojo:versions-maven-plugin:set -DnewVersion=SNAPSHOT-$(echo $TRAVIS_COMMIT | head -c7) fi - mvn -fmain/pom.xml clean package -Prelease -DskipTests +- TODAY=`date +'%Y-%m-%d` envsubst '$TRAVIS_TAG $TODAY' < .travis-deploy-release.tmpl.json > .travis-deploy-release.json +- cat .travis-deploy-release.json deploy: -- provider: script # SNAPSHOTS +- provider: bintray # SNAPSHOTS + file: .travis-deploy-snapshot.json + user: cryptobot + key: $BINTRAY_API_KEY skip_cleanup: true - script: >- - curl -T main/buildkit/target/buildkit-linux.zip - -u cryptobot:${BINTRAY_API_KEY} - -H "X-Bintray-Package:buildkit" - -H "X-Bintray-Version:continuous" - -H "X-Bintray-Override:1" - -H "X-Bintray-Publish:1" - https://api.bintray.com/content/cryptomator/cryptomator/buildkit-linux-continuous.zip on: repo: cryptomator/cryptomator - branch: develop - condition: $TRAVIS_TAG = '' -- provider: script +- provider: bintray # RELEASES + file: .travis-deploy-release.json + user: cryptobot + key: $BINTRAY_API_KEY skip_cleanup: true - script: >- - curl -T main/buildkit/target/buildkit-mac.zip - -u cryptobot:${BINTRAY_API_KEY} - -H "X-Bintray-Package:buildkit" - -H "X-Bintray-Version:continuous" - -H "X-Bintray-Override:1" - -H "X-Bintray-Publish:1" - https://api.bintray.com/content/cryptomator/cryptomator/buildkit-mac-continuous.zip on: repo: cryptomator/cryptomator - branch: develop - condition: $TRAVIS_TAG = '' -- provider: script - skip_cleanup: true - script: >- - curl -T main/buildkit/target/buildkit-win.zip - -u cryptobot:${BINTRAY_API_KEY} - -H "X-Bintray-Package:buildkit" - -H "X-Bintray-Version:continuous" - -H "X-Bintray-Override:1" - -H "X-Bintray-Publish:1" - https://api.bintray.com/content/cryptomator/cryptomator/buildkit-win-continuous.zip - on: - repo: cryptomator/cryptomator - branch: develop - condition: $TRAVIS_TAG = '' -- provider: script # RELEASE - skip_cleanup: true - script: >- - curl -T main/buildkit/target/buildkit-linux.zip - -u cryptobot:${BINTRAY_API_KEY} - -H "X-Bintray-Package:buildkit" - -H "X-Bintray-Version:${TRAVIS_TAG}" - -H "X-Bintray-Override:1" - -H "X-Bintray-Publish:1" - https://api.bintray.com/content/cryptomator/cryptomator/buildkit-linux-${TRAVIS_TAG}.zip - on: - repo: cryptomator/cryptomator - tags: true -- provider: script - skip_cleanup: true - script: >- - curl -T main/buildkit/target/buildkit-mac.zip - -u cryptobot:${BINTRAY_API_KEY} - -H "X-Bintray-Package:buildkit" - -H "X-Bintray-Version:${TRAVIS_TAG}" - -H "X-Bintray-Override:1" - -H "X-Bintray-Publish:1" - https://api.bintray.com/content/cryptomator/cryptomator/buildkit-mac-${TRAVIS_TAG}.zip - on: - repo: cryptomator/cryptomator - tags: true -- provider: script - skip_cleanup: true - script: >- - curl -T main/buildkit/target/buildkit-win.zip - -u cryptobot:${BINTRAY_API_KEY} - -H "X-Bintray-Package:buildkit" - -H "X-Bintray-Version:${TRAVIS_TAG}" - -H "X-Bintray-Override:1" - -H "X-Bintray-Publish:1" - https://api.bintray.com/content/cryptomator/cryptomator/buildkit-win-${TRAVIS_TAG}.zip - on: - repo: cryptomator/cryptomator - tags: true + tags: true \ No newline at end of file