From d563195d710d1c2f9d810b5b4d4d5efb621060cb Mon Sep 17 00:00:00 2001 From: Alexander Turchenko Date: Tue, 16 Nov 2021 12:47:53 +0400 Subject: [PATCH 1/5] Update kotlin to 1.6.0 --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6a56ffe..bf09ab7 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.5.30" + kotlin("jvm") version "1.6.0" } repositories { diff --git a/buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt b/buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt index 094db96..ced4ca4 100644 --- a/buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt +++ b/buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt @@ -1,7 +1,7 @@ package com.ecwid.gradle object Versions { - const val kotlin = "1.5.30" + const val kotlin = "1.6.0" const val junit = "5.7.2" const val apacheHttpClient = "4.5.13" const val gson = "2.8.6" From 2b1f6bf57af28c29b5c33aeb6e8263efd0af9825 Mon Sep 17 00:00:00 2001 From: Alexander Turchenko Date: Tue, 16 Nov 2021 12:48:29 +0400 Subject: [PATCH 2/5] Update project deps: junit, gson, jackson, commonsCli --- buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt b/buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt index ced4ca4..07392e8 100644 --- a/buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt +++ b/buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt @@ -2,11 +2,11 @@ package com.ecwid.gradle object Versions { const val kotlin = "1.6.0" - const val junit = "5.7.2" + const val junit = "5.8.1" const val apacheHttpClient = "4.5.13" - const val gson = "2.8.6" - const val jackson = "2.12.2" - const val commonsCli = "1.4" + const val gson = "2.8.8" + const val jackson = "2.12.5" + const val commonsCli = "1.5.0" const val freemarker = "2.3.31" const val mockk = "1.12.0" } From e99fa57819ab05088b1d8073e561f93935264a79 Mon Sep 17 00:00:00 2001 From: Alexander Turchenko Date: Tue, 16 Nov 2021 12:48:41 +0400 Subject: [PATCH 3/5] Update gradle to 7.3 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..e750102 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From d8ffbd4290a8e2e73c65f12b5d0fee2b07dda031 Mon Sep 17 00:00:00 2001 From: Alexander Turchenko Date: Tue, 16 Nov 2021 12:50:10 +0400 Subject: [PATCH 4/5] Bump version 0.9.14 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 48c4ece..62aa260 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { subprojects { group = "com.ecwid.upsource-rpc" - version = "0.9.13" + version = "0.9.14" repositories { mavenCentral() From 926f4046eb1631a3760246c5f2ebcd211ed4dbc1 Mon Sep 17 00:00:00 2001 From: Alexander Turchenko Date: Tue, 16 Nov 2021 12:52:04 +0400 Subject: [PATCH 5/5] Add 0.9.14 to README.md --- README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 14f2c47..c4f0168 100644 --- a/README.md +++ b/README.md @@ -35,15 +35,15 @@ repositories { } dependencies { - implementation("com.ecwid.upsource-rpc:client:0.9.13") + implementation("com.ecwid.upsource-rpc:client:0.9.14") // use one of: - implementation("com.ecwid.upsource-rpc:gson-serializer:0.9.13") - implementation("com.ecwid.upsource-rpc:jackson-serializer:0.9.13") + implementation("com.ecwid.upsource-rpc:gson-serializer:0.9.14") + implementation("com.ecwid.upsource-rpc:jackson-serializer:0.9.14") // use one of: - implementation("com.ecwid.upsource-rpc:httpclient:0.9.13") - implementation("com.ecwid.upsource-rpc:apache-httpclient:0.9.13") + implementation("com.ecwid.upsource-rpc:httpclient:0.9.14") + implementation("com.ecwid.upsource-rpc:apache-httpclient:0.9.14") } ``` @@ -195,7 +195,7 @@ repositories { } dependencies { - implementation("com.ecwid.upsource-rpc:webhooks:0.9.13") + implementation("com.ecwid.upsource-rpc:webhooks:0.9.14") } ``` @@ -252,8 +252,9 @@ when (webhook) { | Client | Upsource | |----------|:-----------:| -| 0.9.13 | 2020.1.1883 | +| 0.9.14 | 2020.1.1883 | | | 2020.1.1836 | +| 0.9.13 | 2020.1.1836 | | 0.9.12 | 2020.1.1836 | | 0.9.11 | 2020.1.1836 | | 0.9.10 | 2020.1.1836 |