You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by er...@apache.org on 2021/08/09 14:09:35 UTC
[cordova-plugin-camera] branch master updated: feat(android)!:
support AndroidX (#751)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-plugin-camera.git
The following commit(s) were added to refs/heads/master by this push:
new 0227cdc feat(android)!: support AndroidX (#751)
0227cdc is described below
commit 0227cdcf14629bd26d0b498f47686929a52a45a5
Author: エリス <er...@users.noreply.github.com>
AuthorDate: Mon Aug 9 23:09:29 2021 +0900
feat(android)!: support AndroidX (#751)
* feat: migrate FileProvider to androidx
* feat: add androidx.core:core with variable override ANDROIDX_CORE_VERSION
---
plugin.xml | 7 +++----
src/android/CameraLauncher.java | 2 +-
src/android/FileProvider.java | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/plugin.xml b/plugin.xml
index f13f9cd..775966a 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -94,13 +94,12 @@
<source-file src="src/android/GalleryPathVO.java" target-dir="src/org/apache/cordova/camera" />
<source-file src="src/android/xml/camera_provider_paths.xml" target-dir="res/xml" />
+ <preference name="ANDROIDX_CORE_VERSION" default="1.6.+"/>
+ <framework src="androidx.core:core:$ANDROIDX_CORE_VERSION" />
+
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle" />
</js-module>
-
- <preference name="ANDROID_SUPPORT_V4_VERSION" default="27.+"/>
- <framework src="com.android.support:support-v4:$ANDROID_SUPPORT_V4_VERSION"/>
-
</platform>
<!-- ios -->
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index 8172e73..a2fdb4d 100644
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -39,7 +39,7 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.provider.MediaStore;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
import android.util.Base64;
import org.apache.cordova.BuildHelper;
diff --git a/src/android/FileProvider.java b/src/android/FileProvider.java
index 336f93c..67c214c 100644
--- a/src/android/FileProvider.java
+++ b/src/android/FileProvider.java
@@ -18,4 +18,4 @@
*/
package org.apache.cordova.camera;
-public class FileProvider extends android.support.v4.content.FileProvider {}
+public class FileProvider extends androidx.core.content.FileProvider {}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org