Skip to content

Commit

Permalink
style: use clang-format-lint in place of custom scons-format
Browse files Browse the repository at this point in the history
  • Loading branch information
sgtcoolguy committed Oct 3, 2019
1 parent b9359c2 commit 599b223
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 105 deletions.
100 changes: 0 additions & 100 deletions build/scons-format.js

This file was deleted.

1 change: 0 additions & 1 deletion build/scons.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ commander
.command('xcode-test', 'Hacks the XCode project for iOS to copy in the unit test suite so it can be run under XCode\'s debugger')
.command('check-ios-toplevel', 'Ensures we don\'t check in prefilled values for version/hash/timestamp')
.command('xcode-project-build <projectDir> <targetBuildDir> <productName>', 'Runs the portion of the xcode project setup')
.command('format', 'check format of source files')
.parse(process.argv);
34 changes: 34 additions & 0 deletions package-lock.json

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

13 changes: 9 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
"clean:ios": "npm run clean -- ios",
"commit": "git-cz",
"format": "npm-run-all --parallel format:**",
"format:android": "./build/scons format --android --fix",
"format:ios": "./build/scons format --ios --fix",
"format:android": "npm run lint:android -- --fix",
"format:ios": "npm run lint:ios -- --fix",
"format:js": "npm run lint:js -- --fix",
"ios": "./build/scons cleanbuild ios",
"ios-sanity-check": "./build/scons check-ios-toplevel",
"lint": "npm-run-all --parallel lint:**",
"lint:android": "./build/scons format --android",
"lint:android": "npx clang-format-lint $npm_package_config_format_android",
"lint:docs": "tdoc-validate ./apidoc",
"lint:ios": "./build/scons format --ios",
"lint:ios": "npx clang-format-lint $npm_package_config_format_ios",
"lint:js": "eslint .",
"test": "npm run ios-sanity-check && npm run lint",
"test:android": "npm run clean:android && npm run build:android && ./build/scons package -s --no-docs android && ./build/scons install -s && ti sdk select $npm_package_version && ./build/scons test -s android",
Expand Down Expand Up @@ -71,6 +71,10 @@
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
},
"format": {
"android": "android/!(dev|templates)/**/*.java",
"ios": "iphone/Classes/*.{m,h} iphone/Classes/Layout/*.{m,h} iphone/TitaniumKit/TitaniumKit/*.h iphone/TitaniumKit/TitaniumKit/Sources/**/*.{m,h}"
}
},
"dependencies": {
Expand Down Expand Up @@ -109,6 +113,7 @@
"devDependencies": {
"@commitlint/cli": "^8.2.0",
"@commitlint/config-conventional": "^8.2.0",
"@seadub/clang-format-lint": "0.0.2",
"@seadub/danger-plugin-dependencies": "0.1.0",
"@seadub/danger-plugin-eslint": "^1.0.1",
"@seadub/danger-plugin-junit": "0.1.2",
Expand Down

0 comments on commit 599b223

Please sign in to comment.