Skip to content

Commit 9cdc77b

Browse files
committed
fix build.gradle
1 parent 919ed3c commit 9cdc77b

File tree

2 files changed

+5
-53
lines changed

2 files changed

+5
-53
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,17 @@ jobs:
5353
run: |
5454
brew install cmake boost
5555
56+
- name: Get Bitcoin submodule commit
57+
id: bitcoin-submodule
58+
run: echo "sha=$(git submodule status bitcoinkernel/bitcoin | awk '{print $1}')" >> $GITHUB_OUTPUT
59+
5660
- name: Cache Bitcoin Kernel build
5761
uses: actions/cache@v4
5862
with:
5963
path: |
6064
bitcoinkernel/bitcoin/build
6165
/usr/local/lib/libbitcoinkernel.*
62-
key: ${{ runner.os }}-bitcoinkernel-${{ hashFiles('bitcoinkernel/bitcoin/**') }}
66+
key: ${{ runner.os }}-bitcoinkernel-${{ steps.bitcoin-submodule.outputs.sha }}
6367
restore-keys: |
6468
${{ runner.os }}-bitcoinkernel-
6569

build.gradle

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ plugins {
44
}
55

66
dependencies {
7-
// JSON processing
8-
implementation 'com.google.code.gson:gson:2.10.1'
9-
107
// Testing
118
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
129
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
@@ -98,52 +95,3 @@ test {
9895
exceptionFormat "full"
9996
}
10097
}
101-
102-
// Task to run conformance handler
103-
tasks.register('conformanceHandler', Exec) {
104-
group = 'conformance'
105-
description = 'Run the conformance test handler (reads from stdin, writes to stdout)'
106-
107-
classpath = sourceSets.main.runtimeClasspath
108-
mainClass = 'org.bitcoinkernel.conformance.ConformanceTestHandler'
109-
110-
// Required for FFM
111-
jvmArgs = ['--enable-native-access=ALL-UNNAMED']
112-
113-
// Connect stdin/stdout
114-
standardInput = System.in
115-
standardOutput = System.out
116-
standardError = System.err
117-
}
118-
119-
// Build uber JAR with all dependencies
120-
tasks.register('buildConformanceJar', Jar) {
121-
group = 'conformance'
122-
description = 'Build standalone conformance handler JAR with all dependencies'
123-
124-
archiveBaseName = 'java-bitcoinkernel-conformance-handler'
125-
archiveVersion = '0.1.0'
126-
127-
from sourceSets.main.output
128-
129-
// Include all dependencies
130-
from {
131-
configurations.runtimeClasspath.collect {
132-
it.isDirectory() ? it : zipTree(it)
133-
}
134-
}
135-
136-
// Avoid duplicate files
137-
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
138-
139-
manifest {
140-
attributes(
141-
'Main-Class': 'org.bitcoinkernel.conformance.ConformanceTestHandler',
142-
'Implementation-Title': 'Java Bitcoin Kernel Conformance Handler',
143-
'Implementation-Version': archiveVersion.get()
144-
)
145-
}
146-
}
147-
148-
// Make conformance JAR depend on compilation
149-
buildConformanceJar.dependsOn compileJava

0 commit comments

Comments
 (0)