Package: mediathekview / 13.2.1-3

build.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
From: Markus Koschany <apo@debian.org>
Date: Sun, 18 Nov 2018 19:18:04 +0100
Subject: build

Use Debian's system libraries.

Forwarded: not-needed
---
 build.gradle | 64 ++++++++++++------------------------------------------------
 1 file changed, 13 insertions(+), 51 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0c0644f..5a31f02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,19 +1,14 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 import java.nio.file.Files
 
-plugins {
-    id "com.github.jk1.dependency-license-report" version "0.3.5"
-    id 'edu.sc.seis.launch4j' version '2.0.1'
-}
 apply plugin: 'java'
 apply plugin: 'distribution'
 apply plugin: 'maven'
-apply plugin: 'idea'
-apply from: "${project.rootDir}/gradle/eclipse.gradle"
 
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+compileJava.options.encoding = 'UTF-8'
+sourceCompatibility = 1.9
+targetCompatibility = 1.9
 group = 'de.mediathekview'
 version = '13.2.1'
 
@@ -25,6 +20,8 @@ ext {
     if (!propsFile.exists()) {
         Files.createFile(propsFile.toPath())
     }
+    swingxGroup = 'org.swinglabs'
+    swingxVersion = '1.6.6-SNAPSHOT'
 }
 
 def loadVersionProperties() {
@@ -44,13 +41,14 @@ repositories {
     mavenLocal()
     mavenCentral()
     flatDir {
-        dirs 'libs'
+        dirs '/usr/share/java/'
     }
 }
 
 dependencies {
     compile ":jide-oss:3.7.4"
-    compile "io.dropwizard.metrics:metrics-core:4.0.0"
+    compile "$swingxGroup:swingx-beaninfo:$swingxVersion"
+    compile "$swingxGroup:swingx-core:$swingxVersion"
     compile 'org.apache.commons:commons-lang3:3.6'
     compile 'com.google.guava:guava:26.0-jre'
     compile 'org.apache.commons:commons-compress:1.17'
@@ -64,14 +62,17 @@ dependencies {
     compile 'org.apache.commons:commons-configuration2:2.2'
     compile 'com.github.jiconfont:jiconfont-swing:1.0.1'
     compile 'com.github.jiconfont:jiconfont-font_awesome:4.7.0.0'
-    compile 'com.nativelibs4java:bridj:0.7.0'
     compile 'com.miglayout:miglayout-swing:5.1'
     compile 'com.miglayout:miglayout-core:5.1'
     compile 'com.miglayout:miglayout-javafx:5.1'
     compile 'com.squareup.okhttp3:okhttp:3.11.0'
     compile group: 'org.apache.commons', name: 'commons-dbcp2', version: '2.5.0'
 
-    compileOnly 'com.yuvimasory:orange-extensions:1.3.0'
+    compile name: 'okhttp'
+    compile name: 'javafx-base'
+    compile name: 'javafx-swing'
+    compile name: 'javafx-web'
+    compile name: 'javax.activation'
     compileOnly group: 'org.jetbrains', name: 'annotations', version: '16.0.2'
 }
 
@@ -141,49 +142,10 @@ distributions {
             from('build/libs') {
                 include '*.jar'
             }
-            from('build/launch4j') {
-                include '*.exe'
-                exclude 'lib'
-            }
         }
     }
 }
 
-//Windows executable generation
-launch4j {
-    mainClassName = mainClass
-    icon = "../../res/MediathekView.ico"
-    jar = jarName
-    dontWrapJar = true
-    outfile = "MediathekView.exe"
-    initialHeapSize = 256
-    maxHeapSize = 1024
-    maxHeapPercent = 80
-
-}
-
-
-task createIpv4Exe(type: edu.sc.seis.launch4j.tasks.Launch4jLibraryTask) {
-    outfile = "MediathekView_ipv4.exe"
-    opt = "-Djava.net.preferIPv4Stack=true"
-
-    initialHeapSize = 256
-    maxHeapSize = 1024
-    maxHeapPercent = 80
-}
-
-task createPortableExe(type: edu.sc.seis.launch4j.tasks.Launch4jLibraryTask) {
-    outfile = "MediathekView_Portable.exe"
-    opt = "-DmvLogOutputPath=Einstellungen/.mediathek3/mediathekview.log"
-    cmdLine = "Einstellungen/.mediathek3"
-
-    initialHeapSize = 256
-    maxHeapSize = 1024
-    maxHeapPercent = 80
-}
-
-assemble.dependsOn createAllExecutables
-
 /**
  * This is how you pass arguments: "./gradlew run -Pargs=arg1,arg2,arg3
  */