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 deleted file mode 100644 index 1423eee7c32..00000000000 --- a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/kvision-kotlin-current.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts -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.7.20") -+ 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.7.10") { - exclude("org.jetbrains.kotlin","kotlin-stdlib-jdk8") -diff --git a/buildSrc/src/main/kotlin/Shared.kt b/buildSrc/src/main/kotlin/Shared.kt -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 - - fun Project.repositories() { - repositories { -+ mavenLocal() - mavenCentral() - jcenter() -- mavenLocal() - } - } - -diff --git a/gradle.properties b/gradle.properties -index 5cb5298782..3fb47f8cdc 100644 ---- a/gradle.properties -+++ b/gradle.properties -@@ -1,7 +1,7 @@ - group=io.kvision - versionNumber=5.16.1 - --systemProp.kotlinVersion=1.7.20 -+systemProp.kotlinVersion= - javaVersion=1.8 - coroutinesVersion=1.6.4 - serializationVersion=1.4.0 -diff --git a/settings.gradle.kts b/settings.gradle.kts -index f85a2f087e..a122b6fd5e 100644 ---- a/settings.gradle.kts -+++ b/settings.gradle.kts -@@ -1,8 +1,8 @@ - pluginManagement { - repositories { -+ mavenLocal() - gradlePluginPortal() - mavenCentral() -- mavenLocal() - } - } - rootProject.name = "kvision" diff --git a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/kvision-kotlin-repo.patch b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/kvision-kotlin-repo.patch new file mode 100644 index 00000000000..57c779e2a03 --- /dev/null +++ b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/files/kvision-kotlin-repo.patch @@ -0,0 +1,95 @@ +diff --git a/build.gradle.kts b/build.gradle.kts +index bb80d4cbc0..9020570e83 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -1,6 +1,5 @@ + plugins { +- val kotlinVersion: String by System.getProperties() +- kotlin("plugin.serialization") version kotlinVersion ++ kotlin("plugin.serialization") + kotlin("js") + id("maven-publish") + id("signing") +@@ -17,7 +16,7 @@ allprojects { + } + + // Versions +-val kotlinVersion: String by System.getProperties() ++val kotlinVersion: String by extra + val serializationVersion: String by project + val coroutinesVersion: String by project + val snabbdomKotlinVersion: String by project +diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts +index 9f429bd18d..3204cec9cb 100644 +--- a/buildSrc/build.gradle.kts ++++ b/buildSrc/build.gradle.kts +@@ -3,12 +3,15 @@ plugins { + } + + repositories { ++ mavenLocal() + mavenCentral() + gradlePluginPortal() + } + ++val kotlinVersion: String by extra ++ + dependencies { +- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0") ++ implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + implementation("de.marcphilipp.gradle:nexus-publish-plugin:0.4.0") + implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.7.20") + implementation(gradleApi()) +diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties +new file mode 100644 +index 0000000000..b67c10f362 +--- /dev/null ++++ b/buildSrc/gradle.properties +@@ -0,0 +1 @@ ++kotlinVersion= +diff --git a/buildSrc/src/main/kotlin/Shared.kt b/buildSrc/src/main/kotlin/Shared.kt +index 28ead2b4ec..7eca72163f 100644 +--- a/buildSrc/src/main/kotlin/Shared.kt ++++ b/buildSrc/src/main/kotlin/Shared.kt +@@ -16,8 +16,8 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl + + fun Project.repositories() { + repositories { +- mavenCentral() + mavenLocal() ++ mavenCentral() + } + } + +diff --git a/gradle.properties b/gradle.properties +index bc5d1d2286..852cc018b5 100644 +--- a/gradle.properties ++++ b/gradle.properties +@@ -1,7 +1,7 @@ + group=io.kvision + versionNumber=6.0.6 + +-systemProp.kotlinVersion=1.8.0 ++kotlinVersion= + javaVersion=17 + coroutinesVersion=1.6.4 + serializationVersion=1.4.1 +diff --git a/settings.gradle.kts b/settings.gradle.kts +index 901058aae2..7c338f6ba2 100644 +--- a/settings.gradle.kts ++++ b/settings.gradle.kts +@@ -1,8 +1,13 @@ + pluginManagement { + repositories { ++ mavenLocal() + gradlePluginPortal() + mavenCentral() +- mavenLocal() ++ } ++ ++ val kotlinVersion: String by settings ++ plugins { ++ id("org.jetbrains.kotlin.plugin.serialization") version kotlinVersion + } + } + rootProject.name = "kvision" \ No newline at end of file diff --git a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/kvision.benchmark.kts b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/kvision.benchmark.kts index 2a96934b274..36dc2f70a21 100644 --- a/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/kvision.benchmark.kts +++ b/libraries/tools/gradle/regression-benchmarks/benchmarkScripts/kvision.benchmark.kts @@ -9,14 +9,14 @@ @file:BenchmarkProject( name = "kvision", gitUrl = "https://github.com/rjaros/kvision.git", - gitCommitSha = "3fe69bf6db9a3650b026630d857862f3cee6485b", - stableKotlinVersion = "1.7.20", + gitCommitSha = "6849861bf8c1e24ccdbdaf54606271c355d5ef9c", + stableKotlinVersion = "1.8.0", ) import java.io.File val repoPatch = { - "kvision-kotlin-current.patch" to File("benchmarkScripts/files/kvision-kotlin-current.patch") + "kvision-kotlin-current.patch" to File("benchmarkScripts/files/kvision-kotlin-repo.patch") .readText() .run { replace("", currentKotlinVersion) } .byteInputStream() @@ -26,44 +26,23 @@ runBenchmarks( repoPatch, suite { scenario { - title = "Build Js IR clean build" + title = "Build Js clean build" - runTasks("jsIrJar") + runTasks("jsJar") runCleanupTasks("clean") } scenario { title = "Build Js IR with ABI change in ObservableList" - runTasks("jsIrJar") + runTasks("jsJar") applyAbiChangeTo("kvision-modules/kvision-state/src/main/kotlin/io/kvision/state/ObservableList.kt") } scenario { title = "Build Js IR with non-ABI change in ObservableList" - runTasks("jsIrJar") - applyNonAbiChangeTo("kvision-modules/kvision-state/src/main/kotlin/io/kvision/state/ObservableList.kt") - } - - scenario { - title = "Build Js Legacy clean build" - - runTasks("jsLegacyJar") - runCleanupTasks("clean") - } - - scenario { - title = "Build Js Legacy with ABI change in ObservableList" - - runTasks("jsLegacyJar") - applyAbiChangeTo("kvision-modules/kvision-state/src/main/kotlin/io/kvision/state/ObservableList.kt") - } - - scenario { - title = "Build Js Legacy with non-ABI change in ObservableList" - - runTasks("jsLegacyJar") + runTasks("jsJar") applyNonAbiChangeTo("kvision-modules/kvision-state/src/main/kotlin/io/kvision/state/ObservableList.kt") } @@ -71,22 +50,19 @@ runBenchmarks( title = "Dry run configuration time" useGradleArgs("-m") - iterations = 20 - runTasks("jsIrJar") + runTasks("jsJar") } scenario { title = "No-op configuration time" - iterations = 20 runTasks("help") } scenario { title = "UP-TO-DATE configuration time" - iterations = 20 - runTasks("jsIrJar") + runTasks("jsJar") } } ) \ No newline at end of file