You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2017/11/30 18:57:53 UTC
[cordova-android] branch 7.0.x created (now 5a9eb15)
This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/cordova-android.git.
at 5a9eb15 CB-13622: Testing commit
This branch includes the following new commits:
new c7b0b93 Update JS snapshot to version 7.0.0 (via coho)
new 214e857 Set VERSION to 7.0.0 (via coho)
new 655c018 CB-13621: Wrote similar warning to CB-12948 on iOS. We no longer support update.
new 5a9eb15 CB-13622: Testing commit
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@cordova.apache.org" <co...@cordova.apache.org>'].
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 04/04: CB-13622: Testing commit
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 5a9eb154e0edc32c0e106b36cdccd583ccfd755d
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Thu Nov 30 10:56:28 2017 -0800
CB-13622: Testing commit
---
test/app/build.gradle | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/app/build.gradle b/test/app/build.gradle
index a5310b2..a995781 100644
--- a/test/app/build.gradle
+++ b/test/app/build.gradle
@@ -38,12 +38,12 @@ android {
}
dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation project(path: ":CordovaLib")
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+ implementation project(path: ':CordovaLib')
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- androidTestImplementation ('com.android.support.test.espresso:espresso-web:2.2.2', {
+ androidTestImplementation('com.android.support.test.espresso:espresso-web:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.android.support:appcompat-v7:26.1.0'
--
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 02/04: Set VERSION to 7.0.0 (via coho)
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 214e857b208369856ed31d4ebae4d84a738a6eed
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Thu Nov 30 10:01:28 2017 -0800
Set VERSION to 7.0.0 (via coho)
---
VERSION | 2 +-
bin/templates/cordova/version | 2 +-
framework/build.gradle | 4 ++--
framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/VERSION b/VERSION
index 1c12120..66ce77b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.5.0-dev
+7.0.0
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index cf4c590..3df00e3 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,7 +20,7 @@
*/
// Coho updates this line:
-var VERSION = "6.5.0-dev";
+var VERSION = "7.0.0";
module.exports.version = VERSION;
diff --git a/framework/build.gradle b/framework/build.gradle
index 9c925c3..e63330a 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -129,9 +129,9 @@ bintray {
licenses = ['Apache-2.0']
labels = ['android', 'cordova', 'phonegap']
version {
- name = '6.5.0-dev'
+ name = '7.0.0'
released = new Date()
- vcsTag = '6.5.0-dev'
+ vcsTag = '7.0.0'
}
}
}
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 6b34ff5..0e24938 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -31,7 +31,7 @@ import android.webkit.WebChromeClient.CustomViewCallback;
* are not expected to implement it.
*/
public interface CordovaWebView {
- public static final String CORDOVA_VERSION = "6.5.0-dev";
+ public static final String CORDOVA_VERSION = "7.0.0";
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
--
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 03/04: CB-13621: Wrote similar warning to
CB-12948 on iOS. We no longer support update.
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 655c0182726087fc13f6c5d30c5e8b736a7e78b8
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Thu Nov 30 10:40:07 2017 -0800
CB-13621: Wrote similar warning to CB-12948 on iOS. We no longer support update.
---
bin/lib/create.js | 45 +++++++++++----------------------------------
1 file changed, 11 insertions(+), 34 deletions(-)
diff --git a/bin/lib/create.js b/bin/lib/create.js
index c96ea6c..7e39f87 100755
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -348,39 +348,16 @@ function generateDoneMessage (type, link) {
// Returns a promise.
exports.update = function (projectPath, options, events) {
- options = options || {};
-
- return Q()
- .then(function () {
- var isAndroidStudio = AndroidStudio.isAndroidStudioProject(projectPath);
- var isLegacy = !isAndroidStudio;
- var manifest = null;
- var builder = 'gradle';
-
- if (isAndroidStudio) {
- manifest = new AndroidManifest(path.join(projectPath, 'app', 'main', 'AndroidManifest.xml'));
- builder = 'studio';
- } else {
- manifest = new AndroidManifest(path.join(projectPath, 'AndroidManifest.xml'));
- builder = 'gradle';
- }
-
- if (Number(manifest.getMinSdkVersion()) < MIN_SDK_VERSION) {
- events.emit('verbose', 'Updating minSdkVersion to ' + MIN_SDK_VERSION + ' in AndroidManifest.xml');
- manifest.setMinSdkVersion(MIN_SDK_VERSION);
- }
-
- manifest.setDebuggable(false).write();
-
- var projectName = manifest.getActivity().getName();
- var target_api = check_reqs.get_target();
-
- exports.copyJsAndLibrary(projectPath, options.link, projectName, isLegacy);
- exports.copyScripts(projectPath);
- exports.copyBuildRules(projectPath, isLegacy);
- exports.writeProjectProperties(projectPath, target_api);
- exports.prepBuildFiles(projectPath, builder);
- events.emit('log', generateDoneMessage('update', options.link));
- }).thenResolve(projectPath);
+ var errorString =
+ 'An in-place platform update is not supported. \n' +
+ 'The `platforms` folder is always treated as a build artifact in the CLI workflow.\n' +
+ 'To update your platform, you have to remove, then add your android platform again.\n' +
+ 'Make sure you save your plugins beforehand using `cordova plugin save`, and save \n' + 'a copy of the platform first if you had manual changes in it.\n' +
+ '\tcordova plugin save\n' +
+ '\tcordova platform rm android\n' +
+ '\tcordova platform add android\n'
+ ;
+
+ return Q.reject(errorString);
};
--
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 01/04: Update JS snapshot to version 7.0.0 (via
coho)
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit c7b0b93c9dc8b873e0b3dbcd98117ef8b8cb586e
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Thu Nov 30 10:01:28 2017 -0800
Update JS snapshot to version 7.0.0 (via coho)
---
bin/templates/project/assets/www/cordova.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js
index 5eb7b4d..092b2d6 100644
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '6.5.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '7.0.0';
// file: src/scripts/require.js
/* jshint -W079 */
--
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org