Merge branch 'master' into dependabot/github_actions/actions/checkout-4

hanabi1224 · Jan 16, 2024 · ab14891 · ab14891
2 parents 03578ab + 8238aed
commit ab14891
Show file tree

Hide file tree

Showing 14 changed files with 1,244 additions and 1,426 deletions.
diff --git a/.github/workflows/cancel-stale.yml b/.github/workflows/cancel-stale.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,5 +1,9 @@
 name: main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 on:
   push:
     branches: [master]
@@ -51,7 +55,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: java Test
         run: |
           pushd java
@@ -62,7 +66,7 @@ jobs:
           ./gradlew clean build publishToMavenLocal
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "7.x"
+          dotnet-version: "8.x"
       - name: dotnet Test
         run: |
           dotnet test -c Release dotnet/RuAnnoy.Tests

diff --git a/Cargo.toml b/Cargo.toml
@@ -17,17 +17,17 @@ default = []
 
 [dependencies]
 cfg-if = "1"
-ordered-float = "3"
+ordered-float = "4"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = {version = "0.2", features = ["js"]}
 js-sys = "0.3"
 serde = {version = "1", features = ["derive"]}
-serde-wasm-bindgen = "0.5"
+serde-wasm-bindgen = "0.6"
 wasm-bindgen = "0.2"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-memmap2 = "0.5"
+memmap2 = "0.9"
 
 [dev-dependencies]
 lazy_static = "1"

diff --git a/bench/dart/pubspec.yaml b/bench/dart/pubspec.yaml
@@ -2,7 +2,7 @@ name: bencher
 version: 0.1.0
 publish_to: none
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.12.0 <4.0.0"
 
 dependencies:
   dart_native_annoy: ^0.1.0+1
diff --git a/bench/dotnet/Bench.csproj b/bench/dotnet/Bench.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/bench/java/app/build.gradle.kts b/bench/java/app/build.gradle.kts
@@ -10,8 +10,8 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
     // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.
-    id("org.jetbrains.kotlin.jvm").version("1.8.0")
-    id("com.github.ben-manes.versions").version("0.44.0")
+    id("org.jetbrains.kotlin.jvm").version("1.9.22")
+    id("com.github.ben-manes.versions").version("0.50.0")
     // Apply the application plugin to add support for building a CLI application in Java.
     application
 }
@@ -32,7 +32,7 @@ dependencies {
 
 application {
     // Define the main class for the application.
-    mainClassName = "ru.annoy.test.AppKt"
+    mainClass = "ru.annoy.test.AppKt"
 }
 
 tasks.register("du") { dependsOn("dependencyUpdates") }
@@ -47,7 +47,7 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates") {
 }
 
 fun isNonStable(version: String): Boolean {
-    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
+    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
     val regex = "^[0-9,.v-]+(-r)?$".toRegex()
     val isStable = stableKeyword || regex.matches(version)
     return isStable.not()

diff --git a/bench/java/gradle/wrapper/gradle-wrapper.properties b/bench/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/example/web/package.json b/example/web/package.json
@@ -13,23 +13,23 @@
     "lint": "yarn lint:js && yarn lint:style"
   },
   "dependencies": {
-    "buffer": "^5.7.1",
-    "vue": "^3.2.47"
+    "buffer": "^6.0.3",
+    "vue": "^3.4.3"
   },
   "devDependencies": {
-    "@parcel/transformer-raw": "^2.8.3",
-    "@parcel/transformer-sass": "^2.8.3",
-    "@parcel/transformer-vue": "^2.8.3",
-    "eslint": "^8.39.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "^9.11.0",
-    "parcel": "^2.8.3",
-    "postcss": "^8.4.23",
+    "@parcel/transformer-raw": "^2.10.3",
+    "@parcel/transformer-sass": "^2.10.3",
+    "@parcel/transformer-vue": "^2.10.3",
+    "eslint": "^8.56.0",
+    "eslint-plugin-prettier": "^5.1.2",
+    "eslint-plugin-vue": "^9.19.2",
+    "parcel": "^2.10.3",
+    "postcss": "^8.4.32",
     "postcss-html": "^1.5.0",
-    "rimraf": "^5.0.0",
-    "sass": "^1.62.1",
-    "stylelint": "^15.6.1",
-    "stylelint-config-recommended-vue": "^1.4.0",
-    "typescript": "^5.0.4"
+    "rimraf": "^5.0.5",
+    "sass": "^1.69.6",
+    "stylelint": "^16.1.0",
+    "stylelint-config-recommended-vue": "^1.5.0",
+    "typescript": "^5.3.3"
   }
 }