From 46c9d327effcbfac77d8452ba71e28a441165e33 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 17 Apr 2024 12:16:59 +0400 Subject: [PATCH] Updated cradle: `5.3.0-dev` --- README.md | 1 + build.gradle | 16 ++++++---------- gradle.properties | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 05a723b9..64b22324 100644 --- a/README.md +++ b/README.md @@ -517,6 +517,7 @@ dependencies { + Updated: + grpc-common: `4.5.0-dev` + grpc-service-generator: `3.6.1` + + cradle: `5.3.0-dev` ### 5.10.1-dev diff --git a/build.gradle b/build.gradle index 62b39ded..41bb53f1 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ ext { protobufVersion = '3.25.3' serviceGeneratorVersion = '3.6.1' - cradleVersion = '5.1.5-dev' + cradleVersion = '5.3.0-th2-gradle-plugin-+' junitVersion = '5.10.2' jmhVersion = '1.37' @@ -55,6 +55,10 @@ kotlin { jvmToolchain(11) } +tasks.withType(KotlinCompile).configureEach { + kotlinOptions.freeCompilerArgs += "-Xjvm-default=all" +} + test { useJUnitPlatform { excludeTags('integration-test') @@ -199,12 +203,4 @@ tasks.named('extractIncludeProto') {enabled = false } tasks.named('extractIncludeTestFixturesProto') {enabled = false } compileTestJava.dependsOn.add('generateTestProto') -processTestResources.dependsOn.add('generateTestProto') - -kotlin { - jvmToolchain(11) -} - -tasks.withType(KotlinCompile).configureEach { - kotlinOptions.freeCompilerArgs += "-Xjvm-default=all" -} \ No newline at end of file +processTestResources.dependsOn.add('generateTestProto') \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ca882a10..16a7caeb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -release_version=5.10.1 +release_version=5.11.0 kotlin_version=1.8.22 description='th2 common library (Java)' vcs_url=https://github.com/th2-net/th2-common-j