Skip to content

Commit b1ee9f0

Browse files
committed
fix: further typos and wording
1 parent 72b3cfa commit b1ee9f0

6 files changed

Lines changed: 30 additions & 31 deletions

File tree

android/hooks/tasks/generate-metabase-task.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const metabase = require('../metabase');
88
* A task that will generate the Android metabase
99
*
1010
* This is implemented as a simple base task because the metabase generation
11-
* itself has a caching machanisim, so we just delegate and return the result.
11+
* itself has a caching mechanism, so we just delegate and return the result.
1212
*/
1313
class GenerateMetabaseTask extends BaseFileTask {
1414

@@ -52,7 +52,7 @@ class GenerateMetabaseTask extends BaseFileTask {
5252
}
5353

5454
/**
55-
* Gets the generated metabse
55+
* Gets the generated metabase
5656
*
5757
* @return {Object} Metabase object
5858
*/

android/hooks/tasks/generate-sources-task.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class GenerateSourcesTask extends IncrementalFileTask {
4141
}
4242

4343
/**
44-
* Metabase that will be used to genrate the warpper files
44+
* Metabase that will be used to generate the wrapper files
4545
*
4646
* @return {Object} Metabase object
4747
*/
@@ -84,7 +84,7 @@ class GenerateSourcesTask extends IncrementalFileTask {
8484
}
8585

8686
/**
87-
* Does a full task run, wich will generate the Hyperloop wrapper for every
87+
* Does a full task run, which will generate the Hyperloop wrapper for every
8888
* referenced Java class
8989
*
9090
* @return {Promise}
@@ -149,7 +149,7 @@ class GenerateSourcesTask extends IncrementalFileTask {
149149
}
150150

151151
/**
152-
* Removes any unused class wrappers from the output directoy
152+
* Removes any unused class wrappers from the output directory
153153
*
154154
* @param {Array.<String>} classesToRemove Array of class names
155155
* @return {Promise}
@@ -259,7 +259,7 @@ class GenerateSourcesTask extends IncrementalFileTask {
259259
/**
260260
* Loads the class list used in incremental task runs
261261
*
262-
* @return {Promise<Boolean>} True if the files was loaded succesfully, false if not
262+
* @return {Promise<Boolean>} True if the files was loaded successfully, false if not
263263
*/
264264
async loadClassList() {
265265
try {

documentation/ios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ module.exports = {
353353
};
354354
```
355355

356-
Any `flags` added to the `xcodebuild` property will be passed to `xcodebuild`. Any `frameworks` in the array provided will be automatically added to the xcode project. _Note: any referenced frameworks in your Hyperloop code are automatically added for you. However, this gives you even more control to custom your compile environment._
356+
Any `flags` added to the `xcodebuild` property will be passed to `xcodebuild`. Any `frameworks` in the array provided will be automatically added to the Xcode project. _Note: any referenced frameworks in your Hyperloop code are automatically added for you. However, this gives you even more control to custom your compile environment._
357357

358358
### Adding a third-party framework
359359

iphone/hooks/hyperloop.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ HyperloopiOSBuilder.prototype.validate = function validate() {
173173
process.exit(1);
174174
}
175175

176-
// check for min ios version
176+
// check for min iOS version
177177
if (this.appc.version.lt(this.builder.minIosVer, IOS_MIN)) {
178178
this.logger.error('Hyperloop compiler works best with iOS ' + IOS_MIN + ' or greater.');
179179
this.logger.error('Your setting is currently set to: ' + (this.builder.tiapp.ios['min-ios-ver'] || this.builder.minIosVer));
@@ -1240,7 +1240,7 @@ HyperloopiOSBuilder.prototype.updateXcodeProject = function updateXcodeProject()
12401240
}, this);
12411241
}
12421242

1243-
// add the source files to xcode to compile
1243+
// add the source files to Xcode to compile
12441244
if (nativeModules.length) {
12451245
groups['Native'] || (groups['Native'] = {});
12461246
nativeModules.forEach(function (mod) {
@@ -1426,7 +1426,7 @@ HyperloopiOSBuilder.prototype.hasCustomShellScriptBuildPhases = function hasCust
14261426
* @param {Object} data - The hook payload.
14271427
*/
14281428
HyperloopiOSBuilder.prototype.hookRemoveFiles = function hookRemoveFiles(data) {
1429-
// remove empty Framework directory that might have been created by cocoapods
1429+
// remove empty Framework directory that might have been created by CocoaPods
14301430
var frameworksDir = path.join(this.builder.xcodeAppDir, 'Frameworks');
14311431
if (fs.existsSync(frameworksDir) && fs.readdirSync(frameworksDir).length === 0) {
14321432
fs.removeSync(frameworksDir);

packages/hyperloop-ios-metabase/lib/metabase.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var spawn = require('child_process').spawn,
1919

2020

2121
/**
22-
* return the configured SDK path
22+
* Returns the configured SDK path
2323
*/
2424
function getSDKPath (sdkType, callback) {
2525
exec('/usr/bin/xcrun --sdk ' + sdkType + ' --show-sdk-path', function (err, stdout) {
@@ -29,7 +29,7 @@ function getSDKPath (sdkType, callback) {
2929
}
3030

3131
/**
32-
* convert an apple style version (9.0) to a semver compatible version
32+
* Converts an Apple style version (9.0) to a semver compatible version
3333
*/
3434
function appleVersionToSemver (ver) {
3535
var v = String(ver).split('.');
@@ -43,7 +43,7 @@ function appleVersionToSemver (ver) {
4343
}
4444

4545
/**
46-
* return a parsed plist for a given framework
46+
* Returns a parsed plist for a given framework
4747
*/
4848
function getPlistForFramework (info, callback) {
4949
if (fs.existsSync(info)) {
@@ -203,7 +203,7 @@ class ModuleMetadata {
203203
}
204204

205205
/**
206-
* Prases a plain object received from JSON data and converts it back to a
206+
* Parses a plain object received from JSON data and converts it back to a
207207
* module metadata instance.
208208
*
209209
* @param {Object} json Object containing data from JSON
@@ -221,7 +221,7 @@ class ModuleMetadata {
221221
}
222222

223223
/**
224-
* generate system framework includes mapping
224+
* Generates system framework includes mapping
225225
*/
226226
function generateSystemFrameworks (sdkPath, iosMinVersion, callback) {
227227
const frameworksPath = path.resolve(path.join(sdkPath, 'System/Library/Frameworks'));
@@ -260,7 +260,7 @@ function generateSystemFrameworks (sdkPath, iosMinVersion, callback) {
260260
* mapped to the parent framework.
261261
*
262262
* @param {String} frameworkName Name of the framework
263-
* @param {String} frameworkPath Full path to the framwork
263+
* @param {String} frameworkPath Full path to the framework
264264
* @param {Object} includes Object with all include mappings
265265
*/
266266
function extractImplementationsFromFramework(frameworkName, frameworkPath, includes) {
@@ -276,7 +276,7 @@ function extractImplementationsFromFramework(frameworkName, frameworkPath, inclu
276276
* Iterates over a framework's Headers directory and any nested frameworks to
277277
* collect the paths to all available header files of a framework.
278278
*
279-
* @param {String} frameworkPath Full path to the framwork
279+
* @param {String} frameworkPath Full path to the framework
280280
* @return {Array} List with paths to all found header files
281281
*/
282282
function collectFrameworkHeaders(frameworkPath) {
@@ -300,11 +300,11 @@ function collectFrameworkHeaders(frameworkPath) {
300300
}
301301

302302
/**
303-
* generate a metabase
303+
* Generates a metabase
304304
*
305305
* @param {String} buildDir cache directory to write the files
306-
* @param {String} sdk the sdk type such as iphonesimulator
307-
* @param {String} sdk path the path to the SDK
306+
* @param {String} sdk the SDK type such as iphonesimulator
307+
* @param {String} sdkPath the path to the SDK
308308
* @param {String} iosMinVersion the min version such as 9.0
309309
* @param {Array} includes array of header paths (should be absolute paths)
310310
* @param {Boolean} excludeSystem if true, will exclude any system libraries in the generated output
@@ -413,7 +413,7 @@ function generateMetabase (buildDir, sdk, sdkPath, iosMinVersion, includes, excl
413413
}
414414

415415
/**
416-
* return the system frameworks mappings as JSON for a given sdkType and minVersion
416+
* Returns the system frameworks mappings as JSON for a given sdkType and minVersion
417417
*/
418418
function getSystemFrameworks (cacheDir, sdkType, minVersion, callback) {
419419
var fn = 'metabase-mappings-' + sdkType + '-' + minVersion + '.json';
@@ -456,7 +456,7 @@ function recursiveReadDir (dir, result) {
456456
}
457457

458458
/**
459-
* for an array of directories, return all validate header files
459+
* For an array of directories, returns all validate header files
460460
*/
461461
function getAllHeaderFiles (directories) {
462462
var files = [];
@@ -861,7 +861,7 @@ function getBuiltProductsRootPath (basePath, configurationName, sdkType) {
861861
* Gets JSON encoded data from a cache file.
862862
*
863863
* @param {String} cacheDir Path to the cache directory
864-
* @param {String} cacheToken Hash to identifiy the required cache file
864+
* @param {String} cacheToken Hash to identify the required cache file
865865
* @return {Object} The CocoaPods metabase mappings
866866
*/
867867
function readFromCache (cachePathAndFilename) {
@@ -939,7 +939,7 @@ function readModulesMetadataFromCache(cachePathAndFilename) {
939939

940940

941941
/**
942-
* handle buffer output
942+
* Handles buffer output
943943
*/
944944
function createLogger (obj, fn) {
945945
return (function () {
@@ -965,7 +965,7 @@ function createLogger (obj, fn) {
965965
}
966966

967967
/**
968-
* run the ibtool
968+
* Runs the ibtool
969969
*/
970970
function runIBTool (runDir, args, callback) {
971971
var spawn = require('child_process').spawn,
@@ -1132,7 +1132,7 @@ function runCocoaPodsBuild (basedir, builder, callback) {
11321132
}
11331133

11341134
/**
1135-
* parse the xcconfig file
1135+
* Parses the xcconfig file
11361136
*/
11371137
function parseCocoaPodXCConfig (fn) {
11381138
var config = {};
@@ -1148,7 +1148,7 @@ function parseCocoaPodXCConfig (fn) {
11481148
}
11491149

11501150
/**
1151-
* generate a map of xcode settings for CocoaPods
1151+
* Generates a map of Xcode settings for CocoaPods
11521152
*/
11531153
function getCocoaPodsXCodeSettings (basedir) {
11541154
var podDir = path.join(basedir, 'Pods');

tools/ci.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ function writeAndroidManifest(next) {
361361
}
362362

363363
/**
364-
* write the updated ios manifest if necessary
364+
* write the updated iOS manifest if necessary
365365
*/
366366
function writeiOSManifest(next) {
367367
var fn = path.join(__dirname, '..', 'iphone', 'manifest'),
@@ -378,7 +378,7 @@ function writeiOSManifest(next) {
378378
}
379379

380380
/**
381-
* write the updated android plugin package.json if neccesary
381+
* write the updated android plugin package.json if necessary
382382
*/
383383
function writeAndroidPluginPackage (next) {
384384
var fn = path.join(__dirname, '..', 'android', 'plugins', 'hyperloop', 'hooks', 'android', 'package.json'),
@@ -440,8 +440,7 @@ function build(branch, callback) {
440440
next();
441441
});
442442
},
443-
// TODO Do we need to install xcode or something?
444-
// TODO Install python if it's not installed?
443+
// TODO Do we need to install Xcode or something?
445444

446445
// Grab the paths to Android NDK and SDK
447446
function (next) {

0 commit comments

Comments
 (0)