Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix: android build updates

Ilian Sapundshieva55a462dce5f
diff --git a/.gitignore b/.gitignore
index 204c07d83..34e5a8fe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,3 +107,5 @@ web/sw-con
/app/aws-exports.js
/app/graphql/*
+cordova/platforms/ios/www/yarn.lock
+cordova/platforms/ios/www/package.json
diff --git a/cordova/platforms/android/android.json b/cordova/platforms/android/android.json
index 26d670b13..25fe4f4d0 100644
--- a/cordova/platforms/android/android.json
+++ b/cordova/platforms/android/android.json
@@ -10,11 +10,11 @@
"/manifest/application/activity": [
{
"xml": "<intent-filter><action android:name=\"android.intent.action.VIEW\" /><category android:name=\"android.intent.category.DEFAULT\" /><category android:name=\"android.intent.category.BROWSABLE\" /><data android:mimeType=\"application/pdf\" android:scheme=\"file\" /><data android:mimeType=\"text/plain\" android:scheme=\"file\" /><data android:mimeType=\"image/x-windows-bmp\" android:scheme=\"file\" /><data android:mimeType=\"image/gif\" android:scheme=\"file\" /><data android:mimeType=\"image/png\" android:scheme=\"file\" /><data android:mimeType=\"image/jpeg\" android:scheme=\"file\" /><data android:mimeType=\"image/webp\" android:scheme=\"file\" /><data android:mimeType=\"video/webm\" android:scheme=\"file\" /><data android:mimeType=\"video/ogg\" android:scheme=\"file\" /><data android:mimeType=\"text/html\" android:scheme=\"file\" /><data android:mimeType=\"application/json\" android:scheme=\"file\" /></intent-filter>",
- "count": 5
+ "count": 7
},
{
"xml": "<intent-filter><action android:name=\"android.intent.action.VIEW\" /><category android:name=\"android.intent.category.DEFAULT\" /><category android:name=\"android.intent.category.BROWSABLE\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..json\" android:scheme=\"file\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..mht\" android:scheme=\"file\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..mhtml\" android:scheme=\"file\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..md\" android:scheme=\"file\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..md.txt\" android:scheme=\"file\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..markdown\" android:scheme=\"file\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..ogv\" android:scheme=\"file\" /></intent-filter>",
- "count": 5
+ "count": 7
},
{
"xml": "<intent-filter><action android:name=\"com.darryncampbell.cordova.plugin.intent.ACTION\" /><category android:name=\"android.intent.category.DEFAULT\" /></intent-filter>",
@@ -24,7 +24,7 @@
"/manifest/application": [
{
"xml": "<provider android:authorities=\"${applicationId}.provider\" android:exported=\"false\" android:grantUriPermissions=\"true\" android:name=\"android.support.v4.content.FileProvider\"><meta-data android:name=\"android.support.FILE_PROVIDER_PATHS\" android:resource=\"@xml/mnk_file_path\" /></provider>",
- "count": 5
+ "count": 7
},
{
"xml": "<activity android:label=\"Our Code World filepicker\" android:name=\"com.ourcodeworld.plugins.filebrowser.DialogShowPicker\"><intent-filter><action android:name=\"com.ourcodeworld.plugins.filebrowser.DialogShowPicker\" /><category android:name=\"android.intent.category.DEFAULT\" /></intent-filter></activity>",
diff --git a/cordova/platforms/android/app/build.gradle b/cordova/platforms/android/app/build.gradle
index b40db3a8e..c1a7c58b7 100644
--- a/cordova/platforms/android/app/build.gradle
+++ b/cordova/platforms/android/app/build.gradle
@@ -353,7 +353,6 @@ dependencies {
// SUB-PROJECT DEPENDENCIES START
implementation(project(path: ":CordovaLib"))
implementation "androidx.legacy:legacy-support-v4:1.0.0"
- implementation "androidx.legacy:legacy-support-v4:1.0.0"
implementation "androidx.core:core:1.1.0"
// SUB-PROJECT DEPENDENCIES END
}
diff --git a/cordova/platforms/android/app/src/main/AndroidManifest.xml b/cordova/platforms/android/app/src/main/AndroidManifest.xml
index b9d869111..07f4d630b 100644
--- a/cordova/platforms/android/app/src/main/AndroidManifest.xml
+++ b/cordova/platforms/android/app/src/main/AndroidManifest.xml
@@ -80,6 +80,9 @@
<provider android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/mnk_file_path" />
</provider>
+ <provider android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/mnk_file_path" />
+ </provider>
</application>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/cordova/platforms/android/gradle/wrapper/gradle-wrapper.properties b/cordova/platforms/android/gradle/wrapper/gradle-wrapper.properties
index 1b16c34a7..4154807e5 100644
--- a/cordova/platforms/android/gradle/wrapper/gradle-wrapper.properties
+++ b/cordova/platforms/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/cordova/platforms/ios/ios.json b/cordova/platforms/ios/ios.json
index fbdd0b1a3..70525d143 100644
--- a/cordova/platforms/ios/ios.json
+++ b/cordova/platforms/ios/ios.json
@@ -20,6 +20,9 @@
"installed_plugins": {
"com.whebcraft.cordova.plugin.downloader": {
"PACKAGE_NAME": "org.tagspaces.mobile"
+ },
+ "cordova-plugin-androidx": {
+ "PACKAGE_NAME": "org.tagspaces.mobile"
}
},
"dependent_plugins": {},
@@ -34,6 +37,7 @@
}
],
"plugin_metadata": {
- "com.whebcraft.cordova.plugin.downloader": "0.1.0"
+ "com.whebcraft.cordova.plugin.downloader": "0.1.0",
+ "cordova-plugin-androidx": "3.0.0"
}
}
diff --git a/cordova/platforms/ios/platform_www/cordova_plugins.js b/cordova/platforms/ios/platform_www/cordova_plugins.js
index a5a788214..9c6193ed3 100644
--- a/cordova/platforms/ios/platform_www/cordova_plugins.js
+++ b/cordova/platforms/ios/platform_www/cordova_plugins.js
@@ -10,6 +10,7 @@ cordova.define('cordova/plugin_list', function(require, exports, module) {
}
];
module.exports.metadata = {
- "com.whebcraft.cordova.plugin.downloader": "0.1.0"
+ "com.whebcraft.cordova.plugin.downloader": "0.1.0",
+ "cordova-plugin-androidx": "3.0.0"
};
});
\ No newline at end of file
diff --git a/cordova/platforms/ios/www/cordova_plugins.js b/cordova/platforms/ios/www/cordova_plugins.js
index a5a788214..9c6193ed3 100644
--- a/cordova/platforms/ios/www/cordova_plugins.js
+++ b/cordova/platforms/ios/www/cordova_plugins.js
@@ -10,6 +10,7 @@ cordova.define('cordova/plugin_list', function(require, exports, module) {
}
];
module.exports.metadata = {
- "com.whebcraft.cordova.plugin.downloader": "0.1.0"
+ "com.whebcraft.cordova.plugin.downloader": "0.1.0",
+ "cordova-plugin-androidx": "3.0.0"
};
});
\ No newline at end of file