Skip to content

Commit

Permalink
Merge pull request #21 from turchenkoalex/update-kotlin
Browse files Browse the repository at this point in the history
Update kotlin 1.6
  • Loading branch information
turchenkoalex authored Nov 16, 2021
2 parents 3c56e5e + 926f404 commit 3b95b12
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 15 deletions.
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
```

Expand Down Expand Up @@ -195,7 +195,7 @@ repositories {
}
dependencies {
implementation("com.ecwid.upsource-rpc:webhooks:0.9.13")
implementation("com.ecwid.upsource-rpc:webhooks:0.9.14")
}
```

Expand Down Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

subprojects {
group = "com.ecwid.upsource-rpc"
version = "0.9.13"
version = "0.9.14"

repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "1.5.30"
kotlin("jvm") version "1.6.0"
}

repositories {
Expand Down
10 changes: 5 additions & 5 deletions buildSrc/src/main/kotlin/com/ecwid/gradle/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.ecwid.gradle

object Versions {
const val kotlin = "1.5.30"
const val junit = "5.7.2"
const val kotlin = "1.6.0"
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"
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 3b95b12

Please sign in to comment.