From c1b389ad9b75c7029acc33a532f5626692235daf Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Tue, 27 Oct 2015 09:12:47 +0300 Subject: [PATCH] CB-9844 Remove old .java after renaming activity --- bin/templates/cordova/lib/prepare.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/bin/templates/cordova/lib/prepare.js b/bin/templates/cordova/lib/prepare.js index a514c8cd..3fba9fdb 100644 --- a/bin/templates/cordova/lib/prepare.js +++ b/bin/templates/cordova/lib/prepare.js @@ -157,8 +157,23 @@ function updateProjectAccordingTo(platformConfig, locations) { shell.mkdir('-p', path.dirname(destFile)); shell.sed(/package [\w\.]*;/, 'package ' + pkg + ';', java_files[0]).to(destFile); events.emit('verbose', 'Wrote out Android package name to "' + pkg + '"'); -} + if (orig_pkg !== pkg) { + // If package was name changed we need to remove old java with main activity + shell.rm('-Rf',java_files[0]); + // remove any empty directories + var currentDir = path.dirname(java_files[0]); + var sourcesRoot = path.resolve(locations.root, 'src'); + while(currentDir !== sourcesRoot) { + if(fs.existsSync(currentDir) && fs.readdirSync(currentDir).length === 0) { + fs.rmdirSync(currentDir); + currentDir = path.resolve(currentDir, '..'); + } else { + break; + } + } + } +} // Consturct the default value for versionCode as // PATCH + MINOR * 100 + MAJOR * 10000