Skip to content

Commit

Permalink
solution: update gradle and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
kanazirsky committed Mar 2, 2023
1 parent b2d0761 commit 9442283
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 16 deletions.
20 changes: 11 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.2'
}
}

Expand All @@ -15,7 +15,7 @@ plugins {
id 'groovy'
id 'idea'
id 'maven-publish'
id 'com.google.protobuf' version "0.8.18"
id 'com.google.protobuf' version "0.9.2"
id 'jacoco'
id "com.google.cloud.artifactregistry.gradle-plugin" version "2.1.4" apply false
}
Expand All @@ -25,7 +25,7 @@ if (System.getenv("ENABLE_GCP") == "true") {
}

group = 'io.emeraldpay'
version = '0.12-alpha.4'
version = '0.12-alpha.5'

java {
sourceCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -52,16 +52,18 @@ dependencies {
api "io.grpc:grpc-protobuf:${grpcVersion}"
api "io.grpc:grpc-stub:${grpcVersion}"
implementation "io.grpc:grpc-netty:${grpcVersion}"
implementation "io.netty:netty-tcnative-boringssl-static:2.0.46.Final"
implementation "io.netty:netty-tcnative-boringssl-static:2.0.59.Final"
implementation "javax.annotation:javax.annotation-api:1.3.2"
implementation "com.salesforce.servicelibs:reactor-grpc:${reactiveGrpcVersion}"
implementation "io.projectreactor:reactor-core:${reactorVersion}"
api "com.salesforce.servicelibs:reactor-grpc-stub:${reactiveGrpcVersion}"

implementation 'io.emeraldpay.etherjar:etherjar-domain:0.11.0'

testImplementation "org.codehaus.groovy:groovy:${groovyVersion}"
testImplementation "org.spockframework:spock-core:${spockVersion}"
testImplementation "io.grpc:grpc-testing:${grpcVersion}"
testImplementation "com.salesforce.servicelibs:reactor-grpc-test:${reactiveGrpcVersion}"
}

test {
Expand Down Expand Up @@ -136,12 +138,12 @@ publishing {
}

jacoco {
toolVersion = "0.8.7"
toolVersion = "0.8.8"
}

jacocoTestReport {
reports {
xml.enabled true
xml.required = true
}
}

Expand All @@ -154,8 +156,8 @@ task coverageReport(type: JacocoReport) {
classDirectories.setFrom files(subprojects.sourceSets.main.output)
executionData.setFrom project.fileTree(dir: '.', include: '**/build/jacoco/test.exec')
reports {
xml.enabled true
csv.enabled false
html.enabled true
xml.required = true
csv.required = false
html.required = true
}
}
13 changes: 7 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# Languages
groovyVersion=3.0.8
groovyVersion=3.0.15
# Main Libs
grpcVersion=1.42.1
protocVersion=3.9.0
protobufVersion=3.10.1
reactiveGrpcVersion=1.0.1
grpcVersion=1.53.0
protocVersion=3.21.9
protobufVersion=3.21.9
reactiveGrpcVersion=1.2.3
reactorVersion=3.5.3
# Testing
spockVersion=2.0-groovy-3.0
spockVersion=2.3-groovy-3.0

2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 9442283

Please sign in to comment.