Skip to content

Commit 800eebc

Browse files
authored
Merge pull request #549 from nttld/macos-arm
Support macOS on arm64
2 parents 4ac9204 + 083103e commit 800eebc

File tree

12 files changed

+572
-618
lines changed

12 files changed

+572
-618
lines changed

.eslintignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

.eslintrc.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,12 @@ jobs:
2626
strategy:
2727
matrix:
2828
os: [ubuntu-latest, windows-latest, macos-latest]
29-
ndk-version: [r21e, r25c]
29+
ndk-version: [r21e, r26d]
3030
local-cache: [true, false]
31+
exclude:
32+
- os: macos-latest
33+
ndk-version: r21e
34+
fail-fast: false
3135

3236
runs-on: ${{ matrix.os }}
3337
steps:
@@ -64,7 +68,7 @@ jobs:
6468
- uses: ./
6569
id: install-ndk-25
6670
with:
67-
ndk-version: r25c
71+
ndk-version: r26d
6872
add-to-path: false
6973
local-cache: ${{ matrix.local-cache }}
7074

.husky/pre-commit

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
#!/usr/bin/env sh
2-
. "$(dirname -- "$0")/_/husky.sh"
3-
4-
npm run lint && npm run build && git add dist
1+
npm run lint && npm run build && git add dist

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ steps:
1313
- uses: actions/checkout@v3
1414
- uses: nttld/setup-ndk@v1
1515
with:
16-
ndk-version: r25c
16+
ndk-version: r26d
1717
- run: ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_APPLICATION_MK=./Application.mk
1818
```
1919
@@ -40,7 +40,7 @@ steps:
4040
- uses: nttld/setup-ndk@v1
4141
id: setup-ndk
4242
with:
43-
ndk-version: r25c
43+
ndk-version: r26d
4444
link-to-sdk: true
4545
- run: ./gradlew build
4646
```

dist/index.js

Lines changed: 29 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eslint.config.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
const eslint = require("@eslint/js")
2+
const ts = require("typescript-eslint")
3+
const prettier = require("eslint-config-prettier")
4+
const imports = require("eslint-plugin-simple-import-sort")
5+
6+
module.exports = ts.config(
7+
{ ignores: ["node_modules/", "dist/"] },
8+
{
9+
files: ["**/*.ts"],
10+
extends: [
11+
eslint.configs.recommended,
12+
...ts.configs.strictTypeChecked,
13+
...ts.configs.stylisticTypeChecked,
14+
prettier,
15+
],
16+
plugins: {
17+
imports,
18+
},
19+
languageOptions: {
20+
parserOptions: {
21+
EXPERIMENTAL_useProjectService: true,
22+
},
23+
},
24+
rules: {
25+
"@typescript-eslint/no-non-null-assertion": "off",
26+
"imports/imports": "warn",
27+
"imports/exports": "warn",
28+
},
29+
},
30+
)

0 commit comments

Comments
 (0)