You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2017/04/27 17:15:44 UTC

[1/3] docs commit: Add config.xml doc to 6.x as well

Repository: cordova-docs
Updated Branches:
  refs/heads/master bf7af6c79 -> fa26ac602


Add <resource-file> config.xml doc to 6.x as well


Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/edca6c9c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/edca6c9c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/edca6c9c

Branch: refs/heads/master
Commit: edca6c9c11aee7b7bf8d37e891c73746158aca91
Parents: bf7af6c
Author: Shazron Abdullah <sh...@gmail.com>
Authored: Thu Apr 27 10:11:17 2017 -0700
Committer: Shazron Abdullah <sh...@gmail.com>
Committed: Thu Apr 27 10:11:17 2017 -0700

----------------------------------------------------------------------
 www/docs/en/6.x/config_ref/index.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/edca6c9c/www/docs/en/6.x/config_ref/index.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/config_ref/index.md b/www/docs/en/6.x/config_ref/index.md
index 26d428e..0e50d13 100644
--- a/www/docs/en/6.x/config_ref/index.md
+++ b/www/docs/en/6.x/config_ref/index.md
@@ -468,6 +468,23 @@ Examples:
 <hook type="after_plugin_install" src="scripts/afterPluginInstall.js" />
 ```
 
+## resource-file
+
+This tag installs resource files into your platform, and is similar to the same tag in plugin.xml. This tag is currently only supported on `cordova-ios@4.4.0` or greater and `cordova-android@6.2.1` or greater.
+
+Attributes(type) <br/> <span class="sub-header">Only for platform:</span> | Description
+---------------- | ------------
+src(string) <br/> ==iOS== ==Android==| *Required* <br/> Location of the file relative to `config.xml`.
+target(string) | Path to where the file will be copied in your directory.
+
+Examples:
+
+For Android:
+```xml
+<resource-file src="FooPluginStrings.xml" target="res/values/FooPluginStrings.xml" />
+```
+
+
 # Sample config.xml
 Below is a sample config.xml file:
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[2/3] docs commit: Add iOS Carthage support since it works in 6.x as well. Added cordova-ios 4.4.0 requirement.

Posted by sh...@apache.org.
Add iOS Carthage support since it works in 6.x as well. Added cordova-ios 4.4.0 requirement.


Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/ccac22d1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/ccac22d1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/ccac22d1

Branch: refs/heads/master
Commit: ccac22d116485354561408195d5926d852d25f4a
Parents: edca6c9
Author: Shazron Abdullah <sh...@gmail.com>
Authored: Thu Apr 27 10:14:45 2017 -0700
Committer: Shazron Abdullah <sh...@gmail.com>
Committed: Thu Apr 27 10:14:45 2017 -0700

----------------------------------------------------------------------
 www/docs/en/6.x/guide/platforms/ios/webview.md | 23 +++++++++++++++++++--
 www/docs/en/dev/guide/platforms/ios/webview.md |  4 +++-
 2 files changed, 24 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/ccac22d1/www/docs/en/6.x/guide/platforms/ios/webview.md
----------------------------------------------------------------------
diff --git a/www/docs/en/6.x/guide/platforms/ios/webview.md b/www/docs/en/6.x/guide/platforms/ios/webview.md
index 44048b4..2ba6a57 100644
--- a/www/docs/en/6.x/guide/platforms/ios/webview.md
+++ b/www/docs/en/6.x/guide/platforms/ios/webview.md
@@ -31,7 +31,7 @@ Support for WebViews for iOS started with Cordova version 1.4, using a
 implementation.  Cordova 2.0 and later versions only support the
 subproject-based Cleaver implementation.
 
-These instructions require at least Cordova 3.x and Xcode 6.0, along
+These instructions require at least Cordova 4.x and Xcode 8.0, along
 with a `config.xml` file from a newly created iOS project. You can use
 the procedure in [The Command-Line Interface](../../cli/index.html) to create a new project,
 then obtain the `config.xml` file from within the named application's
@@ -42,7 +42,26 @@ distribution. Download it from
 [cordova.apache.org](http://cordova.apache.org) and unzip its iOS
 package.
 
-## Adding Cleaver to the Xcode Project (CordovaLib Sub-Project)
+You have two methods for adding Cordova to your project. The first is using [Carthage](https://github.com/Carthage/Carthage), and the 
+second is to manually add Cordova. Note that Carthage support is only in cordova-ios version 4.4.0 or greater. 
+
+After using either of these two methods, continue with the **"Using CDVViewController"** section.
+
+## 1. Add Cordova.framework to the Xcode Project using Carthage
+
+1. Install [Carthage](https://github.com/Carthage/Carthage)
+
+1. In your [Cartfile](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#cartfile), add (substitute &lt;version_or_tag&gt; for the appropriate version):
+
+        git "git://git.apache.org/cordova-ios.git" "<version_or_tag>" # Apache
+
+1. Run 
+
+        carthage update
+
+1. Add `Carthage/Build/iOS/Cordova.framework` into your Xcode project.
+
+## 2. Adding Cleaver to the Xcode Project (CordovaLib Sub-Project)
 
 1. Quit Xcode if it is running.
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/ccac22d1/www/docs/en/dev/guide/platforms/ios/webview.md
----------------------------------------------------------------------
diff --git a/www/docs/en/dev/guide/platforms/ios/webview.md b/www/docs/en/dev/guide/platforms/ios/webview.md
index 63f18e8..2ba6a57 100644
--- a/www/docs/en/dev/guide/platforms/ios/webview.md
+++ b/www/docs/en/dev/guide/platforms/ios/webview.md
@@ -43,7 +43,9 @@ distribution. Download it from
 package.
 
 You have two methods for adding Cordova to your project. The first is using [Carthage](https://github.com/Carthage/Carthage), and the 
-second is to manually add Cordova. After using either of these two methods, continue with the **"Using CDVViewController"** section.
+second is to manually add Cordova. Note that Carthage support is only in cordova-ios version 4.4.0 or greater. 
+
+After using either of these two methods, continue with the **"Using CDVViewController"** section.
 
 ## 1. Add Cordova.framework to the Xcode Project using Carthage
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[3/3] docs commit: Modified blog post to point to dev link (next cordova, v 7.0.0)

Posted by sh...@apache.org.
Modified blog post to point to dev link (next cordova, v 7.0.0)


Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/fa26ac60
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/fa26ac60
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/fa26ac60

Branch: refs/heads/master
Commit: fa26ac602ddd9ae26b67570db45ce0bd90499ff1
Parents: ccac22d
Author: Shazron Abdullah <sh...@gmail.com>
Authored: Thu Apr 27 10:15:32 2017 -0700
Committer: Shazron Abdullah <sh...@gmail.com>
Committed: Thu Apr 27 10:15:32 2017 -0700

----------------------------------------------------------------------
 www/_posts/2017-04-26-ios-release.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/fa26ac60/www/_posts/2017-04-26-ios-release.md
----------------------------------------------------------------------
diff --git a/www/_posts/2017-04-26-ios-release.md b/www/_posts/2017-04-26-ios-release.md
index abb7d16..ecd086a 100644
--- a/www/_posts/2017-04-26-ios-release.md
+++ b/www/_posts/2017-04-26-ios-release.md
@@ -13,7 +13,7 @@ We are happy to announce a minor version of `Cordova iOS 4.4.0` has been release
 Three new features were added:
 1. [&lt;resource-file&gt;](https://cordova.apache.org/docs/en/latest/config_ref/index.html#resource-file) tag support in config.xml
 2. [Carthage support](https://cordova.apache.org/docs/en/latest/guide/platforms/ios/webview.html)
-3. Dynamic framework support through the ["embed" attribute](https://cordova.apache.org/docs/en/latest/plugin_ref/spec.html#framework) of the &lt;framework&gt; tag in plugin.xml (needs cordova-cli@7.0.0, which is coming soon)
+3. Dynamic framework support through the ["embed" attribute](https://cordova.apache.org/docs/en/dev/plugin_ref/spec.html#framework) of the &lt;framework&gt; tag in plugin.xml (needs cordova-cli@7.0.0, which is coming soon)
 
 Other notable issues:
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org