You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ra...@apache.org on 2021/09/26 13:30:23 UTC

[cordova-lib] 03/03: test: use latest android release v10.1.1

This is an automated email from the ASF dual-hosted git repository.

raphinesse pushed a commit to branch raphinesse-ci-test
in repository https://gitbox.apache.org/repos/asf/cordova-lib.git

commit 79ca3498ead6319ac0b795d15cf4606f1f049842
Author: Erisu <el...@gmail.com>
AuthorDate: Sat Sep 25 20:25:00 2021 +0900

    test: use latest android release v10.1.1
---
 package-lock.json         | 76 +++++++++++++++++++++++++++++++++++++----------
 package.json              |  2 +-
 spec/cordova/util.spec.js |  2 +-
 spec/fixture-helper.js    |  2 +-
 4 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ec326ad..0fad79f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-lib",
-  "version": "10.0.1-dev",
+  "version": "11.0.0-dev",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1175,29 +1175,63 @@
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
     "cordova-android": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.0.0.tgz",
-      "integrity": "sha512-2ZEgApK4LPMYW0zh/mLAH3CabzCaKE0yxQTzA2wTf0Eo2HHTJnRtDCf9spGf3nPOkubyXS6+pvzz5QzNHpVTqQ==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.1.tgz",
+      "integrity": "sha512-eoJp5AcDMHniqmxj0CbUF/rVQfbbp108TWKU6oyJW9rl/ZTJqZxm5ybznl+1/1MBksklxhMeipMn0Iwd0kEzEQ==",
       "dev": true,
       "requires": {
-        "android-versions": "^1.5.0",
-        "cordova-common": "^4.0.1",
-        "execa": "^4.0.2",
-        "fs-extra": "^9.0.1",
-        "nopt": "^4.0.3",
+        "android-versions": "^1.7.0",
+        "cordova-common": "^4.0.2",
+        "execa": "^5.1.1",
+        "fast-glob": "^3.2.7",
+        "fs-extra": "^10.0.0",
+        "is-path-inside": "^3.0.3",
+        "nopt": "^5.0.0",
         "properties-parser": "^0.3.1",
+        "semver": "^7.3.5",
+        "untildify": "^4.0.0",
         "which": "^2.0.2"
       },
       "dependencies": {
-        "nopt": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-          "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+        "execa": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
           "dev": true,
           "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.0",
+            "human-signals": "^2.1.0",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.1",
+            "onetime": "^5.1.2",
+            "signal-exit": "^3.0.3",
+            "strip-final-newline": "^2.0.0"
           }
+        },
+        "fs-extra": {
+          "version": "10.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+          "dev": true
+        },
+        "human-signals": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+          "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+          "dev": true
         }
       }
     },
@@ -2913,6 +2947,12 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true
+    },
     "is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -5024,6 +5064,12 @@
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
     },
+    "untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true
+    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
diff --git a/package.json b/package.json
index 0e837eb..7b06181 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@cordova/eslint-config": "^3.0.0",
     "codecov": "^3.7.0",
-    "cordova-android": "9.0.0",
+    "cordova-android": "10.1.1",
     "delay": "^4.3.0",
     "jasmine": "^3.5.0",
     "jasmine-spec-reporter": "^5.0.2",
diff --git a/spec/cordova/util.spec.js b/spec/cordova/util.spec.js
index 09a2a3a..b578661 100644
--- a/spec/cordova/util.spec.js
+++ b/spec/cordova/util.spec.js
@@ -104,7 +104,7 @@ describe('util module', function () {
 
             return helpers.getFixture('androidApp').copyTo(platformPath)
                 .then(_ => util.getInstalledPlatformsWithVersions(temp))
-                .then(versions => expect(versions[PLATFORM]).toBe('9.0.0'));
+                .then(versions => expect(versions[PLATFORM]).toBe('10.1.1'));
         });
     });
     describe('getPlatformVersion method', () => {
diff --git a/spec/fixture-helper.js b/spec/fixture-helper.js
index 7ee0352..ef6e983 100644
--- a/spec/fixture-helper.js
+++ b/spec/fixture-helper.js
@@ -45,7 +45,7 @@ module.exports = function fixtureHelper (tmpDir) {
             const appPath = path.join(fixturesBaseDir, 'android-app');
 
             // We need to provide a ConfigParser instance to createPlatform :(
-            const cfgXmlPath = require.resolve('cordova-android/bin/templates/project/res/xml/config.xml');
+            const cfgXmlPath = require.resolve('cordova-android/templates/project/res/xml/config.xml');
             const config = new ConfigParser(cfgXmlPath);
 
             // Create the app folder and return its path

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