diff --git a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/kvision-kotlin-current.patch b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/kvision-kotlin-current.patch index 515158a6821..d5c047b4dd7 100644 --- a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/kvision-kotlin-current.patch +++ b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/kvision-kotlin-current.patch @@ -1,24 +1,24 @@ diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts -index 7f5e780430..087552bfa0 100644 +index db904c8841..ef155edc8e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,12 +3,13 @@ plugins { } - + repositories { + mavenLocal() mavenCentral() gradlePluginPortal() } - + dependencies { -- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21") +- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:") implementation("de.marcphilipp.gradle:nexus-publish-plugin:0.4.0") - implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.20") - implementation(gradleApi()) + implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.7.0") { + exclude("org.jetbrains.kotlin","kotlin-stdlib-jdk8") diff --git a/buildSrc/src/main/kotlin/Shared.kt b/buildSrc/src/main/kotlin/Shared.kt -index e8a1ac553c..f3a1a1eb94 100644 +index cb90de74ab..440e2ce91a 100644 --- a/buildSrc/src/main/kotlin/Shared.kt +++ b/buildSrc/src/main/kotlin/Shared.kt @@ -15,9 +15,9 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl @@ -33,20 +33,20 @@ index e8a1ac553c..f3a1a1eb94 100644 } diff --git a/gradle.properties b/gradle.properties -index b6af7b9536..b4f3926cca 100644 +index 5cb5298782..3fb47f8cdc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=io.kvision - versionNumber=5.9.0 + versionNumber=5.12.0 --systemProp.kotlinVersion=1.6.21 +-systemProp.kotlinVersion=1.7.10 +systemProp.kotlinVersion= javaVersion=1.8 - coroutinesVersion=1.6.1 - serializationVersion=1.3.2 + coroutinesVersion=1.6.3 + serializationVersion=1.3.3 diff --git a/settings.gradle.kts b/settings.gradle.kts -index 6db44e6175..b941ae4a24 100644 +index f85a2f087e..a122b6fd5e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,8 +1,8 @@ diff --git a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/kvision.benchmark.kts b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/kvision.benchmark.kts index 559a73c2417..0d444247c21 100644 --- a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/kvision.benchmark.kts +++ b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/kvision.benchmark.kts @@ -9,7 +9,7 @@ @file:BenchmarkProject( name = "kvision", gitUrl = "https://github.com/rjaros/kvision.git", - gitCommitSha = "9204d7be944a57bd6c09053bc16b5eeea1bccac5" + gitCommitSha = "675de063cf065416536711a701eaee40b18f3e05" ) import java.io.File @@ -55,7 +55,7 @@ runAllBenchmarks( } }, mapOf( - "1.6.20" to null, - "1.7.0" to currentReleasePatch + "1.7.10" to null, + "1.7.20" to currentReleasePatch ) ) \ No newline at end of file