diff --git a/android-template/variables.gradle b/android-template/variables.gradle index 42ed4358a5..cbab85b63d 100644 --- a/android-template/variables.gradle +++ b/android-template/variables.gradle @@ -1,7 +1,7 @@ ext { minSdkVersion = 21 - compileSdkVersion = 29 - targetSdkVersion = 29 + compileSdkVersion = 30 + targetSdkVersion = 30 androidxAppCompatVersion = '1.1.0' androidxCoreVersion = '1.2.0' androidxMaterialVersion = '1.1.0-rc02' diff --git a/android/capacitor/build.gradle b/android/capacitor/build.gradle index 972d2d5f79..02528d08c0 100644 --- a/android/capacitor/build.gradle +++ b/android/capacitor/build.gradle @@ -24,10 +24,10 @@ tasks.withType(Javadoc).all { enabled = false } apply plugin: 'com.android.library' android { - compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 29 + compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 30 defaultConfig { minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 21 - targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 29 + targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 30 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/android/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java b/android/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java index c6c1c951c8..c7a403a8ff 100644 --- a/android/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java +++ b/android/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java @@ -1,6 +1,7 @@ package com.getcapacitor; import android.Manifest; +import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; import android.content.ActivityNotFoundException; @@ -357,6 +358,7 @@ private void showMediaCaptureOrFilePicker(ValueCallback filePathCallback, } } + @SuppressLint("QueryPermissionsNeeded") private boolean showImageCapturePicker(final ValueCallback filePathCallback) { Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); if (takePictureIntent.resolveActivity(bridge.getActivity().getPackageManager()) == null) { @@ -390,6 +392,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) { return true; } + @SuppressLint("QueryPermissionsNeeded") private boolean showVideoCapturePicker(final ValueCallback filePathCallback) { Intent takeVideoIntent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE); if (takeVideoIntent.resolveActivity(bridge.getActivity().getPackageManager()) == null) { diff --git a/capacitor-cordova-android-plugins/build.gradle b/capacitor-cordova-android-plugins/build.gradle index 17fca4f2ec..d8fe4864c7 100644 --- a/capacitor-cordova-android-plugins/build.gradle +++ b/capacitor-cordova-android-plugins/build.gradle @@ -15,10 +15,10 @@ buildscript { apply plugin: 'com.android.library' android { - compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 29 + compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 30 defaultConfig { minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 21 - targetSdkVersion targetSdkVersion = project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 29 + targetSdkVersion targetSdkVersion = project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 30 versionCode 1 versionName "1.0" }