Update paths to work with cordova-android 7.x

This is just to get things working for our project. A real solution would probably need to support older cordova-android versions, thus requiring some branching in the construction of these paths.
NxtbookMedia · Aug 20, 2018 · 3e3d9a6 · 3e3d9a6
1 parent e840a7b
commit 3e3d9a6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/scripts/lib/buildVersionUpdater.js b/scripts/lib/buildVersionUpdater.js
@@ -61,7 +61,13 @@ function increaseBuildVersion(cordovaContext) {
  * @param {Object} cordovaContext - cordova's context
  */
 function increaseBuildVersionForAndroid(cordovaContext, buildConfig) {
-  var androidManifestFilePath = path.join(cordovaContext.opts.projectRoot, 'platforms', ANDROID_PLATFORM, 'AndroidManifest.xml'),
+  var androidManifestFilePath = path.join(cordovaContext.opts.projectRoot,
+                                          'platforms',
+                                          ANDROID_PLATFORM,
+                                          'app',
+                                          'src',
+                                          'main',
+                                          'AndroidManifest.xml'),
     manifestFileContent = xmlHelper.readXmlAsJson(androidManifestFilePath);
 
   if (!manifestFileContent) {

diff --git a/scripts/lib/chcpConfigXmlWriter.js b/scripts/lib/chcpConfigXmlWriter.js
@@ -80,7 +80,15 @@ function pathToIosConfigXml() {
  * @return {String} absolute path to config.xml file
  */
 function pathToAndroidConfigXml() {
-  return path.join(projectRoot, 'platforms', 'android', 'res', 'xml', 'config.xml');
+  return path.join(projectRoot,
+                   'platforms',
+                   'android',
+                   'app',
+                   'src',
+                   'main',
+                   'res',
+                   'xml',
+                   'config.xml');
 }
 
 /**