Merge 5cec424 into 66c9362

ARK-Builders · Dec 12, 2024 · 3b7ea9d · 3b7ea9d
2 parents 66c9362 + 5cec424
commit 3b7ea9d
Show file tree

Hide file tree

Showing 16 changed files with 361 additions and 127 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,20 +21,11 @@ jobs:
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: nightly # nightly is required for fmt
-          components: rustfmt, clippy
-
-      - name: Check
-        run: cargo check
 
-      - name: Format
-        run: |
-          cargo fmt --all -- --check
-          cargo clippy --workspace --bins -- -D warnings
-
-      - name: Build Debug
-        run: cargo build --verbose
+      - name: Set up Cargo Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          save-if: false
 
       - name: Run tests
         run: cargo test --verbose
@@ -54,6 +45,15 @@ jobs:
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v3
 
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Set up Android NDK
+        uses: nttld/setup-ndk@v1
+        with:
+          link-to-sdk: true
+          ndk-version: r28-beta1
+
       - name: Java tests
         run: gradle test
         working-directory: ./java
@@ -68,12 +68,17 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
 
-      - name: Build Release
-        run: cargo build --verbose --release
+      - name: Set up Cargo Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          save-if: false
 
       - name: Run tests
         run: cargo test --workspace --verbose
 
+      - name: Build Release
+        run: cargo build --verbose --release
+
       - name: Run `ark-cli watch` test
         run: ./integration/ark-cli-watch.sh
 
@@ -86,6 +91,15 @@ jobs:
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v3
 
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Set up Android NDK
+        uses: nttld/setup-ndk@v1
+        with:
+          link-to-sdk: true
+          ndk-version: r28-beta1
+
       - name: Java tests
         run: gradle test
         working-directory: ./java
@@ -100,12 +114,17 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
 
-      - name: Build Release
-        run: cargo build --verbose --release
+      - name: Set up Cargo Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          save-if: false
 
       - name: Run tests
         run: cargo test --workspace --verbose
 
+      - name: Build Release
+        run: cargo build --verbose --release
+
       - name: Run `ark-cli watch` test
         run: ./integration/ark-cli-watch.sh
 
@@ -118,6 +137,15 @@ jobs:
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v3
 
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Set up Android NDK
+        uses: nttld/setup-ndk@v1
+        with:
+          link-to-sdk: true
+          ndk-version: r28-beta1
+
       - name: Java tests
         run: gradle test
         working-directory: ./java
diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
@@ -0,0 +1,82 @@
+name: Cache build
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  linux:
+    name: Linux
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Set up Cargo Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          save-if: true
+
+      - name: Run tests
+        run: cargo test --workspace --verbose --release
+
+  windows:
+    name: Windows
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Set up Cargo Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          save-if: true
+
+      - name: Run tests
+        run: cargo test --workspace --verbose --release
+
+  mac-intel:
+    name: MacOS Intel
+    runs-on: macos-14
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Set up Cargo Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          save-if: true
+
+      - name: Run tests
+        run: cargo test --workspace --verbose --release
+
+  mac-arm:
+    name: MacOS ARM
+    runs-on: macos-13-xlarge
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Set up Cargo Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          save-if: true
+
+      - name: Run tests
+        run: cargo test --workspace --verbose --release
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,56 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
+
+      - name: Set up Cargo Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          save-if: false
+
+      - name: Run tests
+        run: cargo test --workspace --verbose
+
+      - name: Install JDK
+        uses: actions/[email protected]
+        with:
+          distribution: "temurin"
+          java-version: "22"
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Set up Android NDK
+        uses: nttld/setup-ndk@v1
+        with:
+          link-to-sdk: true
+          ndk-version: r28-beta1
+
+      - name: Java tests
+        run: gradle test
+        working-directory: ./java
+
+      - name: Publish Java release
+        run: gradle publish
+        working-directory: ./java
+        env:
+          GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
@@ -19,6 +19,11 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
 
+      - name: Set up Cargo Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          save-if: true
+
       - name: Run tests
         run: cargo test --workspace --verbose --release
 
@@ -32,6 +37,11 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
 
+      - name: Set up Cargo Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          save-if: true
+
       - name: Run tests
         run: cargo test --workspace --verbose --release
 
@@ -45,6 +55,11 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
 
+      - name: Set up Cargo Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          save-if: true
+
       - name: Run tests
         run: cargo test --workspace --verbose --release
 
@@ -58,5 +73,10 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
 
+      - name: Set up Cargo Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          save-if: true
+
       - name: Run tests
         run: cargo test --workspace --verbose --release
diff --git a/ark-cli/README.md b/ark-cli/README.md
@@ -1,32 +1,5 @@
 # Ark-CLI
 
-### Installation
-
-To compile you will need openssl libraries and headers:
-
-```shell
-# macOS (Homebrew)
-$ brew install openssl@3
-
-# macOS (MacPorts)
-$ sudo port install openssl
-
-# macOS (pkgsrc)
-$ sudo pkgin install openssl
-
-# Arch Linux
-$ sudo pacman -S pkg-config openssl
-
-# Debian and Ubuntu
-$ sudo apt-get install pkg-config libssl-dev
-
-# Fedora
-$ sudo dnf install pkg-config perl-FindBin openssl-devel
-
-# Alpine Linux
-$ apk add pkgconfig openssl-dev
-```
-
 ### Usage
 
 ```shell

diff --git a/data-error/Cargo.toml b/data-error/Cargo.toml
@@ -10,7 +10,7 @@ bench = false
 
 [dependencies]
 thiserror = "1"
-reqwest = "0.11.11"
+reqwest = { version = "0.11.11", features = [ "json", "rustls-tls" ], default-features = false }
 serde_json = "1.0.82"
 anyhow = "1"
 url = { version = "2.2.2", features = ["serde"] }
diff --git a/data-link/Cargo.toml b/data-link/Cargo.toml
@@ -13,7 +13,7 @@ log = { version = "0.4.17", features = ["release_max_level_off"] }
 serde_json = "1.0.82"
 serde = { version = "1.0.138", features = ["derive"] }
 url = { version = "2.2.2", features = ["serde"] }
-reqwest = "0.11.11"
+reqwest = { version = "0.11.11", features = [ "json", "rustls-tls" ], default-features = false }
 scraper = "0.13.0"
 tokio = { version = "1", features = ["full"] }
 

diff --git a/java/build.gradle b/java/build.gradle
@@ -0,0 +1,21 @@
+buildscript {
+    repositories {
+        google()
+        gradlePluginPortal()
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+    dependencies {
+        classpath libs.gradle
+        classpath libs.rust.android
+        classpath libs.axion.release.plugin
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        gradlePluginPortal()
+        maven { url "https://jitpack.io" }
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+}
diff --git a/java/gradle/libs.versions.toml b/java/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
-# This file was generated by the Gradle 'init' task.
-# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
-
 [versions]
-commons-math3 = "3.6.1"
-guava = "33.0.0-jre"
-junit-jupiter = "5.10.2"
+gradle = "8.7.3"
+rustAndroid = "0.9.4"
+junitJupiterApi = "5.11.3"
+axionReleasePlugin = "1.17.0"
 
 [libraries]
-commons-math3 = { module = "org.apache.commons:commons-math3", version.ref = "commons-math3" }
-guava = { module = "com.google.guava:guava", version.ref = "guava" }
-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
+gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
+rust-android = { module = "org.mozilla.rust-android-gradle:plugin", version.ref = "rustAndroid" }
+junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junitJupiterApi" }
+junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junitJupiterApi" }
+axion-release-plugin = { module = "pl.allegro.tech.build:axion-release-plugin", version.ref = "axionReleasePlugin" }