Update kvision benchmark

2023-01-27 15:24:11 +01:00
parent ff2de0e2b9
commit 09ab70473d
3 changed files with 104 additions and 94 deletions
@@ -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:<kotlin_version>")
-     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=<kotlin_version>
- 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"
@@ -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=<kotlin_version>
+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=<kotlin_version>
+ 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"