Add native support for Apple silicon

p2p-inc · Jan 10, 2022 · 7ab6bfd · 7ab6bfd
1 parent 3625b53
commit 7ab6bfd
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 30 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,12 +10,13 @@ jobs:
       fail-fast: false
       matrix:
         node-version:
+          - 16
           - 14
           - 12
           - 10
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm install

diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/...de/package.xcworkspace/xcuserdata/sindresorhus.xcuserdatad/UserInterfaceState.xcuserstate b/...de/package.xcworkspace/xcuserdata/sindresorhus.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/.swiftpm/xcode/xcuserdata/sindresorhus.xcuserdatad/xcschemes/xcschememanagement.plist b/.swiftpm/xcode/xcuserdata/sindresorhus.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/Package.swift b/Package.swift
@@ -1,9 +1,19 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.5
 import PackageDescription
 
 let package = Package(
-	name: "active-win",
+	name: "ActiveWin",
+	products: [
+		.executable(
+			name: "active-win",
+			targets: [
+				"ActiveWinCLI"
+			]
+		)
+	],
 	targets: [
-		.target(name: "active-win")
+		.executableTarget(
+			name: "ActiveWinCLI"
+		)
 	]
 )
diff --git a/Sources/active-win/Utilities.swift → Sources/ActiveWinCLI/Utilities.swift b/Sources/active-win/Utilities.swift → Sources/ActiveWinCLI/Utilities.swift
diff --git a/Sources/active-win/main.swift → Sources/ActiveWinCLI/main.swift b/Sources/active-win/main.swift → Sources/ActiveWinCLI/main.swift
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
 	"scripts": {
 		"test": "xo && npm run build && ava && tsd",
 		"test-ci": "xo && tsd",
-		"build": "swift build --configuration=release && mv .build/release/active-win main",
+		"build": "swift build --configuration=release --arch arm64 --arch x86_64 && mv .build/apple/Products/Release/active-win main",
 		"prepare": "npm run build"
 	},
 	"files": [
@@ -61,7 +61,7 @@
 	},
 	"optionalDependencies": {
 		"ffi-napi": "^4.0.3",
-		"ref-napi": "^3.0.2",
+		"ref-napi": "^3.0.3",
 		"ref-struct-di": "^1.1.1",
 		"ref-wchar-napi": "^1.0.3"
 	},

diff --git a/readme.md b/readme.md
@@ -8,8 +8,8 @@ Users on macOS 10.13 or earlier needs to download the [Swift runtime support lib
 
 ## Install
 
-```
-$ npm install active-win
+```sh
+npm install active-win
 ```
 
 ## Usage
@@ -42,7 +42,6 @@ const activeWindow = require('active-win');
 })();
 ```
 
-
 ## API
 
 ### activeWindow(options?)