Skip to content
Permalink
Browse files
feat(android)!: support AndroidX (#751)
* feat: migrate FileProvider to androidx
* feat: add androidx.core:core with variable override ANDROIDX_CORE_VERSION
  • Loading branch information
erisu committed Aug 9, 2021
1 parent 75bf807 commit 0227cdcf14629bd26d0b498f47686929a52a45a5
Showing 3 changed files with 5 additions and 6 deletions.
@@ -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 -->
@@ -39,7 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one
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;
@@ -18,4 +18,4 @@ Licensed to the Apache Software Foundation (ASF) under one
*/
package org.apache.cordova.camera;

public class FileProvider extends android.support.v4.content.FileProvider {}
public class FileProvider extends androidx.core.content.FileProvider {}

0 comments on commit 0227cdc

Please sign in to comment.