GRIN/goblin
1
0
Fork 0
forked from GRIN/grim
Code Pull Requests Activity

ci: forgejo

Browse Source
This commit is contained in:
ardocrat
2025-11-05 13:26:05 +03:00
parent 8ba11daf31
commit 97d8b86d39
10 changed files with 315 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.forgejo/workflows/android.yaml
+28
View File
@@ -0,0 +1,28 @@
on:
workflow_call:
inputs:
version:
required: true
type: string
jobs:
release:
runs-on: ubuntu
steps:
- uses: actions/checkout@v5
- run: mkdir release
- name: Setup Java build
run: |
chmod +x android/gradlew
echo "${{ secrets.ANDROID_KEYSTORE }}" > release.keystore.txt
base64 -d release.keystore.txt > android/keystore
echo "${{ secrets.ANDROID_KEYSTORE_PROPS }}" > release.keystore.props.txt
base64 -d release.keystore.props.txt > android/keystore.properties
- name: Release APKs
run: |
chmod +x scripts/android.sh && ./scripts/android.sh release ${{ inputs.version }}
mv android/grim* release
- uses: forgejo/upload-artifact@v4
with:
name: release_android
path: release/*
.forgejo/workflows/build.yaml
+15
View File
@@ -0,0 +1,15 @@
on:
push:
tags-ignore:
- "*"
branches-ignore:
- master
- ci
jobs:
build:
runs-on: ubuntu
steps:
- uses: actions/checkout@v5
- name: Build
run: cargo build --release
.forgejo/workflows/linux.yaml
+37
View File
@@ -0,0 +1,37 @@
on:
workflow_call:
inputs:
version:
required: true
type: string
jobs:
release:
runs-on: ubuntu
steps:
- uses: actions/checkout@v5
- run: mkdir release
- name: Release Linux x86
run: cargo zigbuild --release --target x86_64-unknown-linux-gnu
- name: AppImage x86
run: |
cp target/x86_64-unknown-linux-gnu/release/grim linux/Grim.AppDir/AppRun
appimagetool linux/Grim.AppDir grim-${{ inputs.version }}-linux-x86_64.AppImage
cp grim-${{ inputs.version }}-linux-x86_64.AppImage release/
- name: Checksum AppImage x86
working-directory: release
run: sha256sum grim-${{ inputs.version }}-linux-x86_64.AppImage > grim-${{ inputs.version }}-linux-x86_64-appimage-sha256sum.txt
- name: Release Linux ARM
run: cargo zigbuild --release --target aarch64-unknown-linux-gnu
- name: AppImage ARM
run: |
cp target/aarch64-unknown-linux-gnu/release/grim linux/Grim.AppDir/AppRun
appimagetool linux/Grim.AppDir grim-${{ inputs.version }}-linux-arm.AppImage
cp grim-${{ inputs.version }}-linux-arm.AppImage release/
- name: Checksum AppImage ARM
working-directory: release
run: sha256sum grim-${{ inputs.version }}-linux-arm.AppImage > grim-${{ inputs.version }}-linux-arm-appimage-sha256sum.txt
- uses: forgejo/upload-artifact@v4
with:
name: release_linux
path: release/*
.forgejo/workflows/macos.yaml
+55
View File
@@ -0,0 +1,55 @@
on:
workflow_call:
inputs:
version:
required: true
type: string
jobs:
release:
runs-on: ubuntu
steps:
- uses: actions/checkout@v5
- run: mkdir release
- name: Release MacOS x86
run: |
cargo zigbuild --release --target x86_64-apple-darwin
mv target/x86_64-apple-darwin/release/grim macos/Grim.app/Contents/MacOS
- name: Archive x86
working-directory: macos
run: |
zip -r grim-${{ inputs.version }}-macos-x86_64.zip Grim.app
mv grim-${{ inputs.version }}-macos-x86_64.zip ../release
- name: Checksum Archive x86
working-directory: release
run: sha256sum grim-${{ inputs.version }}-macos-x86_64.zip > grim-${{ inputs.version }}-macos-x86_64-sha256sum.txt
- name: Release ARM
run: |
cargo zigbuild --release --target aarch64-apple-darwin
mv target/aarch64-apple-darwin/release/grim macos/Grim.app/Contents/MacOS
- name: Archive ARM
working-directory: macos
run: |
zip -r grim-${{ inputs.version }}-macos-arm.zip Grim.app
mv grim-${{ inputs.version }}-macos-arm.zip ../release
- name: Checksum Archive ARM
working-directory: release
run: sha256sum grim-${{ inputs.version }}-macos-arm.zip > grim-${{ inputs.version }}-macos-arm-sha256sum.txt
- name: Release MacOS Universal
run: |
rm ~/.cargo/.package-cache
cargo clean
cargo zigbuild --release --target universal2-apple-darwin
mv target/universal2-apple-darwin/release/grim macos/Grim.app/Contents/MacOS
- name: Archive Universal
working-directory: macos
run: |
zip -r grim-${{ inputs.version }}-macos-universal.zip Grim.app
mv grim-${{ inputs.version }}-macos-universal.zip ../release
- name: Checksum Release Universal
working-directory: release
run: sha256sum grim-${{ inputs.version }}-macos-universal.zip > grim-${{ inputs.version }}-macos-universal-sha256sum.txt
- uses: forgejo/upload-artifact@v4
with:
name: release_macos
path: release/*
.forgejo/workflows/release.yaml
+124
View File
@@ -0,0 +1,124 @@
on:
push:
branches:
- master
- ci
tags-ignore:
- "*-dev*"
jobs:
version:
runs-on: ubuntu
outputs:
v: ${{ steps.version.outputs.v }}
steps:
- uses: actions/checkout@v5
- name: Get version
id: version
run: |
ver="$(grep -m 1 -Po 'version = "\K[^"]*' Cargo.toml)"
[[ $ver == *"-dev"* ]] && ver=${ver} || ver=${ver}-dev
[[ ${{ forgejo.ref_type }} == 'tag' ]] && app_ver=${{ forgejo.ref_name }} || app_ver=${ver}
echo "v=${app_ver}" >> "$FORGEJO_OUTPUT"
echo $app_ver
[[ ${{ forgejo.ref_type }} == 'branch' ]] && override=true || override=false
echo "override=${override}" >> "$FORGEJO_OUTPUT"
echo "override: ${override}"
[[ ${{ forgejo.ref_type }} == 'tag' ]] && pre=false || pre=true
echo "pre=${pre}" >> "$FORGEJO_OUTPUT"
echo "pre-release: ${pre}"
- name: Check existing release
if: ${{ forgejo.ref_type == 'tag' }}
id: check
run: |
git fetch --tags
dev_sha=$(git rev-parse refs/tags/${{ forgejo.ref_name }}-dev)
[[ "$(git show-ref)" == *"${dev_sha}"* ]] && exists='true' || exists='false'
echo "exists=${exists}" >> "$FORGEJO_OUTPUT"
echo ${exists}
mkdir release
- uses: actions/forgejo-release@v2.7.3
if: ${{ forgejo.ref_type == 'tag' && steps.check.outputs.exists == 'true' }}
with:
direction: download
token: ${{ secrets.RELEASE_TOKEN }}
tag: "${{ forgejo.ref_name }}-dev"
release-dir: ./release
- name: Rename files
if: ${{ forgejo.ref_type == 'tag' && steps.check.outputs.exists == 'true' }}
working-directory: release
run: for f in *; do mv "$f" "$(echo "$f" | sed s/-dev-/-/)"; done
- uses: actions/forgejo-release@v2.7.3
if: ${{ forgejo.ref_type == 'tag' && steps.check.outputs.exists == 'true' }}
with:
direction: upload
token: ${{ secrets.RELEASE_TOKEN }}
tag: ${{ forgejo.ref_name }}
override: false
prerelease: false
release-dir: ./release
release-notes: ""
android:
if: ${{ forgejo.ref_type == 'branch' || needs.check.outputs.exists == 'false' }}
runs-on: ubuntu
needs: version
uses: ./.forgejo/workflows/android.yaml
with:
version: ${{ needs.version.outputs.v }}
secrets:
RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
ANDROID_KEYSTORE: ${{ secrets.ANDROID_KEYSTORE }}
ANDROID_KEYSTORE_PROPS: ${{ secrets.ANDROID_KEYSTORE_PROPS }}
linux:
if: ${{ forgejo.ref_type == 'branch' || needs.check.outputs.exists == 'false' }}
runs-on: ubuntu
needs: [version, android]
uses: ./.forgejo/workflows/linux.yaml
with:
version: ${{ needs.version.outputs.v }}
secrets:
RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
macos:
if: ${{ forgejo.ref_type == 'branch' || needs.check.outputs.exists == 'false' }}
runs-on: ubuntu
needs: [version, android, linux]
uses: ./.forgejo/workflows/macos.yaml
with:
version: ${{ needs.version.outputs.v }}
secrets:
RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
windows:
if: ${{ forgejo.ref_type == 'branch' || needs.check.outputs.exists == 'false' }}
runs-on: ubuntu
needs: [version]
uses: ./.forgejo/workflows/windows.yaml
with:
version: ${{ needs.version.outputs.v }}
secrets:
RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
release:
if: ${{ forgejo.ref_type == 'branch' || needs.check.outputs.exists == 'false' }}
runs-on: ubuntu
needs: [version, windows]
steps:
- run: mkdir release
- name: Download All Artifacts
uses: forgejo/download-artifact@v4
with:
path: release
pattern: release_*
merge-multiple: true
- uses: actions/forgejo-release@v2.7.3
with:
direction: upload
token: ${{ secrets.RELEASE_TOKEN }}
tag: ${{ needs.version.outputs.v }}
override: ${{ needs.version.outputs.override }}
prerelease: ${{ needs.version.outputs.pre }}
release-dir: release
release-notes: ""
.forgejo/workflows/windows.yaml
+25
View File
@@ -0,0 +1,25 @@
on:
workflow_call:
inputs:
version:
required: true
type: string
jobs:
windows:
runs-on: ubuntu
steps:
- uses: actions/checkout@v5
- run: mkdir release
- name: Release Windows x86
run: |
cargo build --release --target x86_64-pc-windows-gnu
zip grim-${{ inputs.version }}-win-x86_64.zip target/x86_64-pc-windows-gnu/release/grim.exe
mv grim-${{ inputs.version }}-win-x86_64.zip release/
- name: Checksum Archive x86
working-directory: release
run: sha256sum grim-${{ inputs.version }}-win-x86_64.zip > grim-${{ inputs.version }}-win-x86_64-sha256sum.txt
- uses: forgejo/upload-artifact@v4
with:
name: release_windows
path: release/*
Cargo.lock
Generated
+20 -20
View File
@@ -2372,7 +2372,7 @@ dependencies = [
[[package]]
name = "ecolor"
version = "0.31.1"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
source = "git+https://code.gri.mw/GUI/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"bytemuck",
"emath",
@@ -2442,7 +2442,7 @@ dependencies = [
[[package]]
name = "eframe"
version = "0.31.1"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
source = "git+https://code.gri.mw/GUI/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"ahash",
"bytemuck",
@@ -2476,7 +2476,7 @@ dependencies = [
[[package]]
name = "egui"
version = "0.31.1"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
source = "git+https://code.gri.mw/GUI/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"ahash",
"bitflags 2.9.1",
@@ -2492,7 +2492,7 @@ dependencies = [
[[package]]
name = "egui-winit"
version = "0.31.1"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
source = "git+https://code.gri.mw/GUI/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"ahash",
"arboard",
@@ -2510,7 +2510,7 @@ dependencies = [
[[package]]
name = "egui_extras"
version = "0.31.1"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
source = "git+https://code.gri.mw/GUI/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"ahash",
"egui",
@@ -2525,7 +2525,7 @@ dependencies = [
[[package]]
name = "egui_glow"
version = "0.31.1"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
source = "git+https://code.gri.mw/GUI/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"ahash",
"bytemuck",
@@ -2566,7 +2566,7 @@ dependencies = [
[[package]]
name = "emath"
version = "0.31.1"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
source = "git+https://code.gri.mw/GUI/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"bytemuck",
]
@@ -2693,7 +2693,7 @@ dependencies = [
[[package]]
name = "epaint"
version = "0.31.1"
source = "git+https://github.com/emilk/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
source = "git+https://code.gri.mw/GUI/egui?rev=f11a3510ba07ae87747d744d952676476a88c24e#f11a3510ba07ae87747d744d952676476a88c24e"
dependencies = [
"ab_glyph",
"ahash",
@@ -3488,7 +3488,7 @@ dependencies = [
"local-ip-address",
"log",
"nokhwa 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)",
"nokhwa 0.10.7 (git+https://github.com/l1npengtul/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6)",
"nokhwa 0.10.7 (git+https://code.gri.mw/ardocrat/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6)",
"parking_lot 0.12.3",
"pin-project",
"qrcode",
@@ -3783,7 +3783,7 @@ dependencies = [
[[package]]
name = "grin_wallet_api"
version = "5.4.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin-wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
source = "git+https://code.gri.mw/CORE/wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
dependencies = [
"base64 0.12.3",
"chrono",
@@ -3808,7 +3808,7 @@ dependencies = [
[[package]]
name = "grin_wallet_config"
version = "5.4.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin-wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
source = "git+https://code.gri.mw/CORE/wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
dependencies = [
"dirs 2.0.2",
"grin_core",
@@ -3823,7 +3823,7 @@ dependencies = [
[[package]]
name = "grin_wallet_controller"
version = "5.4.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin-wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
source = "git+https://code.gri.mw/CORE/wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
dependencies = [
"chrono",
"easy-jsonrpc-mw",
@@ -3857,7 +3857,7 @@ dependencies = [
[[package]]
name = "grin_wallet_impls"
version = "5.4.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin-wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
source = "git+https://code.gri.mw/CORE/wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
dependencies = [
"base64 0.12.3",
"blake2-rfc",
@@ -3896,7 +3896,7 @@ dependencies = [
[[package]]
name = "grin_wallet_libwallet"
version = "5.4.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin-wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
source = "git+https://code.gri.mw/CORE/wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
dependencies = [
"age",
"base64 0.9.3",
@@ -3935,7 +3935,7 @@ dependencies = [
[[package]]
name = "grin_wallet_util"
version = "5.4.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin-wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
source = "git+https://code.gri.mw/CORE/wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
dependencies = [
"data-encoding",
"ed25519-dalek 1.0.1",
@@ -5762,12 +5762,12 @@ dependencies = [
[[package]]
name = "nokhwa"
version = "0.10.7"
source = "git+https://github.com/l1npengtul/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6#612c861ef153cf0ee575d8dd1413b960e4e19dd6"
source = "git+https://code.gri.mw/ardocrat/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6#612c861ef153cf0ee575d8dd1413b960e4e19dd6"
dependencies = [
"flume",
"image",
"nokhwa-bindings-macos",
"nokhwa-core 0.1.5 (git+https://github.com/l1npengtul/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6)",
"nokhwa-core 0.1.5 (git+https://code.gri.mw/ardocrat/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6)",
"parking_lot 0.12.3",
"paste",
"thiserror 2.0.12",
@@ -5786,7 +5786,7 @@ dependencies = [
[[package]]
name = "nokhwa-bindings-macos"
version = "0.2.2"
source = "git+https://github.com/l1npengtul/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6#612c861ef153cf0ee575d8dd1413b960e4e19dd6"
source = "git+https://code.gri.mw/ardocrat/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6#612c861ef153cf0ee575d8dd1413b960e4e19dd6"
dependencies = [
"block",
"cocoa-foundation",
@@ -5794,7 +5794,7 @@ dependencies = [
"core-media-sys",
"core-video-sys",
"flume",
"nokhwa-core 0.1.5 (git+https://github.com/l1npengtul/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6)",
"nokhwa-core 0.1.5 (git+https://code.gri.mw/ardocrat/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6)",
"objc",
"once_cell",
]
@@ -5824,7 +5824,7 @@ dependencies = [
[[package]]
name = "nokhwa-core"
version = "0.1.5"
source = "git+https://github.com/l1npengtul/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6#612c861ef153cf0ee575d8dd1413b960e4e19dd6"
source = "git+https://code.gri.mw/ardocrat/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6#612c861ef153cf0ee575d8dd1413b960e4e19dd6"
dependencies = [
"bytes 1.10.1",
"image",
Cargo.toml
+10 -10
View File
@@ -4,7 +4,7 @@ version = "0.3.0-alpha"
authors = ["Ardocrat <ardocrat@gri.mw>"]
description = "Cross-platform GUI for Grin with focus on usability and availability to be used by anyone, anywhere."
license = "Apache-2.0"
repository = "https://gri.mw/code/GUI/grim"
repository = "https://code.gri.mw/GUI/grim"
keywords = [ "crypto", "grin", "mimblewimble" ]
edition = "2021"
@@ -60,11 +60,11 @@ grin_util = "5.3.3"
#grin_wallet_controller = { path = "../grin-wallet/controller" }
# test
grin_wallet_impls = { git = "https://github.com/mimblewimble/grin-wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
grin_wallet_api = { git = "https://github.com/mimblewimble/grin-wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
grin_wallet_libwallet = { git = "https://github.com/mimblewimble/grin-wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
grin_wallet_util = { git = "https://github.com/mimblewimble/grin-wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
grin_wallet_controller = { git = "https://github.com/mimblewimble/grin-wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
grin_wallet_impls = { git = "https://code.gri.mw/CORE/wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
grin_wallet_api = { git = "https://code.gri.mw/CORE/wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
grin_wallet_libwallet = { git = "https://code.gri.mw/CORE/wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
grin_wallet_util = { git = "https://code.gri.mw/CORE/wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
grin_wallet_controller = { git = "https://code.gri.mw/CORE/wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
## ui
egui = { version = "0.31.1", default-features = false }
@@ -137,7 +137,7 @@ nokhwa = { version = "0.10.5", default-features = false, features = ["input-v4l"
nokhwa = { version = "0.10.5", default-features = false, features = ["input-msmf"] }
[target.'cfg(target_os = "macos")'.dependencies]
nokhwa-mac = { git = "https://github.com/l1npengtul/nokhwa", rev = "612c861ef153cf0ee575d8dd1413b960e4e19dd6", features = ["input-avfoundation", "output-threaded"], package = "nokhwa" }
nokhwa-mac = { git = "https://code.gri.mw/ardocrat/nokhwa", rev = "612c861ef153cf0ee575d8dd1413b960e4e19dd6", features = ["input-avfoundation", "output-threaded"], package = "nokhwa" }
[target.'cfg(not(target_os = "android"))'.dependencies]
env_logger = "0.11.3"
@@ -155,8 +155,8 @@ winit = { version = "0.30.11", features = ["android-native-activity"] }
eframe = { version = "0.31.1", default-features = false, features = ["glow", "android-native-activity"] }
[patch.crates-io]
egui_extras = { git = "https://github.com/emilk/egui", rev = "f11a3510ba07ae87747d744d952676476a88c24e" }
egui = { git = "https://github.com/emilk/egui", rev = "f11a3510ba07ae87747d744d952676476a88c24e" }
eframe = { git = "https://github.com/emilk/egui", rev = "f11a3510ba07ae87747d744d952676476a88c24e" }
egui_extras = { git = "https://code.gri.mw/GUI/egui", rev = "f11a3510ba07ae87747d744d952676476a88c24e" }
egui = { git = "https://code.gri.mw/GUI/egui", rev = "f11a3510ba07ae87747d744d952676476a88c24e" }
eframe = { git = "https://code.gri.mw/GUI/egui", rev = "f11a3510ba07ae87747d744d952676476a88c24e" }
### patch grin store
#grin_store = { path = "../grin-store" }
android/gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
#Mon May 02 15:39:12 BST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://code.gri.mw/ardocrat/gradle/releases/download/v8.11.1/gradle-8.11.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
src/gui/app.rs
-13
View File
@@ -396,17 +396,4 @@ impl<Platform: PlatformCallbacks> eframe::App for App<Platform> {
}
Colors::TRANSPARENT.to_normalized_gamma_f32()
}
}
#[allow(dead_code)]
#[cfg(target_os = "android")]
#[allow(non_snake_case)]
#[no_mangle]
/// Handle Back key code event from Android.
pub extern "C" fn Java_mw_gri_android_MainActivity_onBack(
_env: jni::JNIEnv,
_class: jni::objects::JObject,
_activity: jni::objects::JObject,
) {
BACK_BUTTON_PRESSED.store(true, Ordering::Relaxed);
}