From 719c94a184bdd908424900ccb7ef720820dc8559 Mon Sep 17 00:00:00 2001 From: Chris Barber Date: Sun, 20 Mar 2022 22:45:46 -0500 Subject: [PATCH] v3.2.1 (#80) * build: Moved CI jobs from Jenkins to GitHub actions. * docs: Cleaned up readme. * chore: Updated dependencies. --- .github/workflows/build.yml | 32 ++++++++++ .github/workflows/publish.yml | 36 +++++++++++ .travis.yml | 23 ------- CHANGELOG.md | 10 +++- Jenkinsfile | 9 --- README.md | 10 ++-- package.json | 21 +++---- .../TestApp/TestApp.xcodeproj/project.pbxproj | 8 ++- test/test-node-ios-device.js | 4 +- yarn.lock | 60 ++++++------------- 10 files changed, 116 insertions(+), 97 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/publish.yml delete mode 100644 .travis.yml delete mode 100644 Jenkinsfile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..54363e3 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,32 @@ +name: Build +on: + - push + - pull_request + +jobs: + build: + runs-on: macos-latest + name: Build + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Setup node + uses: actions/setup-node@v2 + with: + node-version: '16' + + - name: Install dependencies + run: yarn install --frozen-lockfile + + - name: Build + run: yarn run prepublishOnly + + - name: Archive pre-built bindings + uses: actions/upload-artifact@v3 + with: + name: prebuilds + path: prebuilds/** diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..161d8fb --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,36 @@ +name: Publish +on: + release: + types: [ created ] + +jobs: + publish: + runs-on: macos-latest + name: Publish + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Setup node + uses: actions/setup-node@v2 + with: + node-version: '16' + registry-url: 'https://registry.npmjs.org' + + - name: Install dependencies + run: yarn install --frozen-lockfile + + - name: Publish to npm + env: + GH_TOKEN: ${{ github.token }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + run: npm publish + + - name: Archive pre-built bindings + uses: actions/upload-artifact@v3 + with: + name: prebuilds + path: prebuilds/** diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index cb90b94..0000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -os: osx -osx_image: xcode10.2 -language: node_js -node_js: -- '10' -- '12' -sudo: false -before_install: - - curl -o- -L https://yarnpkg.com/install.sh | bash - - export PATH=$HOME/.yarn/bin:$PATH -cache: - yarn: true -install: yarn -before_script: sh -c "git log | head -12" -script: yarn run test -deploy: - provider: npm - email: npmjs@appcelerator.com - api_key: - secure: KXBIiRgIIdsPgrxg0pI7K5gbzkgvUWG4rFaEqBl3a8LPNCukgI54/OTbS4xJCSyzClJnYqc/tRjBtPeHPc9eDiZFJXOGNtbRLGqmPX06thPPmsdm/Ol19qmi2pqGnPMDzZuA6/YI5IRYUP+6Mk4oLcht2BMpeuPLavqnXbsTpDM= - on: - tags: true - repo: appcelerator/node-ios-device diff --git a/CHANGELOG.md b/CHANGELOG.md index be4859e..c671c64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,13 @@ -# v3.2.0 +# v3.2.1 (Mar 20, 2021) + + * build: Moved CI jobs from Jenkins to GitHub actions. + * docs: Cleaned up readme. + * chore: Updated dependencies. + +# v3.2.0 (Feb 14, 2022) * feat: Enable arm64 prebuilt binaries for Apple Silicon now that Xcode supports it. Fixes - [#75](https://github.com/appcelerator/node-ios-device/issues/75). + [#75](https://github.com/tidev/node-ios-device/issues/75). * chore: Updated dependencies. # v3.1.1 (Jan 5, 2021) diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 326c027..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,9 +0,0 @@ -#! groovy -library 'pipeline-library' - -runNPMPackage { - nodeVersions = [ '12.18.0', '14.19.0' ] - platformsWithLabels = [ - 'osx': 'xcode-13' - ] -} diff --git a/README.md b/README.md index d14c76b..ab8c703 100644 --- a/README.md +++ b/README.md @@ -168,15 +168,15 @@ handy when filing a bug. iosDevice.on('log', msg => console.log(msg)); ``` -Alternatively, `node-ios-device` uses the amazing [`snooplogg`][2] debug logger where you simply +Alternatively, `node-ios-device` uses the amazing [snooplogg][2] debug logger where you simply set the `SNOOPLOGG` environment variable to `node-ios-device` (or `*`) and it will print the debug log to stdout. ## License -This project is open source under the [Apache Public License v2][1] and is developed by -[Axway, Inc](http://www.axway.com/) and the community. Please read the [`LICENSE`][1] file included -in this distribution for more information. +This project is open source and provided under the Apache Public License (version 2). Please make +sure you see the [LICENSE][1] file included in this distribution for more details on the license. Also, +please take notice of the privacy notice at the end of the file. -[1]: https://github.com/appcelerator/node-ios-device/blob/master/LICENSE +[1]: https://github.com/tidev/node-ios-device/blob/master/LICENSE [2]: https://www.npmjs.com/package/snooplogg diff --git a/package.json b/package.json index fe9fabe..9b22202 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,15 @@ { "name": "node-ios-device", - "version": "3.2.0", + "version": "3.2.1", "description": "Simple library for detecting and installing apps on iOS devices", "main": "./src/index", "gypfile": true, - "author": "Axway, Inc. ", + "author": "TiDev, Inc. ", "maintainers": [ - "Chris Barber " + "Chris Barber " ], "license": "Apache-2.0", "keywords": [ - "appcelerator", "ios", "iphone", "ipad", @@ -31,7 +30,7 @@ "clean": "node-gyp clean", "rebuild": "node-gyp -j 16 rebuild", "rebuild-debug": "node-gyp -j 16 rebuild --debug", - "test": "JUNIT_REPORT_PATH=junit.xml mocha -r chai --reporter mocha-jenkins-reporter test/**/test-*.js" + "test": "mocha -r chai test/**/test-*.js" }, "dependencies": { "cli-kit": "^1.15.0", @@ -41,13 +40,15 @@ }, "devDependencies": { "chai": "^4.3.6", - "mocha": "^9.2.0", - "mocha-jenkins-reporter": "^0.4.7", + "mocha": "^9.2.2", "prebuildify": "^5.0.0" }, - "homepage": "https://github.com/appcelerator/node-ios-device", - "bugs": "https://github.com/appcelerator/node-ios-device/issues", - "repository": "https://github.com/appcelerator/node-ios-device", + "homepage": "https://github.com/tidev/node-ios-device", + "bugs": "https://github.com/tidev/node-ios-device/issues", + "repository": { + "type": "git", + "url": "git://github.com/tidev/node-ios-device.git" + }, "engines": { "node": ">=10.13.0" } diff --git a/test/TestApp/TestApp.xcodeproj/project.pbxproj b/test/TestApp/TestApp.xcodeproj/project.pbxproj index 122130d..d0b522e 100644 --- a/test/TestApp/TestApp.xcodeproj/project.pbxproj +++ b/test/TestApp/TestApp.xcodeproj/project.pbxproj @@ -102,7 +102,7 @@ 83CC3A0622B84C2F001478BE /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1010; + LastUpgradeCheck = 1240; ORGANIZATIONNAME = "node-ios-device"; TargetAttributes = { 83CC3A0D22B84C2F001478BE = { @@ -201,6 +201,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -260,6 +261,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -295,7 +297,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = WP4952RUHJ; INFOPLIST_FILE = TestApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -315,7 +317,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = WP4952RUHJ; INFOPLIST_FILE = TestApp/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/test/test-node-ios-device.js b/test/test-node-ios-device.js index c07986c..7c051a1 100644 --- a/test/test-node-ios-device.js +++ b/test/test-node-ios-device.js @@ -35,12 +35,12 @@ try { if (!process.argv.includes('--skip-build-testapp')) { console.log('Building TestApp...') - const { status, stdout } = spawnSync('xcodebuild', [ 'clean', 'build' ], { + const { status, stdout, stderr } = spawnSync('xcodebuild', [ 'clean', 'build' ], { cwd: path.resolve(__dirname, 'TestApp') }); if (!/BUILD SUCCEEDED/.test(stdout.toString())) { - throw new Error(`Build TestApp failed (status ${status})`); + throw new Error(`Build TestApp failed (status ${status})\n${stderr.toString()}`); } } } catch (e) { diff --git a/yarn.lock b/yarn.lock index 2ef0c61..2e781b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -237,11 +237,6 @@ deep-eql@^3.0.1: dependencies: type-detect "^4.0.0" -diff@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff" - integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q== - diff@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" @@ -494,17 +489,17 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== +minimatch@4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz#40d9d511a46bdc4e563c22c3080cde9c0d8299b4" + integrity sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g== dependencies: brace-expansion "^1.1.7" minimatch@^3.0.4: - version "3.0.5" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3" - integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" @@ -518,26 +513,10 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp@^0.5.4: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - -mocha-jenkins-reporter@^0.4.7: - version "0.4.7" - resolved "https://registry.yarnpkg.com/mocha-jenkins-reporter/-/mocha-jenkins-reporter-0.4.7.tgz#59505d59a9fdeb64ee8270f13d8ca6c48c1dfad7" - integrity sha512-ek05WBoGX9G5B29QmFw67H92ZcvZcp62RASaHWqiZOWjc/G2YlKBeu7t60J5wpaQP1rFS8T9S85ed/3iDdf/2A== - dependencies: - diff "4.0.1" - mkdirp "^0.5.4" - xml "^1.0.1" - -mocha@^9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.0.tgz#2bfba73d46e392901f877ab9a47b7c9c5d0275cc" - integrity sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q== +mocha@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.2.tgz#d70db46bdb93ca57402c809333e5a84977a88fb9" + integrity sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g== dependencies: "@ungap/promise-all-settled" "1.1.2" ansi-colors "4.1.1" @@ -552,9 +531,9 @@ mocha@^9.2.0: he "1.2.0" js-yaml "4.1.0" log-symbols "4.1.0" - minimatch "3.0.4" + minimatch "4.2.1" ms "2.1.3" - nanoid "3.2.0" + nanoid "3.3.1" serialize-javascript "6.0.0" strip-json-comments "3.1.1" supports-color "8.1.1" @@ -581,10 +560,10 @@ nanobuffer@^1.1.7: dependencies: source-map-support "^0.5.19" -nanoid@3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" - integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== +nanoid@3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" + integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== napi-macros@^2.0.0: version "2.0.0" @@ -886,11 +865,6 @@ ws@^7.5.5: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== -xml@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5" - integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU= - y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"