Skip to content

Commit 2ea625c

Browse files
committed
Revert "Use test fixtures feature of Gradle 6"
This reverts commit 7f040fd.
1 parent 9d1247d commit 2ea625c

File tree

16 files changed

+12
-16
lines changed

16 files changed

+12
-16
lines changed

webauthn-server-attestation/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ dependencies {
1717

1818
implementation(
1919
project(':yubico-util'),
20-
addVersion('com.fasterxml.jackson.core:jackson-databind'),
2120
addVersion('com.google.guava:guava'),
21+
addVersion('com.fasterxml.jackson.core:jackson-databind'),
2222
addVersion('org.bouncycastle:bcprov-jdk15on'),
2323
addVersion('org.slf4j:slf4j-api'),
2424
)
2525

2626
testImplementation(
27+
project(':webauthn-server-core').sourceSets.test.output,
2728
project(':yubico-util-scala'),
28-
testFixtures(project(':webauthn-server-core')),
2929
addVersion('junit:junit'),
3030
addVersion('org.mockito:mockito-core'),
3131
addVersion('org.scala-lang:scala-library'),
@@ -36,6 +36,10 @@ dependencies {
3636
testRuntimeOnly(
3737
addVersion('ch.qos.logback:logback-classic'),
3838
)
39+
testRuntimeOnly(
40+
// Transitive dependency from :webauthn-server-core:test
41+
addVersion('org.bouncycastle:bcpkix-jdk15on'),
42+
)
3943
}
4044

4145

webauthn-server-core/build.gradle

Lines changed: 2 additions & 13 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
id 'info.solidsoft.pitest'
65
}
@@ -25,24 +24,14 @@ dependencies {
2524
addVersion('org.slf4j:slf4j-api'),
2625
)
2726

28-
testFixturesApi(
29-
addVersion('com.augustcellars.cose:cose-java'),
30-
addVersion('org.scala-lang:scala-library'),
31-
addVersion('org.scalacheck:scalacheck_2.13'),
32-
)
33-
34-
testFixturesImplementation(
35-
project(':yubico-util-scala'),
36-
addVersion('com.upokecenter:cbor'),
37-
addVersion('org.bouncycastle:bcpkix-jdk15on'),
38-
)
39-
4027
testImplementation(
4128
project(':yubico-util-scala'),
4229
addVersion('com.fasterxml.jackson.datatype:jackson-datatype-jdk8'),
4330
addVersion('junit:junit'),
31+
addVersion('org.bouncycastle:bcpkix-jdk15on'),
4432
addVersion('org.mockito:mockito-core'),
4533
addVersion('org.scala-lang:scala-library'),
34+
addVersion('org.scalacheck:scalacheck_2.13'),
4635
addVersion('org.scalatest:scalatest_2.13'),
4736
)
4837

0 commit comments

Comments
 (0)