Gradle update fixes

promovicz · promovicz · commit add034d27abd · 2021-03-19T02:42:51.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,6 @@ repositories {
 allprojects {
     apply plugin: 'java'
     apply plugin: 'idea'
-    apply plugin: 'maven'
 
     group 'org.openjavacard.tools'
     version '0.1-SNAPSHOT'
@@ -16,6 +15,11 @@ allprojects {
         mavenCentral()
     }
 
+    java {
+        //withSourcesJar()
+        //withJavadocJar()
+    }
+
     idea {
         module {
             downloadJavadoc = true
diff --git a/cap-file/build.gradle b/cap-file/build.gradle
@@ -4,13 +4,13 @@ archivesBaseName = 'openjavacard-cap-file'
 sourceCompatibility = 1.8
 
 dependencies {
-    compile project(':common')
+    api project(':common')
 
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
 
-    testCompile project(':cap-testing')
+    testImplementation project(':cap-testing')
 
     // https://mvnrepository.com/artifact/junit/junit
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
diff --git a/cap-model/build.gradle b/cap-model/build.gradle
@@ -4,14 +4,14 @@ archivesBaseName = 'openjavacard-cap-model'
 sourceCompatibility = 1.8
 
 dependencies {
-    compile project(':common')
-    compile project(':cap-file')
+    api project(':common')
+    api project(':cap-file')
 
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.8'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.8'
 
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     // https://mvnrepository.com/artifact/junit/junit
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
diff --git a/cap-testing/build.gradle b/cap-testing/build.gradle
@@ -5,7 +5,7 @@ sourceCompatibility = 1.8
 
 dependencies {
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     // https://mvnrepository.com/artifact/junit/junit
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -5,9 +5,9 @@ sourceCompatibility = 1.8
 
 dependencies {
     // https://mvnrepository.com/artifact/commons-codec/commons-codec
-    compile group: 'commons-codec', name: 'commons-codec', version: '1.11'
+    implementation group: 'commons-codec', name: 'commons-codec', version: '1.11'
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     // https://mvnrepository.com/artifact/junit/junit
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
diff --git a/globalplatform/build.gradle b/globalplatform/build.gradle
@@ -4,13 +4,13 @@ archivesBaseName = 'openjavacard-globalplatform'
 sourceCompatibility = 1.8
 
 dependencies {
-    compile project(':common')
-    compile project(':cap-file')
+    api project(':common')
+    api project(':cap-file')
 
     // https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk16
-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.59'
+    implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.59'
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     // https://mvnrepository.com/artifact/junit/junit
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
diff --git a/jackson/build.gradle b/jackson/build.gradle
@@ -4,13 +4,13 @@ archivesBaseName = 'openjavacard-jackson'
 sourceCompatibility = 1.8
 
 dependencies {
-    compile project(':common')
-    compile project(':globalplatform')
+    api project(':common')
+    api project(':globalplatform')
 
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.8'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.10'
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.8'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10'
     // https://mvnrepository.com/artifact/junit/junit
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
diff --git a/packaging/build.gradle b/packaging/build.gradle
@@ -4,11 +4,11 @@ archivesBaseName = 'openjavacard-packaging'
 sourceCompatibility = 1.8
 
 dependencies {
-    compile project(':common')
-    compile project(':globalplatform')
+    api project(':common')
+    api project(':globalplatform')
 
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     // https://mvnrepository.com/artifact/junit/junit
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
diff --git a/run-debug.sh b/run-debug.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 home=`dirname $0`
-java -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG -jar $home/tool/build/jar/openjavacard-tool-0.1-SNAPSHOT-fat.jar "$@"
+java -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG -jar $home/tool/build/libs/openjavacard-tool-fat-0.1-SNAPSHOT.jar "$@"
diff --git a/run-trace.sh b/run-trace.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 home=`dirname $0`
-java -Dorg.slf4j.simpleLogger.defaultLogLevel=TRACE -jar $home/tool/build/jar/openjavacard-tool-0.1-SNAPSHOT-fat.jar "$@"
+java -Dorg.slf4j.simpleLogger.defaultLogLevel=TRACE -jar $home/tool/build/libs/openjavacard-tool-fat-0.1-SNAPSHOT.jar "$@"
diff --git a/testbench/build.gradle b/testbench/build.gradle
@@ -4,21 +4,20 @@ archivesBaseName = 'openjavacard-testbench'
 sourceCompatibility = 1.8
 
 dependencies {
-    compile project(':cap-file')
-    compile project(':globalplatform')
+    api project(':cap-file')
+    api project(':globalplatform')
 
     // https://mvnrepository.com/artifact/com.beust/jcommander
-    compile group: 'com.beust', name: 'jcommander', version: '1.72'
+    implementation group: 'com.beust', name: 'jcommander', version: '1.72'
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-simple
-    compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
     // https://mvnrepository.com/artifact/junit/junit
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
 jar {
-    destinationDir = file('./build/jar/')
     manifest {
         attributes(
                 'Main-Class': 'org.openjavacard.testbench.main.Main'
@@ -28,8 +27,6 @@ jar {
 
 task fatJar(type: Jar) {
     manifest.from jar.manifest
-    destinationDir = file('./build/jar/')
-    classifier = 'fat'
     from {
         configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) }
     } {
diff --git a/tool/build.gradle b/tool/build.gradle
@@ -4,32 +4,31 @@ archivesBaseName = 'openjavacard-tool'
 sourceCompatibility = 1.8
 
 dependencies {
-    compile project(':cap-file')
-    compile project(':cap-model')
-    compile project(':jackson')
+    api project(':cap-file')
+    api project(':cap-model')
+    api project(':jackson')
 
-    compile project(':globalplatform')
-    compile project(':packaging')
+    api project(':globalplatform')
+    api project(':packaging')
 
     // https://mvnrepository.com/artifact/com.beust/jcommander
-    compile group: 'com.beust', name: 'jcommander', version: '1.72'
+    implementation group: 'com.beust', name: 'jcommander', version: '1.72'
 
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml
-    compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: '2.9.8'
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: '2.9.8'
     // https://mvnrepository.com/artifact/org.codehaus.woodstox/woodstox-core-asl
-    compile group: 'com.fasterxml.woodstox', name: 'woodstox-core', version: '5.2.0'
+    implementation group: 'com.fasterxml.woodstox', name: 'woodstox-core', version: '5.2.0'
 
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-simple
-    compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
 
     // https://mvnrepository.com/artifact/junit/junit
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
 jar {
-    destinationDir = file('./build/jar/')
     manifest {
         attributes(
                 'Main-Class': 'org.openjavacard.tool.main.Main'
@@ -39,10 +38,9 @@ jar {
 
 task fatJar(type: Jar) {
     manifest.from jar.manifest
-    destinationDir = file('./build/jar/')
-    classifier = 'fat'
+    baseName = archivesBaseName + '-fat'
     from {
-        configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     } {
         exclude "META-INF/*.SF"
         exclude "META-INF/*.DSA"

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ sourceCompatibility = 1.8`
`5`	`5`
`6`	`6`	`dependencies {`
`7`	`7`	`// https://mvnrepository.com/artifact/org.slf4j/slf4j-api`
`8`		`- compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'`
	`8`	`+ implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'`
`9`	`9`	`// https://mvnrepository.com/artifact/junit/junit`
`10`		`- testCompile group: 'junit', name: 'junit', version: '4.12'`
	`10`	`+ testImplementation group: 'junit', name: 'junit', version: '4.12'`
`11`	`11`	`}`