diff --git a/build.gradle b/build.gradle
index b31e2b7f..695fd554 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.0'
+ classpath 'com.android.tools.build:gradle:3.2.0'
}
}
@@ -18,9 +18,9 @@ allprojects {
}
ext {
- compileSdkVersion = 27
- buildToolsVersion = '27.0.3'
- supportLibraryVersion = '27.1.1'
+ compileSdkVersion = 28
+ buildToolsVersion = '28.0.2'
+ androidXLibraryVersion = '1.0.0'
PUBLISH_GROUP_ID = 'com.theartofdev.edmodo'
PUBLISH_ARTIFACT_ID = 'android-image-cropper'
diff --git a/cropper/build.gradle b/cropper/build.gradle
index c368d3ee..7bea026c 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 "com.android.support:appcompat-v7:$supportLibraryVersion"
- implementation "com.android.support:exifinterface:$supportLibraryVersion"
+ api "androidx.appcompat:appcompat:$androidXLibraryVersion"
+ implementation "androidx.exifinterface:exifinterface:$androidXLibraryVersion"
}
diff --git a/cropper/src/main/java/com/theartofdev/edmodo/cropper/BitmapUtils.java b/cropper/src/main/java/com/theartofdev/edmodo/cropper/BitmapUtils.java
index 92c87b58..328a8021 100644
--- a/cropper/src/main/java/com/theartofdev/edmodo/cropper/BitmapUtils.java
+++ b/cropper/src/main/java/com/theartofdev/edmodo/cropper/BitmapUtils.java
@@ -21,7 +21,6 @@
import android.graphics.Rect;
import android.graphics.RectF;
import android.net.Uri;
-import android.support.media.ExifInterface;
import android.util.Log;
import android.util.Pair;
@@ -38,6 +37,8 @@
import javax.microedition.khronos.egl.EGLContext;
import javax.microedition.khronos.egl.EGLDisplay;
+import androidx.exifinterface.media.ExifInterface;
+
/** Utility class that deals with operations with an ImageView. */
final class BitmapUtils {
diff --git a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImage.java b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImage.java
index 56a08f9f..ba8b807b 100644
--- a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImage.java
+++ b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImage.java
@@ -34,17 +34,18 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.provider.MediaStore;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.Fragment;
import java.io.File;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.fragment.app.Fragment;
+
/**
* Helper to simplify crop image work like starting pick-image acitvity and handling camera/gallery
* intents.
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 7c33b898..d1afa9f0 100644
--- a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageActivity.java
+++ b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageActivity.java
@@ -22,10 +22,10 @@
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
diff --git a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageView.java b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageView.java
index 46cb1f33..77b18613 100644
--- a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageView.java
+++ b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageView.java
@@ -25,7 +25,7 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Parcelable;
-import android.support.media.ExifInterface;
+import androidx.exifinterface.media.ExifInterface;
import android.util.AttributeSet;
import android.util.Pair;
import android.view.LayoutInflater;
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..8103ea76
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2018. DNA Software. All rights reserved.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9b37d80a..a9559919 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/quick-start/build.gradle b/quick-start/build.gradle
index d3cbbfd9..0f037fe7 100644
--- a/quick-start/build.gradle
+++ b/quick-start/build.gradle
@@ -17,5 +17,5 @@ android {
dependencies {
api project(':cropper')
- api "com.android.support:appcompat-v7:$supportLibraryVersion"
+ api "androidx.appcompat:appcompat:$androidXLibraryVersion"
}
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 dca9f2ec..01974e95 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
@@ -14,7 +14,7 @@
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.ImageView;
import android.widget.Toast;
diff --git a/sample/build.gradle b/sample/build.gradle
index d3cbbfd9..0f037fe7 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -17,5 +17,5 @@ android {
dependencies {
api project(':cropper')
- api "com.android.support:appcompat-v7:$supportLibraryVersion"
+ api "androidx.appcompat:appcompat:$androidXLibraryVersion"
}
diff --git a/sample/src/main/java/com/theartofdev/edmodo/cropper/sample/MainActivity.java b/sample/src/main/java/com/theartofdev/edmodo/cropper/sample/MainActivity.java
index 5742a844..44d3f34d 100644
--- a/sample/src/main/java/com/theartofdev/edmodo/cropper/sample/MainActivity.java
+++ b/sample/src/main/java/com/theartofdev/edmodo/cropper/sample/MainActivity.java
@@ -18,10 +18,10 @@
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
import android.util.Pair;
import android.view.Menu;
import android.view.MenuInflater;
diff --git a/sample/src/main/java/com/theartofdev/edmodo/cropper/sample/MainFragment.java b/sample/src/main/java/com/theartofdev/edmodo/cropper/sample/MainFragment.java
index 848e7af7..25dfcec2 100644
--- a/sample/src/main/java/com/theartofdev/edmodo/cropper/sample/MainFragment.java
+++ b/sample/src/main/java/com/theartofdev/edmodo/cropper/sample/MainFragment.java
@@ -17,7 +17,7 @@
import android.graphics.Rect;
import android.net.Uri;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MenuItem;
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 6faa8a00..c714b8f7 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/test/build.gradle b/test/build.gradle
index 626df4f7..e5a13e16 100644
--- a/test/build.gradle
+++ b/test/build.gradle
@@ -6,7 +6,7 @@ android {
defaultConfig {
minSdkVersion 14
- targetSdkVersion 27
+ targetSdkVersion 28
versionCode 1
versionName '1.0'
}
@@ -16,7 +16,7 @@ android {
}
dependencies {
- api "com.android.support:appcompat-v7:27.1.1"
+ api "androidx.appcompat:appcompat:$androidXLibraryVersion"
api 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
}
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 96fb35c6..06fe2362 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
@@ -2,7 +2,7 @@
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.ImageView;
import android.widget.Toast;