diff --git a/demo/nsconfig.json b/demo/nsconfig.json new file mode 100644 index 0000000..6f4d74f --- /dev/null +++ b/demo/nsconfig.json @@ -0,0 +1,3 @@ +{ + "useLegacyWorkflow": true +} \ No newline at end of file diff --git a/demo/package.json b/demo/package.json index 56dd13f..7b58260 100644 --- a/demo/package.json +++ b/demo/package.json @@ -16,10 +16,10 @@ } }, "tns-ios": { - "version": "4.1.0" + "version": "5.4.0" }, "tns-android": { - "version": "4.1.1" + "version": "5.4.0" } }, "dependencies": { @@ -32,7 +32,7 @@ "nativescript-cordova-support": "file:../src", "nativescript-theme-core": "~1.0.4", "phonegap-plugin-barcodescanner": "https://github.com/mbektchiev/phonegap-plugin-barcodescanner/archive/7.1.2-fixed.tar.gz", - "tns-core-modules": "^4.1.0" + "tns-core-modules": "^5.4.1" }, "devDependencies": { "babel-traverse": "6.4.5", diff --git a/src/.npmrc b/src/.npmrc new file mode 100644 index 0000000..5e1f61a --- /dev/null +++ b/src/.npmrc @@ -0,0 +1,2 @@ +package-lock = false +bin-links = false diff --git a/src/lib/hooks/before-prepare.js b/src/lib/hooks/before-prepare.js index c855ecd..988a0f8 100644 --- a/src/lib/hooks/before-prepare.js +++ b/src/lib/hooks/before-prepare.js @@ -183,6 +183,7 @@ function prepareForAddingCordovaPlugins(platform, pluginPackageName, platformDir fs.writeFileSync(path.join(mainDirectory, ANDROID_MANIFEST_FILE_NAME), ` + @@ -233,6 +234,10 @@ function processCordovaProject(cordovaProjectDir, platform, pluginDataObjects, i case "java": fse.copySync(fullSrcPath, fullDestPath, { filter: (src, dest) => src.indexOf(idStringComponent) === -1 }); break; + case "AndroidManifest.xml": + const androidManifestContent = fse.readFileSync(fullSrcPath).toString(); + fse.writeFileSync(fullDestPath, androidManifestContent.replace('', '')); + break; default: fse.copySync(fullSrcPath, fullDestPath); } @@ -347,6 +352,11 @@ ext.cdvMinSdkVersion = null ${pluginGradleExtensionsSection} dependencies { + def supportVer = "28.0.0" + if (project.hasProperty("supportVersion")) { + supportVer = supportVersion + } + implementation fileTree(dir: '${LIBS_DIRECTORY_NAME}', include: '*.jar') ${subProjectDependenciesSection} } @@ -384,8 +394,8 @@ function getStringBetween(str, start, end) { function getUnifiedAppCompatSupportContent(originalContent) { return originalContent - .replace(/(com.android.support:appcompat-v7:).*?(['"])/g, "$1$supportVersion$2") - .replace(/(com.android.support:support-v4:).*?(['"])/g, "$1$supportVersion$2"); + .replace(/(com.android.support:appcompat-v7:).*?(['"])/g, "$1$supportVer$2") + .replace(/(com.android.support:support-v4:).*?(['"])/g, "$1$supportVer$2"); } function getAndroidAppDir(platformsDirectory) {