Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #794

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update dependencies #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion cropper/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

1 change: 1 addition & 0 deletions cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions quick-start/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ android {
buildToolsVersion rootProject.buildToolsVersion

defaultConfig {
minSdkVersion 14
minSdkVersion 21
targetSdkVersion rootProject.compileSdkVersion
versionCode 1
versionName '1.0'
Expand All @@ -17,5 +17,5 @@ android {

dependencies {
api project(':cropper')
api "androidx.appcompat:appcompat:$androidXLibraryVersion"
api "androidx.appcompat:appcompat:$androidXAppCompatVersion"
}
1 change: 1 addition & 0 deletions quick-start/src/main/java/com/theartofdev/edmodo/cropper/quick/start/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion sample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ android {

dependencies {
api project(':cropper')
api "androidx.appcompat:appcompat:$androidXLibraryVersion"
api "androidx.appcompat:appcompat:$androidXAppCompatVersion"
}
2 changes: 1 addition & 1 deletion test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ android {
}

dependencies {
api "androidx.appcompat:appcompat:$androidXLibraryVersion"
api "androidx.appcompat:appcompat:$androidXAppCompatVersion"
implementation project(":cropper")

}
1 change: 1 addition & 0 deletions test/src/main/java/com/theartofdev/edmodo/cropper/test/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down