Skip to content

Commit

Permalink
Bump kotlin to 1.6.20 and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Monkopedia committed Apr 9, 2022
1 parent 7b1acbc commit a48494a
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Kotlin Simple RPCs

[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
[![Kotlin](https://img.shields.io/badge/kotlin-1.6.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
[![Kotlin](https://img.shields.io/badge/kotlin-1.6.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
[![Maven Central](https://img.shields.io/maven-central/v/com.monkopedia/ksrpc/0.5.2)](https://search.maven.org/artifact/com.monkopedia/ksrpc/0.5.2/pom)
[![KDoc link](https://img.shields.io/badge/API_reference-KDoc-blue)](https://monkopedia.github.io/ksrpc/ksrpc/)

Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ buildscript {
extra["kotlin_plugin_id"] = "com.monkopedia.ksrpc.plugin"
}
plugins {
kotlin("multiplatform") version "1.6.10" apply false
kotlin("plugin.serialization") version "1.6.10" apply false
kotlin("multiplatform") version "1.6.20" apply false
kotlin("plugin.serialization") version "1.6.20" apply false
id("com.github.autostyle") version "3.1"
id("org.jetbrains.dokka") version "1.4.10.2" apply false

Expand Down
2 changes: 1 addition & 1 deletion compiler/plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies {
testImplementation(project(":ksrpc"))
testImplementation(kotlin("test-junit"))
testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable")
testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.2.6")
testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.4.8")
}

buildConfig {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=0.5.2
plugin_version=0.5.2
version=0.5.3
plugin_version=0.5.3
signing.gnupg.keyName=5B83421E2338B907
org.gradle.jvmargs=-Xmx4096m
48 changes: 24 additions & 24 deletions ksrpc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ kotlin {
sourceSets["commonMain"].dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.2")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-native-mt") {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2-native-mt") {
version {
strictly("1.6.0-native-mt")
strictly("1.6.1-native-mt")
}
}
implementation("org.jetbrains.kotlinx:atomicfu:0.16.2")
implementation("io.ktor:ktor-client-core:1.6.4")
implementation("io.ktor:ktor-client-websockets:1.6.4")
implementation("io.ktor:ktor-http:1.6.4")
implementation("org.jetbrains.kotlinx:atomicfu:0.17.1")
implementation("io.ktor:ktor-client-core:1.6.8")
implementation("io.ktor:ktor-client-websockets:1.6.8")
implementation("io.ktor:ktor-http:1.6.8")
}
sourceSets["commonTest"].dependencies {
implementation(kotlin("test"))
Expand All @@ -78,40 +78,40 @@ kotlin {
implementation(kotlin("stdlib"))
implementation(kotlin("reflect"))
implementation("org.slf4j:slf4j-api:1.6.1")
compileOnly("io.ktor:ktor-server-core:1.6.4")
compileOnly("io.ktor:ktor-server-host-common:1.6.4")
compileOnly("io.ktor:ktor-server-netty:1.6.4")
compileOnly("io.ktor:ktor-websockets:1.6.4")
compileOnly("io.ktor:ktor-client-core:1.6.4")
compileOnly("io.ktor:ktor-server-core:1.6.8")
compileOnly("io.ktor:ktor-server-host-common:1.6.8")
compileOnly("io.ktor:ktor-server-netty:1.6.8")
compileOnly("io.ktor:ktor-websockets:1.6.8")
compileOnly("io.ktor:ktor-client-core:1.6.8")

implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.2")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
implementation("com.github.ajalt:clikt:2.8.0")
}
sourceSets["jvmTest"].dependencies {
implementation(kotlin("test-junit"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-native-mt")
implementation("io.ktor:ktor-server-core:1.6.4")
implementation("io.ktor:ktor-server-netty:1.6.4")
implementation("io.ktor:ktor-jackson:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1-native-mt")
implementation("io.ktor:ktor-server-core:1.6.8")
implementation("io.ktor:ktor-server-netty:1.6.8")
implementation("io.ktor:ktor-jackson:1.6.8")

implementation("io.ktor:ktor-client-core:1.6.4")
implementation("io.ktor:ktor-client-okhttp:1.6.4")
implementation("io.ktor:ktor-websockets:1.6.4")
implementation("io.ktor:ktor-client-websockets:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0-native-mt")
implementation("io.ktor:ktor-client-core:1.6.8")
implementation("io.ktor:ktor-client-okhttp:1.6.8")
implementation("io.ktor:ktor-websockets:1.6.8")
implementation("io.ktor:ktor-client-websockets:1.6.8")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1-native-mt")
}
sourceSets["jsTest"].dependencies {
implementation(kotlin("test-js"))
implementation("io.ktor:ktor-client-core:1.6.4")
implementation("io.ktor:ktor-client-core:1.6.8")
}
sourceSets["jsMain"].dependencies {
implementation(npm("nanoid", "3.1.22"))
compileOnly("io.ktor:ktor-client-core:1.6.4")
compileOnly("io.ktor:ktor-client-core:1.6.8")
}
sourceSets["nativeMain"].dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-native-mt")
implementation("io.ktor:ktor-client-curl:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1-native-mt")
implementation("io.ktor:ktor-client-curl:1.6.8")
}
}

Expand Down

0 comments on commit a48494a

Please sign in to comment.