forked from ionic-team/capacitor
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master'
* upstream/master: (50 commits) feat(Device): Add getBatteryInfo function (ionic-team#2435) fix(doctor): add electron checks (ionic-team#2434) chore(android): target SDK version 29 (ionic-team#2433) feat(android): update gradle and dependencies (ionic-team#2431) fix(ios): Make Clipboard plugin return errors (ionic-team#2430) feat(android): Handle onDestroy lifecycle event in plugins (ionic-team#2421) docs(ce-plugins): Remove or replace deprecated plugins (ionic-team#2419) feat(ios): change native location accuracy values (ionic-team#2420) docs(ce-guides): Remove dead link (ionic-team#2418) docs(network): Remove example guide because of dead link (ionic-team#2417) feat(electron): Remove injectCapacitor function (ionic-team#2415) fix(android): plugin retained events not being retained if listeners were empty (ionic-team#2408) chore(android): remove unused launch_splash.xml (ionic-team#2411) feat(Filesystem): Remove createIntermediateDirectories from MkdirOptions (ionic-team#2410) feat(android): use Fused Location Provider on Geolocation plugin (ionic-team#2409) fix(toast): unify duration across platforms (ionic-team#2340) feat(PushNotifications): Make register method return if permission was granted (ionic-team#2324) chore(circleci): update Xcode and remove install-cocoapods job (ionic-team#2402) chore(cli): fix tests for newer node versions (ionic-team#2403) fix(android): return original camera image if edition was canceled (ionic-team#2358) ...
- Loading branch information
Showing
111 changed files
with
1,625 additions
and
1,660 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
Pod::Spec.new do |s| | ||
s.name = 'Capacitor' | ||
s.version = '1.4.0' | ||
s.version = '1.5.0' | ||
s.summary = 'Capacitor for iOS' | ||
s.social_media_url = 'http://twitter.com/getcapacitor' | ||
s.license = 'MIT' | ||
|
@@ -9,6 +9,6 @@ Pod::Spec.new do |s| | |
s.authors = { 'Ionic Team' => '[email protected]' } | ||
s.source = { :git => 'https://github.com/ionic-team/capacitor.git', :tag => s.version.to_s } | ||
s.source_files = 'ios/Capacitor/Capacitor/*.{swift,h,m}', 'ios/Capacitor/Capacitor/Plugins/*.{swift,h,m}', 'ios/Capacitor/Capacitor/Plugins/**/*.{swift,h,m}' | ||
s.dependency 'CapacitorCordova', '1.4.0' | ||
s.dependency 'CapacitorCordova', '1.5.0' | ||
s.swift_version = '4.2' | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.