summarylogtreecommitdiffstats
path: root/keystore-explorer-fix-282.patch
blob: b7b48f5bc6bce99f926552296ac54f4050c70460 (plain)
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
--- a/build.gradle	(revision 9d46b4b43d4b18d2806dd399ec68685337732bb1)
+++ b/build.gradle	(date 1627287073068)
@@ -100,24 +100,24 @@
 targetCompatibility = 1.8
 
 dependencies {
-	compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.66'
-	compile group: 'net.java.dev.jna', name: 'jna', version: '5.6.0'
-	compile group: 'commons-io', name: 'commons-io', version: '2.7'
-	compile group: 'com.miglayout', name: 'miglayout-swing', version: '5.2'
-	compile group: 'com.formdev', name: 'flatlaf', version: '0.38'
+	implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.66'
+	implementation group: 'net.java.dev.jna', name: 'jna', version: '5.6.0'
+	implementation group: 'commons-io', name: 'commons-io', version: '2.7'
+	implementation group: 'com.miglayout', name: 'miglayout-swing', version: '5.2'
+	implementation group: 'com.formdev', name: 'flatlaf', version: '0.38'
 
 	// VAqua Look & Feel not in a public repository yet
 	if (file("lib/VAqua7.jar").exists()) {
-		compile files('lib/VAqua7.jar')
+		implementation files('lib/VAqua7.jar')
 	}
 
-	testCompile("org.assertj:assertj-core:3.16.1")
-	testCompile("org.junit.jupiter:junit-jupiter-api:5.6.2")
-	testCompile("org.junit.jupiter:junit-jupiter-params:5.6.2")
-	testRuntime("org.junit.jupiter:junit-jupiter-engine:5.6.2")
+	testImplementation("org.assertj:assertj-core:3.16.1")
+	testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.2")
+	testImplementation("org.junit.jupiter:junit-jupiter-params:5.6.2")
+	testImplementation("org.junit.jupiter:junit-jupiter-engine:5.6.2")
 
 	// To avoid compiler warnings about @API annotations in JUnit code:
-	testCompileOnly('org.apiguardian:apiguardian-api:1.1.0')
+	testRuntimeOnly('org.apiguardian:apiguardian-api:1.1.0')
 }
 
 
@@ -132,7 +132,7 @@
 					'Specification-Version': project.version,
 					'Specification-Vendor': project.vendor,
 					'Main-Class': project.mainClassName,
-					'Class-Path': configurations.compile.collect { 'lib/' + it.getName() }.join(' '),
+					'Class-Path': configurations.runtimeClasspath.files.collect { 'lib/' + it.getName() }.join(' '),
 					'Built-Date': new Date().format("yyyy-MM-dd HH:mm:ss"),
 					'SplashScreen-Image': 'org/kse/gui/images/splash.png',
 					'Sealed': 'true'
@@ -187,7 +187,7 @@
 		}
 	}
 	into("$distFileNamePrefix/lib") {
-		from configurations.runtime
+		from configurations.runtimeClasspath.files
 	}
 	into("$distFileNamePrefix/licenses") {
 		from(licensesDir) {
@@ -205,7 +205,7 @@
 }
 
 task copyDependencies(type: Copy) {
-   from configurations.compile
+   from configurations.runtimeClasspath.files
    into dependenciesDir
 }
 
@@ -352,7 +352,7 @@
 
 	into "/opt/${packageName}"
 	from(jar.outputs.files)
-	from(configurations.runtime) {
+	from(configurations.runtimeClasspath.files) {
 		into 'lib'
 	}
 	from('lib') {