diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 19818a0..9536fe2 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -15,7 +15,6 @@ - diff --git a/.idea/modules.xml b/.idea/modules.xml index 796785e..b452719 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,7 +4,13 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules/demo/ImageEditor-Android.demo.iml b/.idea/modules/demo/ImageEditor-Android.demo.iml index f68909c..33bdc1b 100644 --- a/.idea/modules/demo/ImageEditor-Android.demo.iml +++ b/.idea/modules/demo/ImageEditor-Android.demo.iml @@ -5,7 +5,7 @@ @@ -30,55 +30,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/imageeditlibrary/ImageEditor-Android.imageeditlibrary.iml b/.idea/modules/imageeditlibrary/ImageEditor-Android.imageeditlibrary.iml index e600fab..01c756b 100644 --- a/.idea/modules/imageeditlibrary/ImageEditor-Android.imageeditlibrary.iml +++ b/.idea/modules/imageeditlibrary/ImageEditor-Android.imageeditlibrary.iml @@ -5,7 +5,7 @@ @@ -31,102 +31,10 @@ - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ImageEditor-Android.iml b/ImageEditor-Android.iml index c5e42e7..e43515c 100644 --- a/ImageEditor-Android.iml +++ b/ImageEditor-Android.iml @@ -7,7 +7,7 @@ - + diff --git a/build.gradle b/build.gradle index e3fa820..470cac9 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:4.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/demo/build.gradle b/demo/build.gradle index 23c488d..0eabe58 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.application' android { compileSdkVersion 31 - buildToolsVersion '28.0.3' + buildToolsVersion '30.0.3' defaultConfig { applicationId "com.xinlan.imageeditandroid" minSdkVersion 19 - targetSdkVersion 24 + targetSdkVersion 30 versionCode 1 versionName "1.0" } @@ -21,6 +21,6 @@ android { dependencies { api fileTree(include: ['*.jar'], dir: 'libs') - api 'androidx.appcompat:appcompat:1.0.0' + api 'androidx.appcompat:appcompat:1.4.2' api project(':imageeditlibrary') } diff --git a/imageeditlibrary/build.gradle b/imageeditlibrary/build.gradle index f3c750e..f6dae53 100644 --- a/imageeditlibrary/build.gradle +++ b/imageeditlibrary/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 30 - buildToolsVersion '28.0.3' + compileSdkVersion 31 + buildToolsVersion '30.0.3' defaultConfig { minSdkVersion 19 @@ -30,10 +30,10 @@ dependencies { testImplementation "org.robolectric:robolectric:3.3.2" api 'com.nostra13.universalimageloader:universal-image-loader:1.9.4' - api 'androidx.recyclerview:recyclerview:1.0.0' - api 'androidx.appcompat:appcompat:1.0.0' + api 'androidx.recyclerview:recyclerview:1.2.1' + api 'androidx.appcompat:appcompat:1.4.2' api 'com.makeramen:roundedimageview:2.3.0' - api 'androidx.constraintlayout:constraintlayout:2.0.4' + api 'androidx.constraintlayout:constraintlayout:2.1.4' }