diff --git a/build.gradle b/build.gradle index 24d6cbf9..d641ad1a 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:4.0.1' } } @@ -14,13 +14,15 @@ allprojects { maven { url "https://maven.google.com" } + google() } } ext { compileSdkVersion = 28 buildToolsVersion = '28.0.3' - androidXLibraryVersion = '1.0.0' + androidXAppCompatVersion = '1.2.0' + androidXLibraryVersion = '1.3.0' PUBLISH_GROUP_ID = 'com.theartofdev.edmodo' PUBLISH_ARTIFACT_ID = 'android-image-cropper' diff --git a/cropper/build.gradle b/cropper/build.gradle index 7bea026c..a3883efd 100644 --- a/cropper/build.gradle +++ b/cropper/build.gradle @@ -42,7 +42,7 @@ publishing { apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle' dependencies { - api "androidx.appcompat:appcompat:$androidXLibraryVersion" + api "androidx.appcompat:appcompat:$androidXAppCompatVersion" implementation "androidx.exifinterface:exifinterface:$androidXLibraryVersion" } diff --git a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageActivity.java b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageActivity.java index d1afa9f0..59184fbe 100644 --- a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageActivity.java +++ b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageActivity.java @@ -189,6 +189,7 @@ public void onBackPressed() { @Override @SuppressLint("NewApi") protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); // handle result of pick image chooser if (requestCode == CropImage.PICK_IMAGE_CHOOSER_REQUEST_CODE) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a9559919..10d0c123 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 06 15:20:13 IDT 2018 +#Sun Sep 27 19:53:05 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/quick-start/build.gradle b/quick-start/build.gradle index 0f037fe7..366f165c 100644 --- a/quick-start/build.gradle +++ b/quick-start/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion rootProject.buildToolsVersion defaultConfig { - minSdkVersion 14 + minSdkVersion 21 targetSdkVersion rootProject.compileSdkVersion versionCode 1 versionName '1.0' @@ -17,5 +17,5 @@ android { dependencies { api project(':cropper') - api "androidx.appcompat:appcompat:$androidXLibraryVersion" + api "androidx.appcompat:appcompat:$androidXAppCompatVersion" } diff --git a/quick-start/src/main/java/com/theartofdev/edmodo/cropper/quick/start/MainActivity.java b/quick-start/src/main/java/com/theartofdev/edmodo/cropper/quick/start/MainActivity.java index 01974e95..df7d542a 100644 --- a/quick-start/src/main/java/com/theartofdev/edmodo/cropper/quick/start/MainActivity.java +++ b/quick-start/src/main/java/com/theartofdev/edmodo/cropper/quick/start/MainActivity.java @@ -44,6 +44,7 @@ public void onSelectImageClick(View view) { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); // handle result of CropImageActivity if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) { diff --git a/sample/build.gradle b/sample/build.gradle index 0f037fe7..a15ad969 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -17,5 +17,5 @@ android { dependencies { api project(':cropper') - api "androidx.appcompat:appcompat:$androidXLibraryVersion" + api "androidx.appcompat:appcompat:$androidXAppCompatVersion" } diff --git a/test/build.gradle b/test/build.gradle index 1d150522..1ada2947 100644 --- a/test/build.gradle +++ b/test/build.gradle @@ -16,7 +16,7 @@ android { } dependencies { - api "androidx.appcompat:appcompat:$androidXLibraryVersion" + api "androidx.appcompat:appcompat:$androidXAppCompatVersion" implementation project(":cropper") } diff --git a/test/src/main/java/com/theartofdev/edmodo/cropper/test/MainActivity.java b/test/src/main/java/com/theartofdev/edmodo/cropper/test/MainActivity.java index 06fe2362..7d102154 100644 --- a/test/src/main/java/com/theartofdev/edmodo/cropper/test/MainActivity.java +++ b/test/src/main/java/com/theartofdev/edmodo/cropper/test/MainActivity.java @@ -26,6 +26,7 @@ public void onSelectImageClick(View view) { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); // handle result of CropImageActivity if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) {