Merge pull request #29 from turchenkoalex/upgrade-kotlin-1.8.0

Upgrade kotlin to 1.8.0
turchenkoalex · Jan 6, 2023 · 0e2ce7a · 0e2ce7a
2 parents f7a5061 + eb3dfe6
commit 0e2ce7a
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -35,15 +35,15 @@ repositories {
 }
 
 dependencies {
-    implementation("com.ecwid.upsource-rpc:client:0.9.18")
+    implementation("com.ecwid.upsource-rpc:client:0.9.19")
 
     // use one of:
-    implementation("com.ecwid.upsource-rpc:gson-serializer:0.9.18")
-    implementation("com.ecwid.upsource-rpc:jackson-serializer:0.9.18")
+    implementation("com.ecwid.upsource-rpc:gson-serializer:0.9.19")
+    implementation("com.ecwid.upsource-rpc:jackson-serializer:0.9.19")
 
     // use one of:
-    implementation("com.ecwid.upsource-rpc:httpclient:0.9.18")
-    implementation("com.ecwid.upsource-rpc:apache-httpclient:0.9.18")
+    implementation("com.ecwid.upsource-rpc:httpclient:0.9.19")
+    implementation("com.ecwid.upsource-rpc:apache-httpclient:0.9.19")
 }
 ```
 
@@ -195,7 +195,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.ecwid.upsource-rpc:webhooks:0.9.18")
+    implementation("com.ecwid.upsource-rpc:webhooks:0.9.19")
 }
 ```
 
@@ -250,34 +250,28 @@ when (webhook) {
 
 ## Compatibility Matrix
 
-| Client |  Upsource   |
-|--------|:-----------:|
-| 0.9.18 | 2020.1.1883 |
-|        | 2020.1.1836 |
-| 0.9.17 | 2020.1.1883 |
-|        | 2020.1.1836 |
-| 0.9.16 | 2020.1.1883 |
-|        | 2020.1.1836 |
-| 0.9.15 | 2020.1.1883 |
-|        | 2020.1.1836 |
-| 0.9.14 | 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 |
-| 0.9.9  | 2020.1.1836 |
-| 0.9.8  | 2020.1.1815 |
-|        | 2020.1.1802 |
-|        | 2020.1.1782 |
-|        | 2020.1.1774 |
-|        | 2020.1.1759 |
-| 0.9.7  | 2020.1.1793 |
-|        | 2020.1.1782 |
-|        | 2020.1.1774 |
-|        | 2020.1.1759 |
-| 0.9.6  | 2019.1.1717 |
-| 0.9.5  | 2019.1.1717 |
-| 0.9.4  | 2019.1.1644 | 
+| Client          |  Upsource   |
+|-----------------|:-----------:|
+| 0.9.15 - 0.9.19 | 2020.1.1883 |
+|                 | 2020.1.1836 |
+| 0.9.14          | 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 |
+| 0.9.9           | 2020.1.1836 |
+| 0.9.8           | 2020.1.1815 |
+|                 | 2020.1.1802 |
+|                 | 2020.1.1782 |
+|                 | 2020.1.1774 |
+|                 | 2020.1.1759 |
+| 0.9.7           | 2020.1.1793 |
+|                 | 2020.1.1782 |
+|                 | 2020.1.1774 |
+|                 | 2020.1.1759 |
+| 0.9.6           | 2019.1.1717 |
+| 0.9.5           | 2019.1.1717 |
+| 0.9.4           | 2019.1.1644 | 
 
 ## Code generation
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 subprojects {
 	group = "com.ecwid.upsource-rpc"
-	version = "0.9.18"
+	version = "0.9.19"
 
 	repositories {
 		mavenCentral()

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-	kotlin("jvm") version "1.7.21"
+	kotlin("jvm") version "1.8.0"
 }
 
 repositories {

diff --git a/buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt b/buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt
@@ -1,14 +1,14 @@
 package com.ecwid.gradle
 
 object Versions {
-	const val kotlin = "1.7.21"
+	const val kotlin = "1.8.0"
 	const val junit = "5.9.1"
-	const val apacheHttpClient = "4.5.13"
-	const val gson = "2.9.1"
-	const val jackson = "2.14.0"
+	const val apacheHttpClient = "4.5.14"
+	const val gson = "2.10"
+	const val jackson = "2.14.1"
 	const val commonsCli = "1.5.0"
 	const val freemarker = "2.3.31"
-	const val mockk = "1.13.2"
+	const val mockk = "1.13.3"
 }
 
 object Dependencies {

diff --git 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