diff --git a/CHANGELOG.md b/CHANGELOG.md index 88fdc730..dd9e8d5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # PhotoEditor SDK - Changelog +## v9.0.0 + +### Changed + +* Migrated to AndroidX + +__________________________________________________________________ +🚨 __We do not plan to release new feature updates to v8. Only the most critical bug fixes will be back-ported to v8.__ +__________________________________________________________________ + + ## v8.3.4 ### Fixed diff --git a/README.md b/README.md index 36c7b00d..ba8a61b0 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ - Maven + Maven Twitter @@ -82,13 +82,6 @@ The PhotoEditor core library for Android. Containing the OpenGL and toolkit impl __UI Component__
The default UI components consisting of LivePreview and Editor Activity. -### Dependencies - -Two Google support libraries needed or used by the SDK. - -* com.android.support:recyclerview-v7 -* com.android.support:support-annotations - ## Documentation @@ -126,7 +119,7 @@ buildscript { maven { url "https://artifactory.img.ly/artifactory/imgly" } } dependencies { - classpath 'ly.img.android.pesdk:plugin:8.3.2' + classpath 'ly.img.android.pesdk:plugin:9.0.0' } } @@ -156,9 +149,6 @@ imglyConfig { licencePath 'pesdk_android_license' } - // If you are using another supportLibVersion ('com.android.support') please change this version here our update your own supportLibVersion - supportLibVersion "28.0.0" - // Define the modules you are need modules { // Add all the UI modules you are need diff --git a/app/build.gradle b/app/build.gradle index 677e5575..80d064dc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,7 @@ android { targetSdkVersion 30 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' resValue 'string', 'pesdk_version', "v$pesdk_version" } @@ -73,5 +73,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.3.1' } diff --git a/app/src/main/res/layout/imgly_popup_brush_preview.xml b/app/src/main/res/layout/imgly_popup_brush_preview.xml index 89852c34..8b9c1d3f 100644 --- a/app/src/main/res/layout/imgly_popup_brush_preview.xml +++ b/app/src/main/res/layout/imgly_popup_brush_preview.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal"> - @@ -31,7 +31,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="50"> - @@ -43,12 +43,12 @@ android:id="@+id/brushToolPreview" style="@style/Imgly.PESDK.Editor.Popup.Brush.BrushToolPreview"/> - - diff --git a/build.gradle b/build.gradle index cdc6a501..20ff7ac2 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.kotlin_version = '1.4.10' - ext.pesdk_version = '8.3.4' // Insert the latest SDK version here. You will find it here https://github.com/imgly/pesdk-android-demo/releases + ext.pesdk_version = '9.0.0' // Insert the latest SDK version here. You will find it here https://github.com/imgly/pesdk-android-demo/releases repositories { google() gradlePluginPortal() diff --git a/example_brush_presets_panel/build.gradle b/example_brush_presets_panel/build.gradle index 32d91e20..12175373 100644 --- a/example_brush_presets_panel/build.gradle +++ b/example_brush_presets_panel/build.gradle @@ -53,7 +53,7 @@ android { targetSdkVersion 30 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' resValue 'string', 'pesdk_version', "v$pesdk_version" } @@ -73,5 +73,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.3.1' } diff --git a/example_brush_presets_panel/src/main/java/com/photoeditorsdk/android/app/presets/BrushPresetPanel.kt b/example_brush_presets_panel/src/main/java/com/photoeditorsdk/android/app/presets/BrushPresetPanel.kt index 21e39800..b70c10e8 100644 --- a/example_brush_presets_panel/src/main/java/com/photoeditorsdk/android/app/presets/BrushPresetPanel.kt +++ b/example_brush_presets_panel/src/main/java/com/photoeditorsdk/android/app/presets/BrushPresetPanel.kt @@ -5,7 +5,7 @@ import android.animation.AnimatorListenerAdapter import android.animation.AnimatorSet import android.animation.ObjectAnimator import android.content.Context -import android.support.annotation.MainThread +import androidx.annotation.MainThread import android.view.View import com.photoeditorsdk.android.app.R import ly.img.android.pesdk.annotations.OnEvent diff --git a/example_brush_presets_panel/src/main/res/layout/imgly_popup_brush_preview.xml b/example_brush_presets_panel/src/main/res/layout/imgly_popup_brush_preview.xml index 6993f101..d547ae53 100644 --- a/example_brush_presets_panel/src/main/res/layout/imgly_popup_brush_preview.xml +++ b/example_brush_presets_panel/src/main/res/layout/imgly_popup_brush_preview.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal"> - @@ -31,7 +31,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="50"> - @@ -44,12 +44,12 @@ android:id="@+id/brushToolPreview" style="@style/Imgly.PESDK.Editor.Popup.Brush.BrushToolPreview"/> - - diff --git a/gradle.properties b/gradle.properties index 743d692c..31717048 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,3 +11,4 @@ org.gradle.jvmargs=-Xmx1536m # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.useAndroidX=true \ No newline at end of file