Skip to content

Commit eb07586

Browse files
committed
WIP: Upgrade to Gradle 9.0.0
Note that the cj-btc-cli module is currently disabled and cj-btc-jsonrpc-integ-test is in a hacked-up state. It looks like the main issue is the ad-hoc mechanism we used to configure integrationTest conflicts with built-in mechanism that should be used instead.
1 parent b525309 commit eb07586

File tree

2 files changed

+35
-25
lines changed

2 files changed

+35
-25
lines changed

cj-btc-jsonrpc-integ-test/build.gradle

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
configurations {
2-
integrationTestImplementation.extendsFrom testImplementation
3-
integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
4-
}
1+
//configurations {
2+
// integrationTestImplementation.extendsFrom testImplementation
3+
// integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
4+
//}
55

66
dependencies {
77
testImplementation project(':cj-btc-jsonrpc-gvy')
@@ -24,21 +24,21 @@ dependencies {
2424
}
2525

2626
// Test Structure
27-
sourceSets {
28-
integrationTest {
29-
compileClasspath += sourceSets.main.output
30-
runtimeClasspath += sourceSets.main.output
31-
java {
32-
srcDir 'src/integ/java'
33-
}
34-
groovy {
35-
srcDir 'src/integ/groovy'
36-
}
37-
resources {
38-
srcDir 'src/integ/resources'
39-
}
40-
}
41-
}
27+
//sourceSets {
28+
// integrationTest {
29+
// compileClasspath += sourceSets.main.output
30+
// runtimeClasspath += sourceSets.main.output
31+
// java {
32+
// srcDir 'src/integ/java'
33+
// }
34+
// groovy {
35+
// srcDir 'src/integ/groovy'
36+
// }
37+
// resources {
38+
// srcDir 'src/integ/resources'
39+
// }
40+
// }
41+
//}
4242

4343
def infuraApiKeyOrEmpty = System.env.INFURA_API_KEY ?: project.findProperty('infuraApiKey') ?: ''
4444

@@ -51,13 +51,23 @@ test {
5151
}
5252
}
5353

54-
tasks.register('integrationTest', Test) {
55-
testClassesDirs = sourceSets.integrationTest.output.classesDirs
56-
classpath = sourceSets.integrationTest.runtimeClasspath
57-
outputs.upToDateWhen { false }
58-
testLogging.showStandardStreams = true
54+
testing {
55+
suites {
56+
integrationTest(JvmTestSuite) {
57+
dependencies {
58+
implementation project()
59+
}
60+
}
61+
}
5962
}
6063

64+
//tasks.register('integrationTest', Test) {
65+
// testClassesDirs = sourceSets.integrationTest.output.classesDirs
66+
// classpath = sourceSets.integrationTest.runtimeClasspath
67+
// outputs.upToDateWhen { false }
68+
// testLogging.showStandardStreams = true
69+
//}
70+
6171
tasks.register('regTest', Test) {
6272
description = 'Runs integration tests against Bitcoin Core in regtest mode'
6373
group = 'verification'

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if (JavaVersion.current().compareTo(JavaVersion.VERSION_17) < 0) {
4343
if (JavaVersion.current().compareTo(JavaVersion.VERSION_21) >= 0) {
4444
System.err.println "Including JDK 21 modules because Java is ${JavaVersion.current()}"
4545
include 'consensusj-jsonrpc-cli' // JSON-RPC CLI library and tool
46-
include 'cj-btc-cli' // Bitcoin JSON-RPC CLI
46+
// include 'cj-btc-cli' // Bitcoin JSON-RPC CLI
4747
} else {
4848
System.err.println "Skipping JDK 21 modules, currently running Java ${JavaVersion.current()}"
4949
}

0 commit comments

Comments
 (0)