3.2.8

null8626 · Oct 29, 2024 · ed6ed63 · ed6ed63
1 parent 3d5c49e
commit ed6ed63
Show file tree

Hide file tree

Showing 28 changed files with 118 additions and 134 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -34,7 +34,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: latest
+          node-version: 22.x
       - name: Setup
         id: setup
         run: node scripts/ci_setup.mjs
@@ -63,7 +63,7 @@ jobs:
       - uses: actions/setup-node@v4
         if: ${{ !matrix.settings.docker }}
         with:
-          node-version: latest
+          node-version: 22.x
       - name: Ensure no default features is working
         working-directory: core
         run: cargo c --no-default-features
@@ -130,7 +130,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: latest
+          node-version: 22.x
       - name: Setup Rust
         uses: actions-rs/toolchain@v1
         with:
@@ -296,7 +296,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: latest
+          node-version: 22.x
       - name: Setup Rust
         uses: actions-rs/toolchain@v1
         with:
@@ -349,7 +349,7 @@ jobs:
       - uses: actions/setup-node@v4
         if: ${{ !matrix.settings.docker }}
         with:
-          node-version: latest
+          node-version: 22.x
           cache: yarn
       - name: Download artifact
         uses: actions/download-artifact@v4
@@ -421,7 +421,7 @@ jobs:
       - uses: actions/setup-node@v4
         if: ${{ !matrix.settings.docker }}
         with:
-          node-version: latest
+          node-version: 22.x
           cache: yarn
       - name: Install Rust
         uses: actions-rs/toolchain@v1
@@ -442,7 +442,7 @@ jobs:
       - uses: actions/setup-node@v4
         if: ${{ matrix.settings.target == 'i686-pc-windows-msvc' }}
         with:
-          node-version: latest
+          node-version: 22.x
           cache: yarn
           architecture: x86
       - name: Install dependencies
@@ -524,7 +524,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: latest
+          node-version: 22.x
           cache: yarn
       - name: Install dependencies
         working-directory: bindings/node
@@ -551,7 +551,7 @@ jobs:
           toolchain: stable
       - uses: actions/setup-node@v4
         with:
-          node-version: latest
+          node-version: 22.x
       - name: Setup wasm-pack
         run: cargo install wasm-pack
       - name: Build wasm
@@ -592,7 +592,7 @@ jobs:
           toolchain: stable
       - uses: actions/setup-node@v4
         with:
-          node-version: latest
+          node-version: 22.x
       - name: Setup clang
         if: ${{ needs.setup.outputs.native_affected == 'true' || needs.setup.outputs.release != 'null' }}
         run: |
@@ -663,7 +663,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/setup-node@v4
         with:
-          node-version: latest
+          node-version: 22.x
       - uses: ssciwr/doxygen-install@v1
       - name: Download wasm artifact
         if: ${{ needs.setup.outputs.wasm_affected == 'true' || needs.setup.outputs.release != 'null' }}
@@ -700,12 +700,17 @@ jobs:
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4
-  java-publish:
-    name: Publish java binding
+  publish:
+    name: Publish
     runs-on: ubuntu-latest
     needs:
       - setup
       - commit
+      - node-test
+      - node-freebsd
+      - native-test
+      - commit
+      - pages
       - java
     if: ${{ always() && github.event_name != 'pull_request' && needs.setup.outputs.release != 'null' }}
     env:
@@ -722,47 +727,9 @@ jobs:
         with:
           distribution: oracle
           java-version: 21
-      - name: Prepare java binding
-        working-directory: bindings/java
-        run: |
-          unzip ./bin/bindings.zip -d ./bin
-          chmod +x ./gradlew
-          ./gradlew jreleaserConfig
-          ./gradlew clean build publish -x test
-        shell: bash
-      - name: Publish java binding
-        working-directory: bindings/java
-        run: ./gradlew jreleaserFullRelease
-        continue-on-error: true
-        shell: bash
-      - name: Move jar file
-        working-directory: bindings/java
-        run: mv ./build/libs/decancer-${{ needs.setup.outputs.release }}.jar ../../decancer.jar
-        shell: bash
-      - name: Upload jar artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: java-jar
-          path: decancer.jar
-          if-no-files-found: error
-  publish:
-    name: Publish
-    runs-on: ubuntu-latest
-    needs:
-      - setup
-      - node-test
-      - node-freebsd
-      - native-test
-      - commit
-      - pages
-      - java-publish
-    if: ${{ always() && github.event_name != 'pull_request' && needs.setup.outputs.release != 'null' }}
-    steps:
-      - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: latest
-          cache: yarn
+          node-version: 22.x
       - name: Download all artifacts
         uses: actions/download-artifact@v4
         with:
@@ -783,6 +750,23 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Prepare java binding
+        working-directory: bindings/java
+        run: |
+          unzip ./bin/bindings.zip -d ./bin
+          chmod +x ./gradlew
+          ./gradlew jreleaserConfig
+          ./gradlew clean build publish -x test
+        shell: bash
+      - name: Publish java binding
+        working-directory: bindings/java
+        run: ./gradlew jreleaserFullRelease
+        continue-on-error: true
+        shell: bash
+      - name: Move jar file
+        working-directory: bindings/java
+        run: mv ./build/libs/decancer-${{ needs.setup.outputs.release }}.jar ../../decancer.jar
+        shell: bash
       - name: Import Actions GPG key
         uses: crazy-max/ghaction-import-gpg@v6
         with:

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ A library that removes common unicode confusables/homoglyphs from strings.
 In your `Cargo.toml`:
 
 ```toml
-decancer = "3.2.7"
+decancer = "3.2.8"
 ```
 
 <!---[ end, begin DECANCER_GLOBAL ]--->
@@ -78,7 +78,7 @@ In your code:
 
 ```html
 <script type="module">
-  import init from 'https://cdn.jsdelivr.net/gh/null8626/[email protected].7/bindings/wasm/bin/decancer.min.js'
+  import init from 'https://cdn.jsdelivr.net/gh/null8626/[email protected].8/bindings/wasm/bin/decancer.min.js'
 
   const decancer = await init()
 </script>
@@ -90,7 +90,7 @@ In your code:
 
 ### As a JAR file
 
-[You can download the latest JAR file here.](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer.jar)
+[You can download the latest JAR file here.](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer.jar)
 
 ### As a dependency
 
@@ -103,7 +103,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'io.github.null8626:decancer:3.2.7'
+  implementation 'io.github.null8626:decancer:3.2.8'
 }
 ```
 
@@ -125,7 +125,7 @@ In your `pom.xml`:
   <dependency>
     <groupId>io.github.null8626</groupId>
     <artifactId>decancer</artifactId>
-    <version>3.2.7</version>
+    <version>3.2.8</version>
   </dependency>
 </dependencies>
 ```
@@ -160,35 +160,35 @@ Tip: You can shrink the size of the resulting JAR file by removing binaries in t
 
 ### Download
 
-- [Header file](https://raw.githubusercontent.com/null8626/decancer/v3.2.7/bindings/native/decancer.h)
-- [Download for ARM64 macOS (11.0+, Big Sur+)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-aarch64-apple-darwin.zip)
-- [Download for ARM64 iOS](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-aarch64-apple-ios.zip)
-- [Download for Apple iOS Simulator on ARM6](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-aarch64-apple-ios-sim.zip)
-- [Download for ARM64 Android](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-aarch64-linux-android.zip)
-- [Download for ARM64 Windows MSVC](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-aarch64-pc-windows-msvc.zip)
-- [Download for ARM64 Linux (kernel 4.1, glibc 2.17+)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-aarch64-unknown-linux-gnu.zip)
-- [Download for ARM64 Linux with MUSL](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-aarch64-unknown-linux-musl.zip)
-- [Download for ARMv6 Linux (kernel 3.2, glibc 2.17)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-arm-unknown-linux-gnueabi.zip)
-- [Download for ARMv5TE Linux (kernel 4.4, glibc 2.23)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-armv5te-unknown-linux-gnueabi.zip)
-- [Download for ARMv7-A Android](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-armv7-linux-androideabi.zip)
-- [Download for ARMv7-A Linux (kernel 4.15, glibc 2.27)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-armv7-unknown-linux-gnueabi.zip)
-- [Download for ARMv7-A Linux, hardfloat (kernel 3.2, glibc 2.17)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-armv7-unknown-linux-gnueabihf.zip)
-- [Download for 32-bit Linux w/o SSE (kernel 3.2, glibc 2.17)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-i586-unknown-linux-gnu.zip)
-- [Download for 32-bit MSVC (Windows 7+)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-i686-pc-windows-msvc.zip)
-- [Download for 32-bit FreeBSD](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-i686-unknown-freebsd.zip)
-- [Download for 32-bit Linux (kernel 3.2+, glibc 2.17+)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-i686-unknown-linux-gnu.zip)
-- [Download for PPC64LE Linux (kernel 3.10, glibc 2.17)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-powerpc64le-unknown-linux-gnu.zip)
-- [Download for RISC-V Linux (kernel 4.20, glibc 2.29)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-riscv64gc-unknown-linux-gnu.zip)
-- [Download for S390x Linux (kernel 3.2, glibc 2.17)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-s390x-unknown-linux-gnu.zip)
-- [Download for SPARC Solaris 11, illumos](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-sparcv9-sun-solaris.zip)
-- [Download for Thumb2-mode ARMv7-A Linux with NEON (kernel 4.4, glibc 2.23)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-thumbv7neon-unknown-linux-gnueabihf.zip)
-- [Download for 64-bit macOS (10.12+, Sierra+)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-x86_64-apple-darwin.zip)
-- [Download for 64-bit iOS](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-x86_64-apple-ios.zip)
-- [Download for 64-bit MSVC (Windows 7+)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-x86_64-pc-windows-msvc.zip)
-- [Download for 64-bit FreeBSD](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-x86_64-unknown-freebsd.zip)
-- [Download for 64-bit illumos](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-x86_64-unknown-illumos.zip)
-- [Download for 64-bit Linux (kernel 3.2+, glibc 2.17+)](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-x86_64-unknown-linux-gnu.zip)
-- [Download for 64-bit Linux with MUSL](https://github.com/null8626/decancer/releases/download/v3.2.7/decancer-x86_64-unknown-linux-musl.zip)
+- [Header file](https://raw.githubusercontent.com/null8626/decancer/v3.2.8/bindings/native/decancer.h)
+- [Download for ARM64 macOS (11.0+, Big Sur+)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-aarch64-apple-darwin.zip)
+- [Download for ARM64 iOS](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-aarch64-apple-ios.zip)
+- [Download for Apple iOS Simulator on ARM6](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-aarch64-apple-ios-sim.zip)
+- [Download for ARM64 Android](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-aarch64-linux-android.zip)
+- [Download for ARM64 Windows MSVC](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-aarch64-pc-windows-msvc.zip)
+- [Download for ARM64 Linux (kernel 4.1, glibc 2.17+)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-aarch64-unknown-linux-gnu.zip)
+- [Download for ARM64 Linux with MUSL](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-aarch64-unknown-linux-musl.zip)
+- [Download for ARMv6 Linux (kernel 3.2, glibc 2.17)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-arm-unknown-linux-gnueabi.zip)
+- [Download for ARMv5TE Linux (kernel 4.4, glibc 2.23)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-armv5te-unknown-linux-gnueabi.zip)
+- [Download for ARMv7-A Android](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-armv7-linux-androideabi.zip)
+- [Download for ARMv7-A Linux (kernel 4.15, glibc 2.27)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-armv7-unknown-linux-gnueabi.zip)
+- [Download for ARMv7-A Linux, hardfloat (kernel 3.2, glibc 2.17)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-armv7-unknown-linux-gnueabihf.zip)
+- [Download for 32-bit Linux w/o SSE (kernel 3.2, glibc 2.17)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-i586-unknown-linux-gnu.zip)
+- [Download for 32-bit MSVC (Windows 7+)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-i686-pc-windows-msvc.zip)
+- [Download for 32-bit FreeBSD](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-i686-unknown-freebsd.zip)
+- [Download for 32-bit Linux (kernel 3.2+, glibc 2.17+)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-i686-unknown-linux-gnu.zip)
+- [Download for PPC64LE Linux (kernel 3.10, glibc 2.17)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-powerpc64le-unknown-linux-gnu.zip)
+- [Download for RISC-V Linux (kernel 4.20, glibc 2.29)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-riscv64gc-unknown-linux-gnu.zip)
+- [Download for S390x Linux (kernel 3.2, glibc 2.17)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-s390x-unknown-linux-gnu.zip)
+- [Download for SPARC Solaris 11, illumos](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-sparcv9-sun-solaris.zip)
+- [Download for Thumb2-mode ARMv7-A Linux with NEON (kernel 4.4, glibc 2.23)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-thumbv7neon-unknown-linux-gnueabihf.zip)
+- [Download for 64-bit macOS (10.12+, Sierra+)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-x86_64-apple-darwin.zip)
+- [Download for 64-bit iOS](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-x86_64-apple-ios.zip)
+- [Download for 64-bit MSVC (Windows 7+)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-x86_64-pc-windows-msvc.zip)
+- [Download for 64-bit FreeBSD](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-x86_64-unknown-freebsd.zip)
+- [Download for 64-bit illumos](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-x86_64-unknown-illumos.zip)
+- [Download for 64-bit Linux (kernel 3.2+, glibc 2.17+)](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-x86_64-unknown-linux-gnu.zip)
+- [Download for 64-bit Linux with MUSL](https://github.com/null8626/decancer/releases/download/v3.2.8/decancer-x86_64-unknown-linux-musl.zip)
 
 ### Building from source
 
@@ -292,7 +292,7 @@ console.log(cured.toString())
     <br />
     <button id="cure" onclick="cure()">cure!</button>
     <script type="module">
-      import init from 'https://cdn.jsdelivr.net/gh/null8626/[email protected].7/bindings/wasm/bin/decancer.min.js'
+      import init from 'https://cdn.jsdelivr.net/gh/null8626/[email protected].8/bindings/wasm/bin/decancer.min.js'
     
       const decancer = await init()
     

diff --git a/bindings/java/build.gradle b/bindings/java/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'io.github.null8626'
-version '3.2.7'
+version '3.2.8'
 description 'A library that removes common unicode confusables/homoglyphs from strings.'
 
 repositories {
@@ -15,7 +15,7 @@ repositories {
 
 jar {
   archiveBaseName = 'decancer'
-  archiveVersion = '3.2.7'
+  archiveVersion = '3.2.8'
 
   from('./bin') {
     include '*.dll'
@@ -29,7 +29,7 @@ publishing {
     maven(MavenPublication) {
       artifactId = 'decancer'
       groupId = 'io.github.null8626'
-      version = '3.2.7'
+      version = '3.2.8'
 
       from components.java
 
@@ -43,7 +43,7 @@ publishing {
           license {
             name = 'MIT License'
             distribution = 'repo'
-            url = 'https://github.com/null8626/decancer/blob/v3.2.7/LICENSE'
+            url = 'https://github.com/null8626/decancer/blob/v3.2.8/LICENSE'
           }
         }
 
@@ -85,7 +85,7 @@ publishing {
 jreleaser {
   project {
     name = 'decancer'
-    version = '3.2.7'
+    version = '3.2.8'
     description = 'A library that removes common unicode confusables/homoglyphs from strings.'
     longDescription = 'A library that removes common unicode confusables/homoglyphs from strings. By default, the library supports filtering over 220,000 unicode codepoints and reordering right-to-left text as it were to be rendered graphically.'
     license = 'MIT'

diff --git a/bindings/java/src/main/java/io/github/null8626/decancer/CuredString.java b/bindings/java/src/main/java/io/github/null8626/decancer/CuredString.java
@@ -12,7 +12,7 @@
  * </p>
  *
  * @author null8626
- * @version 3.2.7
+ * @version 3.2.8
  * @since 3.0.0
  */
 public class CuredString {

diff --git a/bindings/java/src/main/java/io/github/null8626/decancer/Match.java b/bindings/java/src/main/java/io/github/null8626/decancer/Match.java
@@ -4,7 +4,7 @@
  * A match yielded by the CuredString.find() method.
  *
  * @author null8626
- * @version 3.2.7
+ * @version 3.2.8
  * @since 3.1.0
  */
 public class Match {

diff --git a/bindings/java/src/main/java/io/github/null8626/decancer/Options.java b/bindings/java/src/main/java/io/github/null8626/decancer/Options.java
@@ -8,7 +8,7 @@
  * </p>
  *
  * @author null8626
- * @version 3.2.7
+ * @version 3.2.8
  * @since 3.0.0
  */
 public final class Options {

diff --git a/bindings/native/Cargo.toml b/bindings/native/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "decancer_native"
-version = "3.2.7"
+version = "3.2.8"
 edition = "2021"
 publish = false