From ac9fd2156f38a1713331d50e6eb51a79a2b21a53 Mon Sep 17 00:00:00 2001
From: Emil Lundberg <emil@yubico.com>
Date: Wed, 25 Mar 2020 15:49:55 +0100
Subject: [PATCH] Revert "Convert subproject yubico-util-scala to test fixtures
 of yubico-util"

This reverts commit ca4137c3d2c94916d48258076cfb970d049e3478.
---
 settings.gradle                                   |  1 +
 webauthn-server-attestation/build.gradle          |  2 +-
 webauthn-server-core/build.gradle                 |  4 ++--
 webauthn-server-demo/build.gradle                 |  2 +-
 yubico-util-scala/build.gradle                    | 15 +++++++++++++++
 .../internal/util/scala/JavaConverters.scala      |  0
 .../yubico/scalacheck/gen/JavaGenerators.scala    |  0
 yubico-util/build.gradle                          |  7 +------
 8 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 yubico-util-scala/build.gradle
 rename {yubico-util/src/testFixtures => yubico-util-scala/src/main}/scala/com/yubico/internal/util/scala/JavaConverters.scala (100%)
 rename {yubico-util/src/testFixtures => yubico-util-scala/src/main}/scala/com/yubico/scalacheck/gen/JavaGenerators.scala (100%)

diff --git a/settings.gradle b/settings.gradle
index e3581443b..14392fbb1 100644
--- a/settings.gradle
+++ b/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'
diff --git a/webauthn-server-attestation/build.gradle b/webauthn-server-attestation/build.gradle
index 1738ae677..28ce64489 100644
--- a/webauthn-server-attestation/build.gradle
+++ b/webauthn-server-attestation/build.gradle
@@ -24,7 +24,7 @@ dependencies {
   )
 
   testImplementation(
-    testFixtures(project(':yubico-util')),
+    project(':yubico-util-scala'),
     testFixtures(project(':webauthn-server-core')),
     addVersion('junit:junit'),
     addVersion('org.mockito:mockito-core'),
diff --git a/webauthn-server-core/build.gradle b/webauthn-server-core/build.gradle
index 4e0e70043..cb05a94a1 100644
--- a/webauthn-server-core/build.gradle
+++ b/webauthn-server-core/build.gradle
@@ -32,13 +32,13 @@ dependencies {
   )
 
   testFixturesImplementation(
-    testFixtures(project(':yubico-util')),
+    project(':yubico-util-scala'),
     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.mockito:mockito-core'),
diff --git a/webauthn-server-demo/build.gradle b/webauthn-server-demo/build.gradle
index ac243004a..bccf6ced0 100644
--- a/webauthn-server-demo/build.gradle
+++ b/webauthn-server-demo/build.gradle
@@ -48,7 +48,7 @@ dependencies {
   )
 
   testImplementation(
-    testFixtures(project(':yubico-util')),
+    project(':yubico-util-scala'),
     testFixtures(project(':webauthn-server-core')),
 
     addVersion('junit:junit'),
diff --git a/yubico-util-scala/build.gradle b/yubico-util-scala/build.gradle
new file mode 100644
index 000000000..c2827bc48
--- /dev/null
+++ b/yubico-util-scala/build.gradle
@@ -0,0 +1,15 @@
+plugins {
+  id 'scala'
+}
+
+description = 'Yubico internal Scala utilities'
+
+dependencies {
+
+  implementation(
+    addVersion('org.scala-lang:scala-library'),
+    addVersion('org.scalacheck:scalacheck_2.13'),
+  )
+
+}
+
diff --git a/yubico-util/src/testFixtures/scala/com/yubico/internal/util/scala/JavaConverters.scala b/yubico-util-scala/src/main/scala/com/yubico/internal/util/scala/JavaConverters.scala
similarity index 100%
rename from yubico-util/src/testFixtures/scala/com/yubico/internal/util/scala/JavaConverters.scala
rename to yubico-util-scala/src/main/scala/com/yubico/internal/util/scala/JavaConverters.scala
diff --git a/yubico-util/src/testFixtures/scala/com/yubico/scalacheck/gen/JavaGenerators.scala b/yubico-util-scala/src/main/scala/com/yubico/scalacheck/gen/JavaGenerators.scala
similarity index 100%
rename from yubico-util/src/testFixtures/scala/com/yubico/scalacheck/gen/JavaGenerators.scala
rename to yubico-util-scala/src/main/scala/com/yubico/scalacheck/gen/JavaGenerators.scala
diff --git a/yubico-util/build.gradle b/yubico-util/build.gradle
index aa5f0edc4..494377a80 100644
--- a/yubico-util/build.gradle
+++ b/yubico-util/build.gradle
@@ -1,6 +1,5 @@
 plugins {
   id 'java-library'
-  id 'java-test-fixtures'
   id 'scala'
 }
 
@@ -22,12 +21,8 @@ dependencies {
     addVersion('org.slf4j:slf4j-api'),
   )
 
-  testFixturesApi(
-    addVersion('org.scala-lang:scala-library'),
-    addVersion('org.scalacheck:scalacheck_2.13'),
-  )
-
   testImplementation(
+    project(':yubico-util-scala'),
     addVersion('junit:junit'),
     addVersion('org.scala-lang:scala-library'),
     addVersion('org.scalacheck:scalacheck_2.13'),