Skip to content

Commit 28e68f3

Browse files
authored
feat: update dependencies (#177)
1 parent 1033e0b commit 28e68f3

File tree

7 files changed

+193
-194
lines changed

7 files changed

+193
-194
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
- name: Set up Java
2424
uses: actions/setup-java@v2
2525
with:
26-
java-version: '8'
27-
distribution: 'adopt'
26+
java-version: "22"
27+
distribution: "adopt"
2828

2929
- name: Publish to the Maven Central Repository
3030
run: gradle publish

.github/workflows/test.yml

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,65 +6,64 @@ on:
66
- "master"
77
- "develop"
88
pull_request:
9-
types: [ ready_for_review, synchronize, opened ]
9+
types: [ready_for_review, synchronize, opened]
1010

1111
jobs:
1212
format:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- name: Checkout code
17-
uses: actions/checkout@v2
18-
with:
19-
ref: ${{ github.head_ref }}
16+
- name: Checkout code
17+
uses: actions/checkout@v2
18+
with:
19+
ref: ${{ github.head_ref }}
2020

21-
- name: Merge Conflict finder
22-
uses: olivernybroe/[email protected]
21+
- name: Merge Conflict finder
22+
uses: olivernybroe/[email protected]
2323

24-
- name: Use Java Version ${{ matrix.java }}
25-
uses: actions/setup-java@v2
26-
with:
27-
distribution: 'adopt'
28-
java-version: 8
29-
cache: 'gradle'
24+
- name: Use Java Version ${{ matrix.java }}
25+
uses: actions/setup-java@v2
26+
with:
27+
distribution: "adopt"
28+
java-version: 22
29+
cache: "gradle"
3030

31-
- name: Format code
32-
run: gradle format
31+
- name: Format code
32+
run: gradle format
3333

34-
- name: Commit fixed code
35-
uses: stefanzweifel/git-auto-commit-action@v4
36-
with:
37-
commit_message: "style: resolve style guide violations"
38-
branch: ${{ github.head_ref }}
34+
- name: Commit fixed code
35+
uses: stefanzweifel/git-auto-commit-action@v4
36+
with:
37+
commit_message: "style: resolve style guide violations"
38+
branch: ${{ github.head_ref }}
3939

4040
unit:
4141
runs-on: ubuntu-latest
4242
strategy:
4343
matrix:
44-
# test against the latest update of each major Java version, as well as specific updates of LTS versions:
45-
java: [ 8, 11, 15, 16, 17 ]
44+
java: [11, 15, 16, 17, 18, 19, 20, 21, 22]
4645

4746
steps:
48-
- name: Checkout code
49-
uses: actions/checkout@v2
50-
with:
51-
ref: ${{ github.head_ref }}
47+
- name: Checkout code
48+
uses: actions/checkout@v2
49+
with:
50+
ref: ${{ github.head_ref }}
5251

53-
- name: Merge Conflict finder
54-
uses: olivernybroe/[email protected]
52+
- name: Merge Conflict finder
53+
uses: olivernybroe/[email protected]
5554

56-
- name: Use Java Version ${{ matrix.java }}
57-
uses: actions/setup-java@v2
58-
with:
59-
distribution: 'zulu'
60-
java-version: ${{ matrix.java }}
61-
cache: 'gradle'
55+
- name: Use Java Version ${{ matrix.java }}
56+
uses: actions/setup-java@v2
57+
with:
58+
distribution: "zulu"
59+
java-version: ${{ matrix.java }}
60+
cache: "gradle"
6261

63-
- name: Install
64-
run: gradle dependencies
62+
- name: Install
63+
run: gradle dependencies
6564

66-
- name: Test
67-
run: gradle test && gradle jacocoTestReport
65+
- name: Test
66+
run: gradle test && gradle jacocoTestReport
6867

69-
- name: Codecov
70-
run: bash <(curl -s https://codecov.io/bash) -t ${{ secrets.CODECOV_TOKEN }}
68+
- name: Codecov
69+
run: bash <(curl -s https://codecov.io/bash) -t ${{ secrets.CODECOV_TOKEN }}

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"java.compile.nullAnalysis.mode": "automatic",
3+
"java.configuration.updateBuildConfiguration": "automatic"
4+
}

build.gradle

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,36 @@ plugins {
33
id 'maven-publish'
44
id 'signing'
55
id 'jacoco'
6-
id 'com.diffplug.spotless' version '5.6.1'
6+
id 'com.diffplug.spotless' version '6.25.0'
77
}
88

99
group = 'org.arkecosystem'
1010
version = '2.0.0'
1111

12-
sourceCompatibility = 1.8
13-
targetCompatibility = 1.8
12+
java {
13+
sourceCompatibility = JavaVersion.VERSION_1_8
14+
targetCompatibility = JavaVersion.VERSION_1_8
15+
withJavadocJar()
16+
withSourcesJar()
17+
}
1418

1519
repositories {
1620
mavenLocal()
1721
mavenCentral()
1822
}
1923

2024
dependencies {
21-
implementation group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.15.8'
22-
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
23-
implementation 'com.google.guava:guava:30.1.1-jre'
24-
25-
testCompileOnly 'org.slf4j:slf4j-api:1.7.32'
26-
testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.32'
27-
testImplementation 'org.hamcrest:hamcrest-library:2.2'
28-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
29-
testCompileOnly 'org.junit.jupiter:junit-jupiter-params:5.7.2'
30-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
31-
}
32-
33-
java {
34-
withJavadocJar()
35-
withSourcesJar()
25+
implementation 'org.bitcoinj:bitcoinj-core:0.16.3'
26+
implementation 'com.google.code.gson:gson:2.11.0'
27+
implementation 'com.google.guava:guava:30.2.0-jre'
28+
29+
testImplementation 'org.slf4j:slf4j-api:2.0.13'
30+
testRuntimeOnly 'org.slf4j:slf4j-simple:2.0.13'
31+
testImplementation 'org.hamcrest:hamcrest-library:3.0'
32+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
33+
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.3'
34+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
35+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
3636
}
3737

3838
test {
@@ -51,33 +51,33 @@ jacocoTestReport {
5151

5252
spotless {
5353
java {
54-
target fileTree(projectDir) {
55-
include 'src/main/**/*.java'
56-
include 'src/test/**/*.java'
57-
exclude '**/build/**'
58-
}
59-
googleJavaFormat('1.1').aosp()
54+
target 'src/**/*.java'
55+
googleJavaFormat('1.17.0').aosp()
6056
}
6157
}
6258

63-
task formatCode(dependsOn: ['spotlessApply'])
59+
tasks.register('formatCode') {
60+
dependsOn 'spotlessApply'
61+
}
6462

65-
task fatJar(type: Jar) {
66-
manifest.from jar.manifest
63+
tasks.register('fatJar', Jar) {
64+
manifest {
65+
attributes 'Main-Class': 'com.example.Main'
66+
}
6767
from {
6868
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
6969
} {
70-
exclude "META-INF/*.SF"
71-
exclude "META-INF/*.DSA"
72-
exclude "META-INF/*.RSA"
70+
exclude 'META-INF/*.SF'
71+
exclude 'META-INF/*.DSA'
72+
exclude 'META-INF/*.RSA'
7373
}
7474
with jar
7575
}
7676

7777
build.dependsOn 'spotlessApply'
7878

7979
wrapper {
80-
gradleVersion = '7.2'
80+
gradleVersion = '8.1.1'
8181
}
8282

8383
publishing {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/java/org/arkecosystem/crypto/Schnorr.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ public static BigInteger[] addPoint(BigInteger[] p1, BigInteger[] p2) {
3535
.mod(p);
3636
else
3737
lam =
38-
(p2[1]
39-
.subtract(p1[1])
38+
(p2[1].subtract(p1[1])
4039
.multiply(p2[0].subtract(p1[0]).modPow(p.subtract(TWO), p)))
4140
.mod(p);
4241

0 commit comments

Comments
 (0)