Skip to content

Commit

Permalink
Merge pull request #23 from austek/refactor/update_dependencies
Browse files Browse the repository at this point in the history
Update dependency versions
  • Loading branch information
rholshausen authored Mar 23, 2023
2 parents 95c35c5 + d9c58d2 commit 1396986
Show file tree
Hide file tree
Showing 6 changed files with 216 additions and 146 deletions.
20 changes: 13 additions & 7 deletions drivers/jvm/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id 'java'
id 'org.jetbrains.kotlin.jvm' version '1.7.22'
id 'org.jetbrains.dokka' version '1.7.20'
id 'io.gitlab.arturbosch.detekt' version '1.21.0'
id 'org.jetbrains.kotlin.jvm' version '1.8.10'
id 'org.jetbrains.dokka' version '1.8.10'
id 'io.gitlab.arturbosch.detekt' version '1.22.0'
id 'maven-publish'
id 'signing'
}

repositories {
mavenCentral()
}

subprojects {
apply plugin: 'java'
apply plugin: 'org.jetbrains.kotlin.jvm'
Expand All @@ -15,7 +21,6 @@ subprojects {
apply plugin: 'org.jetbrains.dokka'

repositories {
mavenLocal()
mavenCentral()
}

Expand All @@ -38,16 +43,17 @@ subprojects {

task javadocJar(type: Jar, dependsOn: [javadoc, dokkaJavadoc]) {
archiveClassifier = 'javadoc'
duplicatesStrategy = 'exclude'
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
from javadoc.destinationDir, dokkaJavadoc.outputDirectory
}

task sourceJar(type: Jar) {
tasks.register('sourceJar', Jar) {
archiveClassifier = 'sources'
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
from sourceSets.main.allSource
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = "11"
}
Expand Down
55 changes: 28 additions & 27 deletions drivers/jvm/core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id 'java-library'
id 'com.google.protobuf' version '0.8.19'
id 'com.google.protobuf' version '0.9.2'
id 'groovy'
id 'au.com.dius.pact' version '4.4.2'
id 'au.com.dius.pact' version '4.5.4'
}

ext {
Expand All @@ -11,51 +11,52 @@ ext {
}

dependencies {
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.7.22'
implementation 'org.jetbrains.kotlin:kotlin-reflect:1.7.22'
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.10'
implementation 'org.jetbrains.kotlin:kotlin-reflect:1.8.10'
implementation 'com.vdurmont:semver4j:3.1.0'
implementation 'io.grpc:grpc-protobuf:1.51.0'
implementation 'io.grpc:grpc-stub:1.51.0'
implementation 'io.grpc:grpc-netty:1.51.0'
implementation 'io.grpc:grpc-protobuf:1.53.0'
implementation 'io.grpc:grpc-stub:1.53.0'
implementation 'io.grpc:grpc-netty:1.53.0'
implementation "javax.annotation:javax.annotation-api:1.3.2"
implementation 'com.google.guava:guava:31.1-jre'
implementation('io.github.microutils:kotlin-logging:2.1.23') {
implementation('io.github.microutils:kotlin-logging:3.0.5') {
exclude group: 'org.jetbrains.kotlin'
}
implementation 'javax.json:javax.json-api:1.1.4'
implementation 'org.glassfish:javax.json:1.1.4'
implementation 'commons-codec:commons-codec:1.15'
implementation 'org.apache.commons:commons-lang3:3.12.0'
implementation 'au.com.dius.pact.core:support:4.4.5'
implementation 'au.com.dius.pact.core:model:4.4.5'
implementation 'org.apache.tika:tika-core:1.28.5'
implementation 'org.apache.httpcomponents.client5:httpclient5-fluent:5.1.3'
implementation 'au.com.dius.pact.core:support:4.5.4'
implementation 'au.com.dius.pact.core:model:4.5.4'
implementation 'org.apache.tika:tika-core:2.7.0'
implementation 'org.apache.httpcomponents.client5:httpclient5-fluent:5.2.1'
implementation 'com.vdurmont:semver4j:3.1.0'

protobuf files('../../../proto/')

testImplementation 'org.apache.groovy:groovy:4.0.6'
testImplementation 'org.apache.groovy:groovy-json:4.0.6'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.9.0'
testImplementation 'org.apache.groovy:groovy:4.0.10'
testImplementation 'org.apache.groovy:groovy-json:4.0.10'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.9.2'
testImplementation 'org.hamcrest:hamcrest:2.2'
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
testImplementation 'net.bytebuddy:byte-buddy:1.12.18'
testImplementation 'org.objenesis:objenesis:3.2'
testImplementation 'au.com.dius.pact.consumer:junit5:4.4.5'
testImplementation('au.com.dius.pact.consumer:groovy:4.4.5') {
testImplementation 'net.bytebuddy:byte-buddy:1.14.2'
testImplementation 'org.objenesis:objenesis:3.3'
testImplementation 'au.com.dius.pact.consumer:junit5:4.5.4'
testImplementation('au.com.dius.pact.consumer:groovy:4.5.4') {
transitive = false
}
testImplementation 'ch.qos.logback:logback-classic:1.4.4'
testImplementation 'org.mockito:mockito-core:4.8.0'
testImplementation 'org.mockito:mockito-junit-jupiter:4.8.0'
testImplementation 'org.json:json:20220924'
testImplementation 'ch.qos.logback:logback-classic:1.4.6'
testImplementation 'org.mockito:mockito-core:5.2.0'
testImplementation 'org.mockito:mockito-junit-jupiter:5.2.0'
testImplementation 'org.json:json:20230227'
}

protobuf {
protoc { artifact = "com.google.protobuf:protoc:3.19.4" }
protoc { artifact = "com.google.protobuf:protoc:3.21.12" }
plugins {
grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.51.0" }
grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.53.0" }
}
generateProtoTasks {
all()*.plugins { grpc {} }
Expand Down
Binary file modified drivers/jvm/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion drivers/jvm/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 1396986

Please sign in to comment.