Skip to content

Commit

Permalink
Merge pull request #549 from nttld/macos-arm
Browse files Browse the repository at this point in the history
Support macOS on arm64
  • Loading branch information
raftario authored May 8, 2024
2 parents 4ac9204 + 083103e commit 800eebc
Show file tree
Hide file tree
Showing 12 changed files with 572 additions and 618 deletions.
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

19 changes: 0 additions & 19 deletions .eslintrc.json

This file was deleted.

8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
ndk-version: [r21e, r25c]
ndk-version: [r21e, r26d]
local-cache: [true, false]
exclude:
- os: macos-latest
ndk-version: r21e
fail-fast: false

runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -64,7 +68,7 @@ jobs:
- uses: ./
id: install-ndk-25
with:
ndk-version: r25c
ndk-version: r26d
add-to-path: false
local-cache: ${{ matrix.local-cache }}

Expand Down
5 changes: 1 addition & 4 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm run lint && npm run build && git add dist
npm run lint && npm run build && git add dist
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ steps:
- uses: actions/checkout@v3
- uses: nttld/setup-ndk@v1
with:
ndk-version: r25c
ndk-version: r26d
- run: ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_APPLICATION_MK=./Application.mk
```
Expand All @@ -40,7 +40,7 @@ steps:
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r25c
ndk-version: r26d
link-to-sdk: true
- run: ./gradlew build
```
Expand Down
60 changes: 29 additions & 31 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
const eslint = require("@eslint/js")
const ts = require("typescript-eslint")
const prettier = require("eslint-config-prettier")
const imports = require("eslint-plugin-simple-import-sort")

module.exports = ts.config(
{ ignores: ["node_modules/", "dist/"] },
{
files: ["**/*.ts"],
extends: [
eslint.configs.recommended,
...ts.configs.strictTypeChecked,
...ts.configs.stylisticTypeChecked,
prettier,
],
plugins: {
imports,
},
languageOptions: {
parserOptions: {
EXPERIMENTAL_useProjectService: true,
},
},
rules: {
"@typescript-eslint/no-non-null-assertion": "off",
"imports/imports": "warn",
"imports/exports": "warn",
},
},
)
Loading

0 comments on commit 800eebc

Please sign in to comment.