Skip to content

Implement swift support and testing#395

Merged
dpogue merged 2 commits intoapache:masterfrom
cordova-develop:dev_support_swift
Aug 26, 2018
Merged

Implement swift support and testing#395
dpogue merged 2 commits intoapache:masterfrom
cordova-develop:dev_support_swift

Conversation

@knight9999
Copy link
Contributor

Platforms affected

ios

What does this PR do?

Add swift support for ios platform and unit testing.
apache/cordova-discuss#107

This PR is needed to be merged first
apache/cordova-common#42 .

What testing has been done on this change?

Run 'cordova build' with this code and cordova-common change.
Run the jasmine tests.

Checklist

  • Reported an issue in the JIRA database
  • Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform affected.
  • Added automated test coverage as appropriate for this change.

@codecov-io
Copy link

codecov-io commented Aug 17, 2018

Codecov Report

Merging #395 into master will increase coverage by 0.57%.
The diff coverage is 83%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #395      +/-   ##
==========================================
+ Coverage   73.68%   74.26%   +0.57%     
==========================================
  Files          11       12       +1     
  Lines        1463     1562      +99     
==========================================
+ Hits         1078     1160      +82     
- Misses        385      402      +17
Impacted Files Coverage Δ
bin/templates/scripts/cordova/lib/prepare.js 83.71% <100%> (+0.14%) ⬆️
bin/templates/scripts/cordova/Api.js 59.17% <50%> (-1.83%) ⬇️
...in/templates/scripts/cordova/lib/BridgingHeader.js 95.52% <95.52%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e0d3dad...51d9787. Read the comment docs.

Copy link
Member

@dpogue dpogue left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all looks good to me, but I'll let someone with more iOS experience give it a more thorough review

this.path = bridgingHeaderPath;
this.bridgingHeaders = null;
if (!fs.existsSync(this.path)) {
throw new CordovaError('BridgingHeader.js is not found.');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually if the BridgingHeader.h file is not found? The error message says .js

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am aiming to check the BridgingHeader.h file exists or not.
Sorry I am going to fix the wrong message. Thank you a lot!

bridgingHeaderFile.write();
}
}
return Q.resolve();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to return Q.resolve() here? I think if the function finishes with no exceptions, it should continue into the next .then block

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. There is no reason for Q.resolve(). I will remove it.

bridgingHeaderFile.write();
}
}
return Q.resolve();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I don't think we need to explicitly return Q.resolve() here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. There is no paticular reason for Q.resolve(). I will remove it.

Copy link
Member

@dpogue dpogue left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 from me :)

@knight9999
Copy link
Contributor Author

Thanks you!

@dpogue dpogue merged commit 2cd9309 into apache:master Aug 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants