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:50 UTC
[cordova-android] branch master updated (3642ffb -> 99d5b4d)
This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git.
from 3642ffb CB-13741: Updating checked-in node_modules, otherwise plugin installation fails
new e53a65e CB-13620 Updated RELEASENOTES and Version for release 7.0.0
new 735bc98 Set VERSION to 7.1.0-dev (via coho)
new 061f08b Update JS snapshot to version 7.1.0-dev (via coho)
new 52fd32c CB-13621: Wrote similar warning to CB-12948 on iOS. We no longer support update.
new 99d5b4d CB-13622: Testing commit
The 5 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.
Summary of changes:
RELEASENOTES.md | 22 +++++++++++
VERSION | 2 +-
bin/lib/create.js | 45 ++++++----------------
bin/templates/cordova/version | 2 +-
bin/templates/project/assets/www/cordova.js | 2 +-
framework/build.gradle | 6 +--
.../src/org/apache/cordova/CordovaWebView.java | 2 +-
package.json | 2 +-
test/app/build.gradle | 6 +--
9 files changed, 44 insertions(+), 45 deletions(-)
--
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/05: Update JS snapshot to version 7.1.0-dev
(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 master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 061f08bc0390779b173b7faf2be0ca5be483cf56
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Thu Nov 30 10:01:30 2017 -0800
Update JS snapshot to version 7.1.0-dev (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..b27a90b 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.1.0-dev';
// 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
[cordova-android] 02/05: Set VERSION to 7.1.0-dev (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 master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 735bc982435f153f3cff165a0e1e3d47a2553da5
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Thu Nov 30 10:01:28 2017 -0800
Set VERSION to 7.1.0-dev (via coho)
---
VERSION | 2 +-
bin/templates/cordova/version | 2 +-
framework/build.gradle | 6 +++---
framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
package.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/VERSION b/VERSION
index 1c12120..f7446a0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.5.0-dev
+7.1.0-dev
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index cf4c590..cb08f94 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.1.0-dev";
module.exports.version = VERSION;
diff --git a/framework/build.gradle b/framework/build.gradle
index 9c925c3..8feed69 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -42,7 +42,7 @@ apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
group = 'org.apache.cordova'
-version = '7.0.0'
+version = '7.1.0-dev'
android {
compileSdkVersion cdvCompileSdkVersion
@@ -129,9 +129,9 @@ bintray {
licenses = ['Apache-2.0']
labels = ['android', 'cordova', 'phonegap']
version {
- name = '6.5.0-dev'
+ name = '7.1.0-dev'
released = new Date()
- vcsTag = '6.5.0-dev'
+ vcsTag = '7.1.0-dev'
}
}
}
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 6b34ff5..2dec30a 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.1.0-dev";
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
diff --git a/package.json b/package.json
index dcd8aa2..16497fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-android",
- "version": "7.0.0",
+ "version": "7.1.0-dev",
"description": "cordova-android release",
"bin": {
"create": "bin/create"
--
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/05: 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 master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 52fd32c8374ec33a7cea6cefe531f938d4b047dd
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/05: CB-13620 Updated RELEASENOTES and Version
for release 7.0.0
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit e53a65ef0752965b792d309d8e077b9eace9d31e
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Thu Nov 30 09:42:11 2017 -0800
CB-13620 Updated RELEASENOTES and Version for release 7.0.0
---
RELEASENOTES.md | 22 ++++++++++++++++++++++
framework/build.gradle | 2 +-
package.json | 2 +-
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2792482..7422b9f 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,28 @@
-->
## Release Notes for Cordova (Android) ##
+### 7.0.0 (Nov 30, 2017)
+* [CB-13612](https://issues.apache.org/jira/browse/CB-13612) Fix the remapper so that XML files copy over and the Camera works again.
+* [CB-13741](https://issues.apache.org/jira/browse/CB-13741) Bump `package.json` so we can install plugins
+* [CB-13610](https://issues.apache.org/jira/browse/CB-13610) Compress the default app assets
+* [CB-12835](https://issues.apache.org/jira/browse/CB-12835) add a Context getter in CordovaInterface
+* [CB-8976](https://issues.apache.org/jira/browse/CB-8976) Added the `cdvVersionCodeForceAbiDigit` flag to the template build.gradle that appends 0 to the versionCode when `cdvBuildMultipleApks` is not set
+* [CB-12291](https://issues.apache.org/jira/browse/CB-12291) (android) Add x86_64, arm64 and armeabi architecture flavors
+* [CB-13602](https://issues.apache.org/jira/browse/CB-13602) We were setting the path wrong, this is hacky but it works
+* [CB-13601](https://issues.apache.org/jira/browse/CB-13601) Fixing the standalone run scripts to make sure this works without using the CLI
+* [CB-13580](https://issues.apache.org/jira/browse/CB-13580) fix build for multiple apks (different product flavors)
+* [CB-13558](https://issues.apache.org/jira/browse/CB-13558) Upgrading the gradle so we can upload the AAR
+* [CB-13297](https://issues.apache.org/jira/browse/CB-13297) This just works once you bump the project structure. Java 1.8 compatibility baked-in
+* [CB-11244](https://issues.apache.org/jira/browse/CB-11244) **Android** Studio 3 work, things have changed with how the platform is built
+* [CB-11244](https://issues.apache.org/jira/browse/CB-11244) Found bug where the gradle subproject changes weren't actually getting written to the correct gradle file
+* [CB-13470](https://issues.apache.org/jira/browse/CB-13470) Fix Clean so that it cleans the **Android** Studio structure
+* [CB-11244](https://issues.apache.org/jira/browse/CB-11244) Adding specs for resource files inside an **Android** Studio Project
+* [CB-11244](https://issues.apache.org/jira/browse/CB-11244) Added remapping for drawables
+* [CB-11244](https://issues.apache.org/jira/browse/CB-11244) Found bug in Api.js where xml/strings.xml is used instead of values/strings.xml
+* [CB-11244](https://issues.apache.org/jira/browse/CB-11244) Setup Api.js to support multiple builders based on project structure
+* [CB-11244](https://issues.apache.org/jira/browse/CB-11244) Changing directory creation, will most likely hide this behind a flag for the next release of `cordova-android`, and then make it default in the next major pending feedback
+* Adding the Studio Builder to build a project based on **Android** Studio, and deleting Ant, since Google does not support Ant Builds anymore. Sorry guys!
+
### 6.4.0 (Nov 06, 2017)
* [CB-13289](https://issues.apache.org/jira/browse/CB-13289) Fixing build problems with Studio Three, but keeping **Windows** Gradle fix for now, will be deprecated
* [CB-13289](https://issues.apache.org/jira/browse/CB-13289) Fix test to work with new Google **Android** Gradle DSL
diff --git a/framework/build.gradle b/framework/build.gradle
index 6d48408..9c925c3 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -42,7 +42,7 @@ apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
group = 'org.apache.cordova'
-version = '6.5.0-dev'
+version = '7.0.0'
android {
compileSdkVersion cdvCompileSdkVersion
diff --git a/package.json b/package.json
index d8601d8..dcd8aa2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-android",
- "version": "6.5.0-dev",
+ "version": "7.0.0",
"description": "cordova-android release",
"bin": {
"create": "bin/create"
--
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] 05/05: 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 master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 99d5b4d9823f23b817354c11358c82d93f0f534e
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