From 925ec849f8d84ca1f1aca58732d4b2e1f59904b6 Mon Sep 17 00:00:00 2001 From: Ludovic DEHON Date: Thu, 15 Dec 2022 10:01:04 +0100 Subject: [PATCH] feat(deps): update all java deps --- build.gradle | 21 ++++++++++++++------- gradle.properties | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index d754f836..b748f85d 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,8 @@ repositories { } sourceCompatibility = 11 +targetCompatibility = 11 + group "io.kestra.plugin" description 'Google Cloud Platform plugin for Kestra' @@ -33,6 +35,10 @@ tasks.withType(JavaCompile) { configurations.all { resolutionStrategy { force("org.slf4j:slf4j-api:1.7.36") + + // micronaut bom import version not compatible with google one + force("com.google.protobuf:protobuf-java:3.21.10") + force("com.google.protobuf:protobuf-java-util:3.21.10") } } @@ -56,12 +62,13 @@ dependencies { api 'androidx.annotation:annotation:1.5.0' api 'net.jodah:failsafe:2.4.4' - api 'com.google.cloud:google-cloud-storage:2.15.0' - api 'com.google.cloud:google-cloud-bigquery:2.19.1' - api 'com.google.cloud:google-cloud-bigquerystorage:2.25.0' - api 'com.google.cloud:google-cloud-container:2.9.0' - api 'com.google.cloud:google-cloud-aiplatform:3.7.0' - api 'com.google.cloud:google-cloud-logging:3.12.1' + api platform('com.google.cloud:libraries-bom:26.3.0') + api 'com.google.cloud:google-cloud-storage' + api 'com.google.cloud:google-cloud-bigquery' + api 'com.google.cloud:google-cloud-bigquerystorage' + api 'com.google.cloud:google-cloud-container' + api 'com.google.cloud:google-cloud-aiplatform' + api 'com.google.cloud:google-cloud-logging' } @@ -102,7 +109,7 @@ dependencies { testImplementation "org.hamcrest:hamcrest-library:2.2" testImplementation group: 'com.devskiller.friendly-id', name: 'friendly-id', version: '1.1.0' - testImplementation 'org.mockito:mockito-junit-jupiter:4.9.0' + testImplementation 'org.mockito:mockito-junit-jupiter:4.11.0' } /**********************************************************************************************************************\ diff --git a/gradle.properties b/gradle.properties index 51dbc141..a397d962 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.5.2-SNAPSHOT -kestraVersion=0.5.+ -micronautVersion=3.7.2 +version=0.6.0-SNAPSHOT +kestraVersion=0.6.+ +micronautVersion=3.8.0 lombokVersion=1.18.24 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661e..070cb702 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ 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-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists