Merge pull request #52 from Yubico/gradle-6

Upgrade to Gradle 6

Author: emlun

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [8, 11, 13]
 
     steps:
     - name: Check out code

build.gradle

@@ -30,7 +30,7 @@ if (publishEnabled) {
 }
 
 wrapper {
-  gradleVersion = '5.4'
+  gradleVersion = '6.1'
 }
 
 allprojects {
@@ -69,9 +69,9 @@ Map<String, String> dependencyVersions = [
   'org.glassfish.jersey.containers:jersey-container-servlet:2.26',
   'org.glassfish.jersey.inject:jersey-hk2:2.26',
   'org.mockito:mockito-core:2.27.0',
-  'org.scala-lang:scala-library:2.12.8',
-  'org.scalacheck:scalacheck_2.12:1.14.0',
-  'org.scalatest:scalatest_2.12:3.0.4',
+  'org.scala-lang:scala-library:2.13.1',
+  'org.scalacheck:scalacheck_2.13:1.14.0',
+  'org.scalatest:scalatest_2.13:3.0.8',
   'org.slf4j:slf4j-api:1.7.25',
 ].collectEntries { [(it.split(':')[0..1].join(':')): it] }
 rootProject.ext.addVersion = { dep -> dependencyVersions[dep] }
@@ -138,9 +138,9 @@ subprojects { project ->
   }
 
   if (project.hasProperty('publishMe') && project.publishMe) {
-    task sourcesJar(type: Jar) {
-      archiveClassifier = 'sources'
-      from sourceSets.main.allSource
+    java {
+      withJavadocJar()
+      withSourcesJar()
     }
 
     task delombok(type: DelombokTask, dependsOn: classes) {
@@ -165,11 +165,6 @@ subprojects { project ->
       options.addStringOption('charset', 'UTF-8')
     }
 
-    task javadocJar(type: Jar) {
-      archiveClassifier = 'javadoc'
-      from javadoc
-    }
-
     rootProject.tasks.assembleJavadoc {
       dependsOn javadoc
       inputs.dir javadoc.destinationDir
@@ -187,9 +182,7 @@ subprojects { project ->
     publishing {
       publications {
         jars(MavenPublication) {
-          from components.java
-          artifact javadocJar
-          artifact sourcesJar
+          setArtifacts([jar, javadocJar, sourcesJar])
 
           pom {
             name = project.name

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -154,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew

@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,

gradlew.bat

@@ -3,7 +3,6 @@ include ':webauthn-server-attestation'
 include ':webauthn-server-core'
 include ':webauthn-server-demo'
 include ':yubico-util'
-include ':yubico-util-scala'
 
 include ':test-dependent-projects:java-dep-webauthn-server-attestation'
 include ':test-dependent-projects:java-dep-webauthn-server-core'

settings.gradle

@@ -17,24 +17,24 @@ dependencies {
 
   implementation(
     project(':yubico-util'),
-    addVersion('com.google.guava:guava'),
     addVersion('com.fasterxml.jackson.core:jackson-databind'),
+    addVersion('com.google.guava:guava'),
     addVersion('org.bouncycastle:bcprov-jdk15on'),
     addVersion('org.slf4j:slf4j-api'),
   )
 
   testImplementation(
-    project(':webauthn-server-core').sourceSets.test.output,
-    project(':yubico-util-scala'),
+    testFixtures(project(':yubico-util')),
+    testFixtures(project(':webauthn-server-core')),
     addVersion('junit:junit'),
     addVersion('org.mockito:mockito-core'),
     addVersion('org.scala-lang:scala-library'),
-    addVersion('org.scalacheck:scalacheck_2.12'),
-    addVersion('org.scalatest:scalatest_2.12'),
+    addVersion('org.scalacheck:scalacheck_2.13'),
+    addVersion('org.scalatest:scalatest_2.13'),
   )
+
   testRuntimeOnly(
-    // Transitive dependency from :webauthn-server-core:test
-    addVersion('org.bouncycastle:bcpkix-jdk15on'),
+    addVersion('ch.qos.logback:logback-classic'),
   )
 }
 

webauthn-server-attestation/build.gradle

@@ -0,0 +1,15 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSSZ} [%thread] %-5level %logger{36} - %msg%n%rEx</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="com.yubico" level="TRACE"/>
+
+</configuration>

webauthn-server-attestation/src/test/resources/logback.xml

@@ -42,9 +42,9 @@ import com.yubico.webauthn.test.Helpers
 import org.junit.runner.RunWith
 import org.scalatest.FunSpec
 import org.scalatest.Matchers
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 
 @RunWith(classOf[JUnitRunner])
@@ -60,7 +60,7 @@ class DeviceIdentificationSpec extends FunSpec with Matchers {
   describe("A RelyingParty with the default StandardMetadataService") {
 
     describe("correctly identifies") {
-      def check(expectedName: String, testData: RealExamples.Example, transports: Set[Transport]) {
+      def check(expectedName: String, testData: RealExamples.Example, transports: Set[Transport]): Unit = {
         val rp = RelyingParty.builder()
           .identity(testData.rp)
           .credentialRepository(Helpers.CredentialRepository.empty)
@@ -114,7 +114,7 @@ class DeviceIdentificationSpec extends FunSpec with Matchers {
 
   describe("The default AttestationResolver") {
     describe("successfully identifies") {
-      def check(expectedName: String, testData: RealExamples.Example, transports: Set[Transport]) {
+      def check(expectedName: String, testData: RealExamples.Example, transports: Set[Transport]): Unit = {
         val cert = CertificateParser.parseDer(testData.attestationCert.getBytes)
         val resolved = StandardMetadataService.createDefaultAttestationResolver().resolve(cert)
         resolved.isPresent should be (true)