Revert Gradle test-fixtures changes

These things messed up the dependencies in the exported POMs. The first
commit that exhibits these issues is
7f040fd.

See also: #62

Author: emlun

build.gradle

@@ -138,9 +138,9 @@ subprojects { project ->
   }
 
   if (project.hasProperty('publishMe') && project.publishMe) {
-    java {
-      withJavadocJar()
-      withSourcesJar()
+    task sourcesJar(type: Jar) {
+      archiveClassifier = 'sources'
+      from sourceSets.main.allSource
     }
 
     task delombok(type: DelombokTask, dependsOn: classes) {
@@ -165,6 +165,11 @@ subprojects { project ->
       options.addStringOption('charset', 'UTF-8')
     }
 
+    task javadocJar(type: Jar) {
+      archiveClassifier = 'javadoc'
+      from javadoc
+    }
+
     rootProject.tasks.assembleJavadoc {
       dependsOn javadoc
       inputs.dir javadoc.destinationDir
@@ -182,7 +187,9 @@ subprojects { project ->
     publishing {
       publications {
         jars(MavenPublication) {
-          setArtifacts([jar, javadocJar, sourcesJar])
+          from components.java
+          artifact javadocJar
+          artifact sourcesJar
 
           pom {
             name = project.name

settings.gradle

@@ -3,6 +3,7 @@ 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'

webauthn-server-attestation/build.gradle

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

webauthn-server-core/build.gradle

@@ -1,6 +1,5 @@
 plugins {
   id 'java-library'
-  id 'java-test-fixtures'
   id 'scala'
   id 'info.solidsoft.pitest'
 }
@@ -25,24 +24,14 @@ dependencies {
     addVersion('org.slf4j:slf4j-api'),
   )
 
-  testFixturesApi(
-    addVersion('com.augustcellars.cose:cose-java'),
-    addVersion('org.scala-lang:scala-library'),
-    addVersion('org.scalacheck:scalacheck_2.13'),
-  )
-
-  testFixturesImplementation(
-    testFixtures(project(':yubico-util')),
-    addVersion('com.upokecenter:cbor'),
-    addVersion('org.bouncycastle:bcpkix-jdk15on'),
-  )
-
   testImplementation(
-    testFixtures(project(':yubico-util')),
+    project(':yubico-util-scala'),
     addVersion('com.fasterxml.jackson.datatype:jackson-datatype-jdk8'),
     addVersion('junit:junit'),
+    addVersion('org.bouncycastle:bcpkix-jdk15on'),
     addVersion('org.mockito:mockito-core'),
     addVersion('org.scala-lang:scala-library'),
+    addVersion('org.scalacheck:scalacheck_2.13'),
     addVersion('org.scalatest:scalatest_2.13'),
   )
 
@@ -77,10 +66,6 @@ jar {
 pitest {
   pitestVersion = '1.4.11'
 
-  // Workaround to an incompatibility issue between Gradle and gradle-pitest
-  // See https://github.com/szpak/gradle-pitest-plugin/issues/173
-  testSourceSets.add(sourceSets.main)
-
   timestampedReports = false
   outputFormats = ['XML', 'HTML']
 
@@ -93,6 +78,3 @@ pitest {
   ]
 }
 
-// Workaround to an incompatibility issue between Gradle and gradle-pitest
-// See https://github.com/szpak/gradle-pitest-plugin/issues/173
-task mainClasses {}