diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 1bfa79ad8..7c368cda2 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -65,7 +65,7 @@ jobs: - name: Setup Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.62 + toolchain: 1.69 - name: Create native dependencies run: make - name: Cache cargo dependencies and targets @@ -79,13 +79,15 @@ jobs: key: ${{ runner.os }}-${{ env.dummy }}-rust-java-deps-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock', '**/pom.xml') }} restore-keys: | ${{ runner.os }}-${{ env.dummy }}-rust-java-deps + - name: Initialize Parent Pom + run: mvn install -N - name: Build and test sdk run: cd concordium-sdk && mvn --batch-mode --update-snapshots install - name: Build and test examples run: cd concordium-sdk-examples && mvn --batch-mode --update-snapshots install build-android: # Use fixed OS version because we install packages on the system. - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: ${{ !github.event.pull_request.draft }} steps: - name: Checkout @@ -101,7 +103,7 @@ jobs: - name: Setup Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.62 + toolchain: 1.69 - name: Create native dependencies run: make add-android-targets && make android - name: Build android sdk diff --git a/Makefile b/Makefile index 9c0195645..4c7d2f627 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,7 @@ define android-command endef add-android-targets: + cargo install --version 3.4.0 cargo-ndk --locked rustup target add aarch64-linux-android rustup target add armv7-linux-androideabi rustup target add i686-linux-android diff --git a/concordium-android-sdk/pom.xml b/concordium-android-sdk/pom.xml index 9416cbf0a..3c79fb65a 100644 --- a/concordium-android-sdk/pom.xml +++ b/concordium-android-sdk/pom.xml @@ -151,6 +151,9 @@ true + + 27 + ${project.basedir}/native diff --git a/concordium-sdk-examples/pom.xml b/concordium-sdk-examples/pom.xml index 1510bf94e..821930fcc 100644 --- a/concordium-sdk-examples/pom.xml +++ b/concordium-sdk-examples/pom.xml @@ -12,7 +12,6 @@ 8 8 1.18.24 - diff --git a/pom.xml b/pom.xml index 03537d63c..b96ddf234 100644 --- a/pom.xml +++ b/pom.xml @@ -11,5 +11,6 @@ concordium-sdk concordium-android-sdk + concordium-sdk-examples \ No newline at end of file