Skip to content

Commit ac9fd21

Browse files
committed
Revert "Convert subproject yubico-util-scala to test fixtures of yubico-util"
This reverts commit ca4137c.
1 parent 0fee105 commit ac9fd21

File tree

8 files changed

+21
-10
lines changed

8 files changed

+21
-10
lines changed

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include ':webauthn-server-attestation'
33
include ':webauthn-server-core'
44
include ':webauthn-server-demo'
55
include ':yubico-util'
6+
include ':yubico-util-scala'
67

78
include ':test-dependent-projects:java-dep-webauthn-server-attestation'
89
include ':test-dependent-projects:java-dep-webauthn-server-core'

webauthn-server-attestation/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
)
2525

2626
testImplementation(
27-
testFixtures(project(':yubico-util')),
27+
project(':yubico-util-scala'),
2828
testFixtures(project(':webauthn-server-core')),
2929
addVersion('junit:junit'),
3030
addVersion('org.mockito:mockito-core'),

webauthn-server-core/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ dependencies {
3232
)
3333

3434
testFixturesImplementation(
35-
testFixtures(project(':yubico-util')),
35+
project(':yubico-util-scala'),
3636
addVersion('com.upokecenter:cbor'),
3737
addVersion('org.bouncycastle:bcpkix-jdk15on'),
3838
)
3939

4040
testImplementation(
41-
testFixtures(project(':yubico-util')),
41+
project(':yubico-util-scala'),
4242
addVersion('com.fasterxml.jackson.datatype:jackson-datatype-jdk8'),
4343
addVersion('junit:junit'),
4444
addVersion('org.mockito:mockito-core'),

webauthn-server-demo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies {
4848
)
4949

5050
testImplementation(
51-
testFixtures(project(':yubico-util')),
51+
project(':yubico-util-scala'),
5252
testFixtures(project(':webauthn-server-core')),
5353

5454
addVersion('junit:junit'),

yubico-util-scala/build.gradle

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
plugins {
2+
id 'scala'
3+
}
4+
5+
description = 'Yubico internal Scala utilities'
6+
7+
dependencies {
8+
9+
implementation(
10+
addVersion('org.scala-lang:scala-library'),
11+
addVersion('org.scalacheck:scalacheck_2.13'),
12+
)
13+
14+
}
15+

yubico-util/build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
id 'java-library'
3-
id 'java-test-fixtures'
43
id 'scala'
54
}
65

@@ -22,12 +21,8 @@ dependencies {
2221
addVersion('org.slf4j:slf4j-api'),
2322
)
2423

25-
testFixturesApi(
26-
addVersion('org.scala-lang:scala-library'),
27-
addVersion('org.scalacheck:scalacheck_2.13'),
28-
)
29-
3024
testImplementation(
25+
project(':yubico-util-scala'),
3126
addVersion('junit:junit'),
3227
addVersion('org.scala-lang:scala-library'),
3328
addVersion('org.scalacheck:scalacheck_2.13'),

0 commit comments

Comments
 (0)