Merge branch 'main' into main

Author: reflix

Diff for: .github/odin.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/sh
 
-VERSION=dev-2023-03
+VERSION=dev-2023-04
 FILE_NAME=odin-ubuntu-amd64-$VERSION.zip
 sudo apt-get install -y aria2
 mkdir /tmp/odin
 cd /tmp/odin
 aria2c -c -o $FILE_NAME https://github.com/odin-lang/Odin/releases/download/$VERSION/$FILE_NAME
-if test -d ubuntu_artifacts; then rm -r ubuntu_artifacts; fi
+if test -d ubuntu_artifacts; then sudo rm -rf ubuntu_artifacts; fi
 unzip -o $FILE_NAME
 if test -d ubuntu_artifacts; then ODIN_BIN_PATH=$PWD/ubuntu_artifacts/odin; else ODIN_BIN_PATH=$PWD/odin; fi
 sudo chmod +x $ODIN_BIN_PATH

Diff for: .github/v.sh

@@ -5,9 +5,6 @@
 sudo apt-get install -y libgc-dev
 git clone https://github.com/vlang/v /tmp/vlang
 cd /tmp/vlang
-pushd vlib/vweb
-cat vweb.v | sed "s/\bprintln('\[Vweb\] Running/eprintln('[Vweb] Running/" > temp.v && mv temp.v vweb.v
-popd
 make && ./v -version
 ./v symlink
 v --version

Diff for: bench/algorithm/http-server/1.v

@@ -13,7 +13,7 @@ fn main() {
 		n = strconv.atoi(os.args[1]) or { 10 }
 	}
 	port := int(rand.u32_in_range(20000, 50000) or { 23333 })
-	spawn vweb.run(&App{}, port)
+	spawn vweb.run_at(&App{}, port: port, show_startup_message: false)
 	url := 'http://localhost:${port}/api'
 	mut ch := chan int{cap: n}
 	for i in 1 .. (n + 1) {

Diff for: bench/include/kotlin-jvm/build.gradle.kts

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 
 plugins {
-    val kotlinVersion = "1.8.10"
+    val kotlinVersion = "1.8.20"
     kotlin("jvm").version(kotlinVersion)
     kotlin("plugin.serialization").version(kotlinVersion)
     // kotlin("plugin.spring").version(kotlinVersion)
@@ -31,7 +31,7 @@ dependencies {
     // implementation("org.slf4j:slf4j-api:1.7.36")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
-    implementation("org.jetbrains.kotlinx:atomicfu:0.20.1")
+    implementation("org.jetbrains.kotlinx:atomicfu:0.20.2")
     val ktor_version = "2.2.4"
     implementation("io.ktor:ktor-server-core:$ktor_version")
     // implementation("io.ktor:ktor-server-netty:$ktor_version")

Diff for: bench/include/kotlin-native/build.gradle.kts

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
-  val kotlinVersion = "1.8.10"
+  val kotlinVersion = "1.8.20"
   kotlin("multiplatform").version(kotlinVersion)
   kotlin("plugin.serialization").version(kotlinVersion)
   id("com.github.ben-manes.versions").version("0.46.0")

Diff for: bench/include/zig/build.zig

@@ -1,7 +1,6 @@
 const std = @import("std");
-const Builder = std.build.Builder;
 
-pub fn build(b: *Builder) void {
+pub fn build(b: *std.Build) void {
     // Standard target options allows the person running `zig build` to choose
     // what target to build for. Here we do not override the defaults, which
     // means any target is allowed, and the default is native. Other options
@@ -19,10 +18,9 @@ pub fn build(b: *Builder) void {
         .optimize = std.builtin.Mode.ReleaseFast,
     });
     exe.linkLibC();
-    // exe.setOutputDir("out");
-    exe.install();
+    b.installArtifact(exe);
 
-    const run_cmd = exe.run();
+    const run_cmd = b.addRunArtifact(exe);
     run_cmd.step.dependOn(b.getInstallStep());
     if (b.args) |args| {
         run_cmd.addArgs(args);