Skip to content

WIP: Upgrade to Gradle 9.0.0 #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

WIP: Upgrade to Gradle 9.0.0 #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 34 additions & 24 deletions cj-btc-jsonrpc-integ-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
configurations {
integrationTestImplementation.extendsFrom testImplementation
integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
}
//configurations {
// integrationTestImplementation.extendsFrom testImplementation
// integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
//}

dependencies {
testImplementation project(':cj-btc-jsonrpc-gvy')
Expand All @@ -24,21 +24,21 @@ dependencies {
}

// Test Structure
sourceSets {
integrationTest {
compileClasspath += sourceSets.main.output
runtimeClasspath += sourceSets.main.output
java {
srcDir 'src/integ/java'
}
groovy {
srcDir 'src/integ/groovy'
}
resources {
srcDir 'src/integ/resources'
}
}
}
//sourceSets {
// integrationTest {
// compileClasspath += sourceSets.main.output
// runtimeClasspath += sourceSets.main.output
// java {
// srcDir 'src/integ/java'
// }
// groovy {
// srcDir 'src/integ/groovy'
// }
// resources {
// srcDir 'src/integ/resources'
// }
// }
//}

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

Expand All @@ -51,13 +51,23 @@ test {
}
}

tasks.register('integrationTest', Test) {
testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath
outputs.upToDateWhen { false }
testLogging.showStandardStreams = true
testing {
suites {
integrationTest(JvmTestSuite) {
dependencies {
implementation project()
}
}
}
}

//tasks.register('integrationTest', Test) {
// testClassesDirs = sourceSets.integrationTest.output.classesDirs
// classpath = sourceSets.integrationTest.runtimeClasspath
// outputs.upToDateWhen { false }
// testLogging.showStandardStreams = true
//}

tasks.register('regTest', Test) {
description = 'Runs integration tests against Bitcoin Core in regtest mode'
group = 'verification'
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if (JavaVersion.current().compareTo(JavaVersion.VERSION_17) < 0) {
if (JavaVersion.current().compareTo(JavaVersion.VERSION_21) >= 0) {
System.err.println "Including JDK 21 modules because Java is ${JavaVersion.current()}"
include 'consensusj-jsonrpc-cli' // JSON-RPC CLI library and tool
include 'cj-btc-cli' // Bitcoin JSON-RPC CLI
// include 'cj-btc-cli' // Bitcoin JSON-RPC CLI
} else {
System.err.println "Skipping JDK 21 modules, currently running Java ${JavaVersion.current()}"
}
Loading