From 4539aed4c74a3de5fc60158f871d5fddb94dccf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Schultz=20Madsen?= Date: Tue, 12 Feb 2019 09:48:42 +0100 Subject: [PATCH 1/5] Adding changes to support Android 7.0.0 --- bin/lib/android.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/lib/android.js b/bin/lib/android.js index ea54e20..562b100 100644 --- a/bin/lib/android.js +++ b/bin/lib/android.js @@ -156,12 +156,12 @@ module.exports = function (context) { return fs.exists('platforms/android') // Write preferences xml file - .then(function () { return fs.mkdir('platforms/android/res/xml'); }) - .then(function () { return fs.writeFile('platforms/android/res/xml/apppreferences.xml', preferencesDocument.write()); }) + .then(function () { return fs.mkdir('platforms/android/app/src/main/res/xml'); }) + .then(function () { return fs.writeFile('platforms/android/app/src/main/res/xml/apppreferences.xml', preferencesDocument.write()); }) // Write localization resource file - .then(function () { return fs.mkdir('platforms/android/res/values'); }) - .then(function (prefs) { return fs.writeFile('platforms/android/res/values/apppreferences.xml', preferencesStringDocument.write()); }) + .then(function () { return fs.mkdir('platforms/android/app/src/main/res/values'); }) + .then(function (prefs) { return fs.writeFile('platforms/android/app/src/main/res/values/apppreferences.xml', preferencesStringDocument.write()); }) .then(function () { console.log('android preferences file was successfully generated'); }) .catch(function (err) { @@ -216,10 +216,10 @@ module.exports = function (context) { return fs.exists('platforms/android') // Remove preferences xml file - .then(function () { return fs.unlink('platforms/android/res/xml/apppreferences.xml'); }) + .then(function () { return fs.unlink('platforms/android/app/src/main/res/xml/apppreferences.xml'); }) // Remove localization resource file - .then(function (prefs) { return fs.unlink('platforms/android/res/values/apppreferences.xml'); }) + .then(function (prefs) { return fs.unlink('platforms/android/app/src/main/res/values/apppreferences.xml'); }) // Remove preferences from native android project .then(function (data) { From b5cced4d36151166608ab8d0b2dc1c0ee14995ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Schultz=20Madsen?= Date: Tue, 12 Feb 2019 10:18:46 +0100 Subject: [PATCH 2/5] Updating API level to 26 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 11e7f5a..1485f36 100644 --- a/circle.yml +++ b/circle.yml @@ -42,7 +42,7 @@ dependencies: test: pre: - - emulator -avd circleci-android22 -no-audio -no-window: + - emulator -avd circleci-android26 -no-audio -no-window: background: true parallel: true - circle-android wait-for-boot From 4cabcc918bf94bdf519434c45bf51970cae71bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Schultz=20Madsen?= Date: Tue, 12 Feb 2019 10:23:59 +0100 Subject: [PATCH 3/5] Adding dummy space to trigger build. --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 1485f36..8e2e1c3 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: node: - version: 6 + version: 6 java: version: 'oraclejdk8' environment: From fa17eca32479d229e9dee320a7509ba947ffbb7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Schultz=20Madsen?= Date: Tue, 12 Feb 2019 10:25:30 +0100 Subject: [PATCH 4/5] Setting old android api version. --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 8e2e1c3..11e7f5a 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: node: - version: 6 + version: 6 java: version: 'oraclejdk8' environment: @@ -42,7 +42,7 @@ dependencies: test: pre: - - emulator -avd circleci-android26 -no-audio -no-window: + - emulator -avd circleci-android22 -no-audio -no-window: background: true parallel: true - circle-android wait-for-boot From b34c6cc4b2ffe7a2963158a9a169da8132e45f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Schultz=20Madsen?= Date: Tue, 12 Feb 2019 13:59:18 +0100 Subject: [PATCH 5/5] Adding more changes to support cordova iOS 4.5.5 --- bin/lib/android.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/lib/android.js b/bin/lib/android.js index 562b100..ffe3b73 100644 --- a/bin/lib/android.js +++ b/bin/lib/android.js @@ -156,12 +156,12 @@ module.exports = function (context) { return fs.exists('platforms/android') // Write preferences xml file - .then(function () { return fs.mkdir('platforms/android/app/src/main/res/xml'); }) - .then(function () { return fs.writeFile('platforms/android/app/src/main/res/xml/apppreferences.xml', preferencesDocument.write()); }) + .then(function () { return fs.mkdir('platforms/android/app/src/main/res/xml'); }) + .then(function () { return fs.writeFile('platforms/android/app/src/main/res/xml/apppreferences.xml', preferencesDocument.write()); }) // Write localization resource file - .then(function () { return fs.mkdir('platforms/android/app/src/main/res/values'); }) - .then(function (prefs) { return fs.writeFile('platforms/android/app/src/main/res/values/apppreferences.xml', preferencesStringDocument.write()); }) + .then(function () { return fs.mkdir('platforms/android/app/src/main/res/values'); }) + .then(function (prefs) { return fs.writeFile('platforms/android/app/src/main/res/values/apppreferences.xml', preferencesStringDocument.write()); }) .then(function () { console.log('android preferences file was successfully generated'); }) .catch(function (err) { @@ -193,7 +193,7 @@ module.exports = function (context) { }) .then(function (data) { var androidPackagePath = "me.apla.cordova".replace (/\./g, '/'); - var activityFileName= path.join ('platforms/android/src', androidPackagePath, 'AppPreferencesActivity.java'); + var activityFileName= path.join ('platforms/android/app/src/main/java/', androidPackagePath, 'AppPreferencesActivity.java'); return fs.writeFile(activityFileName, data); }) @@ -212,14 +212,14 @@ module.exports = function (context) { function clean(config) { var androidPackagePath = "me.apla.cordova".replace (/\./g, '/'); - var activityFileName = path.join ('platforms/android/src', androidPackagePath, 'AppPreferencesActivity.java'); + var activityFileName = path.join ('platforms/android/app/src/main/java/', androidPackagePath, 'AppPreferencesActivity.java'); return fs.exists('platforms/android') // Remove preferences xml file - .then(function () { return fs.unlink('platforms/android/app/src/main/res/xml/apppreferences.xml'); }) + .then(function () { return fs.unlink('platforms/android/app/src/main/res/xml/apppreferences.xml'); }) // Remove localization resource file - .then(function (prefs) { return fs.unlink('platforms/android/app/src/main/res/values/apppreferences.xml'); }) + .then(function (prefs) { return fs.unlink('platforms/android/app/src/main/res/values/apppreferences.xml'); }) // Remove preferences from native android project .then(function (data) { @@ -249,3 +249,4 @@ module.exports = function (context) { clean: clean }; }; +