Skip to content
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

Require Java 21 for jsonrpc-cli and btc-cli #137

Merged
merged 1 commit into from
Sep 20, 2023
Merged

Require Java 21 for jsonrpc-cli and btc-cli #137

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
2 changes: 1 addition & 1 deletion cj-btc-cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
ext.moduleName = 'org.consensusj.bitcoin.cli'

tasks.withType(JavaCompile) {
options.release = 17
options.release = 21
}

configurations {
Expand Down
2 changes: 1 addition & 1 deletion consensusj-jsonrpc-cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

tasks.withType(JavaCompile) {
options.release = 17
options.release = 21
}

configurations {
Expand Down
15 changes: 11 additions & 4 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ if (!JavaVersion.current().isJava11Compatible()) {
}

// JDK 8
include 'cj-bitcoinj-util' // BlockUtil (and future stuff depending on only bitcoinj)
include 'cj-bitcoinj-dsl-gvy' // Groovy DSL for bitcoinj

// JDK 9
include 'cj-bitcoinj-util' // BlockUtil (and future stuff depending on only bitcoinj)

// JDK 11
include 'consensusj-analytics' // Reactive analytics libraries
include 'consensusj-currency' // JavaMoney Currency Provider(s)
Expand All @@ -31,16 +33,21 @@ if (!JavaVersion.current().isJava11Compatible()) {
include 'cj-nmc-jsonrpc' // Namecoin JSON-RPC client (experimental)

if (JavaVersion.current().compareTo(JavaVersion.VERSION_17) >= 0) {
System.err.println "Including JDK 17 modules because Java ${JavaVersion.current()} is JDK 17+"
System.err.println "Including JDK 17 modules because Java is ${JavaVersion.current()}"
include 'consensusj-jsonrpc-daemon' // JSON-RPC sample server
include 'cj-bitcoinj-spock' // Spock tests/demos of basic bitcoinj capabilities
include 'cj-bitcoinj-dsl-js' // JavaScript DSL for bitcoinj via Nashorn
include 'cj-btc-daemon' // Prototype Micronaut version of Bitcoin daemon
include 'cj-btc-jsonrpc-integ-test' // RPC-based integration tests of/using bitcoind
include 'cj-btc-services' // bitcoinj-based service objects
include 'consensusj-jsonrpc-cli' // JSON-RPC CLI library and tool
include 'cj-btc-cli' // Bitcoin JSON-RPC CLI
} else {
System.err.println "Skipping JDK 17 modules, currently running Java ${JavaVersion.current()}"
}

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
} else {
System.err.println "Skipping JDK 21 modules, currently running Java ${JavaVersion.current()}"
}