summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Abraham <andreas.abraham@egiz.gv.at>2021-08-13 11:44:54 +0200
committerAndreas Abraham <andreas.abraham@egiz.gv.at>2021-08-13 11:44:54 +0200
commit96a342a4a75684d521d2abfbd912531a6f150d08 (patch)
tree82da934b88c9c7332ecaad87ec1eb4befd21f9af
parent89237859c8098f5d8eeda09c968cafb17ffe3e39 (diff)
downloadpdf-over-96a342a4a75684d521d2abfbd912531a6f150d08.tar.gz
pdf-over-96a342a4a75684d521d2abfbd912531a6f150d08.tar.bz2
pdf-over-96a342a4a75684d521d2abfbd912531a6f150d08.zip
Update SWT Lib to 4.20
-rw-r--r--pdf-over-gui/pom.xml31
-rw-r--r--pdf-over-install-helper/src/main/java/at/asit/helper/Main.java2
2 files changed, 16 insertions, 17 deletions
diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index 14018320..96d90dc7 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -172,7 +172,7 @@
<artifactItems>
<artifactItem>
<groupId>org.eclipse.swt</groupId>
- <artifactId>${swt.artifactId.32}</artifactId>
+ <artifactId>${swt.artifactId.64}</artifactId>
<version>${swt.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
@@ -450,7 +450,7 @@
<project.maindir>${project.basedir}/..</project.maindir>
<target.name>windows</target.name>
<staging.dir>${project.build.directory}/staging/${target.name}</staging.dir>
- <swt.version>4.13</swt.version>
+ <swt.version>4.20</swt.version>
</properties>
<profiles>
@@ -465,7 +465,7 @@
</os>
</activation>
<properties>
- <swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32>
+<!-- <swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32>-->
<swt.artifactId.64>org.eclipse.swt.win32.win32.x86_64</swt.artifactId.64>
<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
<target.name>windows</target.name>
@@ -480,14 +480,13 @@
</os>
</activation>
<properties>
- <swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32>
+<!-- <swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32>-->
<swt.artifactId.64>org.eclipse.swt.win32.win32.x86_64</swt.artifactId.64>
- <swt.artifactId>${swt.artifactId.32}</swt.artifactId>
+ <swt.artifactId>${swt.artifactId.64}</swt.artifactId>
<target.name>windows</target.name>
</properties>
</profile>
-
-
+
<profile>
<id>linux-64</id>
<activation>
@@ -497,7 +496,7 @@
</os>
</activation>
<properties>
- <swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32>
+<!-- <swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32>-->
<swt.artifactId.64>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId.64>
<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
<target.name>linux</target.name>
@@ -512,9 +511,9 @@
</os>
</activation>
<properties>
- <swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32>
+<!-- <swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32>-->
<swt.artifactId.64>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId.64>
- <swt.artifactId>${swt.artifactId.32}</swt.artifactId>
+ <swt.artifactId>${swt.artifactId.64}</swt.artifactId>
<target.name>linux</target.name>
</properties>
</profile>
@@ -530,9 +529,9 @@
</os>
</activation>
<properties>
- <swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>
+<!-- <swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>-->
<swt.artifactId.64>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId.64>
- <swt.artifactId>${swt.artifactId.32}</swt.artifactId>
+ <swt.artifactId>${swt.artifactId.64}</swt.artifactId>
<target.name>mac</target.name>
</properties>
</profile>
@@ -545,9 +544,9 @@
</os>
</activation>
<properties>
- <swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>
+<!-- <swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>-->
<swt.artifactId.64>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId.64>
- <swt.artifactId>${swt.artifactId.32}</swt.artifactId>
+ <swt.artifactId>${swt.artifactId.64}</swt.artifactId>
<target.name>mac</target.name>
</properties>
</profile>
@@ -560,7 +559,7 @@
</os>
</activation>
<properties>
- <swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>
+<!-- <swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>-->
<swt.artifactId.64>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId.64>
<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
<target.name>mac</target.name>
@@ -575,7 +574,7 @@
</os>
</activation>
<properties>
- <swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>
+<!-- <swt.artifactId.32>org.eclipse.swt.cocoa.macosx</swt.artifactId.32>-->
<swt.artifactId.64>org.eclipse.swt.cocoa.macosx.x86_64</swt.artifactId.64>
<swt.artifactId>${swt.artifactId.64}</swt.artifactId>
<target.name>mac</target.name>
diff --git a/pdf-over-install-helper/src/main/java/at/asit/helper/Main.java b/pdf-over-install-helper/src/main/java/at/asit/helper/Main.java
index f548ced5..edf5ec2f 100644
--- a/pdf-over-install-helper/src/main/java/at/asit/helper/Main.java
+++ b/pdf-over-install-helper/src/main/java/at/asit/helper/Main.java
@@ -22,7 +22,7 @@ import org.apache.commons.io.FileUtils;
*/
public class Main {
- private final static String SWT_VERSION = "4.8";
+ private final static String SWT_VERSION = "4.20";
public static void main(String[] args) {