Revert "Convert subproject yubico-util-scala to test fixtures of yubi…

…co-util" This reverts commit ca4137c.
Yubico · Mar 25, 2020 · ac9fd21 · ac9fd21
1 parent 0fee105
commit ac9fd21
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/.../internal/util/scala/JavaConverters.scala → .../internal/util/scala/JavaConverters.scala b/.../internal/util/scala/JavaConverters.scala → .../internal/util/scala/JavaConverters.scala
diff --git a/...ubico/scalacheck/gen/JavaGenerators.scala → ...ubico/scalacheck/gen/JavaGenerators.scala b/...ubico/scalacheck/gen/JavaGenerators.scala → ...ubico/scalacheck/gen/JavaGenerators.scala
diff --git 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'),