Merge pull request #183 from shankari/master

Change the class import script to work with the cordova 7+
e-mission · Apr 5, 2020 · 27273ce · 27273ce
2 parents fc8e8df + 0129f9a
commit 27273ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/hooks/android/addResourcesClassImport.js b/hooks/android/addResourcesClassImport.js
@@ -66,7 +66,7 @@ module.exports = function (ctx) {
         path = ctx.requireCordovaModule('path'),
         Q = ctx.requireCordovaModule('q');
 
-    var platformSourcesRoot = path.join(ctx.opts.projectRoot, 'platforms/android/src');
+    var platformSourcesRoot = path.join(ctx.opts.projectRoot, 'platforms/android/app/src/main/java/');
     var pluginSourcesRoot = path.join(ctx.opts.plugin.dir, 'src/android');
 
     var androidPluginsData = JSON.parse(fs.readFileSync(path.join(ctx.opts.projectRoot, 'plugins', 'android.json'), 'utf8'));

diff --git a/plugin.xml b/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
         id="edu.berkeley.eecs.emission.cordova.datacollection"
-        version="1.4.1">
+        version="1.4.2">
 
   <name>DataCollection</name>
   <description>Background data collection FTW! This is the part that I really
@@ -11,6 +11,7 @@
 
   <engines>
     <engine name="cordova" version=">=3.6.0"/>
+    <engine name="cordova-android" version=">=7.0.0"/>
   </engines>
 
   <asset src="www/ui/ionic/templates/main-collect-settings.html" target="templates/control/main-collect-settings.html"/>