diff --git a/FishBun/build.gradle b/FishBun/build.gradle index d764cbe6..b2c886a0 100644 --- a/FishBun/build.gradle +++ b/FishBun/build.gradle @@ -38,10 +38,10 @@ apply plugin: 'co.riiid.gradle' apply from: '../gradle/release.gradle' dependencies { - compileOnly "com.android.support:appcompat-v7:$rootProject.support_version" - compile "com.android.support.constraint:constraint-layout:$rootProject.constraint_version" - compile "com.android.support:design:$rootProject.support_version" - compile "com.android.support:recyclerview-v7:$rootProject.support_version" + compileOnly "androidx.appcompat:appcompat:$rootProject.androidx_version" + compile "androidx.constraintlayout:constraintlayout:$rootProject.constraint_version" + compile "com.google.android.material:material:$rootProject.material_version" + compile "androidx.recyclerview:recyclerview:$rootProject.androidx_version" testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.8.9' diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/BaseActivity.java b/FishBun/src/main/java/com/sangcomz/fishbun/BaseActivity.java index 1a04d52f..d3f40de6 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/BaseActivity.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/BaseActivity.java @@ -2,7 +2,7 @@ import android.os.Build; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.Window; import com.sangcomz.fishbun.define.Define; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/BaseFragment.java b/FishBun/src/main/java/com/sangcomz/fishbun/BaseFragment.java index c2f235b1..eec649ca 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/BaseFragment.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/BaseFragment.java @@ -1,8 +1,8 @@ package com.sangcomz.fishbun; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/FishBun.java b/FishBun/src/main/java/com/sangcomz/fishbun/FishBun.java index 89042f2c..e80454ff 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/FishBun.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/FishBun.java @@ -1,7 +1,7 @@ package com.sangcomz.fishbun; import android.app.Activity; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.sangcomz.fishbun.adapter.image.ImageAdapter; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/FishBunCreator.java b/FishBun/src/main/java/com/sangcomz/fishbun/FishBunCreator.java index 5c200cab..a252e4d1 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/FishBunCreator.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/FishBunCreator.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.sangcomz.fishbun.bean.Album; import com.sangcomz.fishbun.define.Define; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/FishBunFileProvider.java b/FishBun/src/main/java/com/sangcomz/fishbun/FishBunFileProvider.java index b9da89cc..ffda57ef 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/FishBunFileProvider.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/FishBunFileProvider.java @@ -1,6 +1,6 @@ package com.sangcomz.fishbun; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; public class FishBunFileProvider extends FileProvider { diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/AlbumListAdapter.java b/FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/AlbumListAdapter.java index 866d1f3d..c0870093 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/AlbumListAdapter.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/AlbumListAdapter.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/DetailViewPagerAdapter.java b/FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/DetailViewPagerAdapter.java index 3241ae8f..b95ed4ac 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/DetailViewPagerAdapter.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/DetailViewPagerAdapter.java @@ -1,10 +1,10 @@ package com.sangcomz.fishbun.adapter.view; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.constraint.ConstraintLayout; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/PickerGridAdapter.java b/FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/PickerGridAdapter.java index 9a190a62..e5960bd1 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/PickerGridAdapter.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/adapter/view/PickerGridAdapter.java @@ -4,10 +4,10 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.RecyclerView; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/permission/PermissionCheck.java b/FishBun/src/main/java/com/sangcomz/fishbun/permission/PermissionCheck.java index 3c057fd4..f46cfcf6 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/permission/PermissionCheck.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/permission/PermissionCheck.java @@ -6,8 +6,8 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Build; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.widget.Toast; import com.sangcomz.fishbun.R; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/album/AlbumActivity.java b/FishBun/src/main/java/com/sangcomz/fishbun/ui/album/AlbumActivity.java index 67709e6f..bad7a41f 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/ui/album/AlbumActivity.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/ui/album/AlbumActivity.java @@ -6,11 +6,11 @@ import android.os.Build; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/DetailActivity.java b/FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/DetailActivity.java index 3052b83b..a1d7cafd 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/DetailActivity.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/ui/detail/DetailActivity.java @@ -4,9 +4,9 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.ViewPager; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; +import androidx.viewpager.widget.ViewPager; import android.view.View; import android.view.Window; import android.widget.ImageButton; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerActivity.java b/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerActivity.java index e1079c0e..583d2cab 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerActivity.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerActivity.java @@ -5,11 +5,11 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.ActionBar; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerController.java b/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerController.java index f03c404b..2cfeb929 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerController.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/ui/picker/PickerController.java @@ -8,7 +8,7 @@ import android.os.Build; import android.os.Environment; import android.provider.MediaStore; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.sangcomz.fishbun.permission.PermissionCheck; import com.sangcomz.fishbun.util.CameraUtil; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/util/CameraUtil.java b/FishBun/src/main/java/com/sangcomz/fishbun/util/CameraUtil.java index 9669d96e..8cb888a9 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/util/CameraUtil.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/util/CameraUtil.java @@ -5,7 +5,7 @@ import android.net.Uri; import android.os.Build; import android.provider.MediaStore; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; import com.sangcomz.fishbun.define.Define; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/util/CustomPagerSnapHelper.java b/FishBun/src/main/java/com/sangcomz/fishbun/util/CustomPagerSnapHelper.java index 37e03362..496254ca 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/util/CustomPagerSnapHelper.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/util/CustomPagerSnapHelper.java @@ -1,7 +1,7 @@ package com.sangcomz.fishbun.util; -import android.support.v7.widget.PagerSnapHelper; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.PagerSnapHelper; +import androidx.recyclerview.widget.RecyclerView; /** * Created by sangcomz on 11/06/2017. diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/util/RadioWithTextButton.java b/FishBun/src/main/java/com/sangcomz/fishbun/util/RadioWithTextButton.java index 2c560de8..01a1e8e8 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/util/RadioWithTextButton.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/util/RadioWithTextButton.java @@ -6,7 +6,7 @@ import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.util.TypedValue; import android.view.View; diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/util/SquareFrameLayout.java b/FishBun/src/main/java/com/sangcomz/fishbun/util/SquareFrameLayout.java index 9ba0c0f6..0a573a78 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/util/SquareFrameLayout.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/util/SquareFrameLayout.java @@ -6,7 +6,7 @@ /** * Created by sangc on 2015-12-26. */ -public class SquareFrameLayout extends android.support.v7.widget.ContentFrameLayout { +public class SquareFrameLayout extends androidx.appcompat.widget.ContentFrameLayout { public SquareFrameLayout(Context context) { super(context); } diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/util/SquareImageView.java b/FishBun/src/main/java/com/sangcomz/fishbun/util/SquareImageView.java index 272ee95c..07c3edd3 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/util/SquareImageView.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/util/SquareImageView.java @@ -6,7 +6,7 @@ /** * Created by sangc on 2015-12-26. */ -public class SquareImageView extends android.support.v7.widget.AppCompatImageView { +public class SquareImageView extends androidx.appcompat.widget.AppCompatImageView { public SquareImageView(Context context) { super(context); } diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/util/TouchImageView.java b/FishBun/src/main/java/com/sangcomz/fishbun/util/TouchImageView.java index c42ccdb0..6d6e6c31 100644 --- a/FishBun/src/main/java/com/sangcomz/fishbun/util/TouchImageView.java +++ b/FishBun/src/main/java/com/sangcomz/fishbun/util/TouchImageView.java @@ -36,7 +36,7 @@ import android.widget.OverScroller; import android.widget.Scroller; -public class TouchImageView extends android.support.v7.widget.AppCompatImageView { +public class TouchImageView extends androidx.appcompat.widget.AppCompatImageView { private static final String DEBUG = "DEBUG"; diff --git a/FishBun/src/main/res/layout/activity_detail_actiivy.xml b/FishBun/src/main/res/layout/activity_detail_actiivy.xml index 1e5b503f..509189c8 100644 --- a/FishBun/src/main/res/layout/activity_detail_actiivy.xml +++ b/FishBun/src/main/res/layout/activity_detail_actiivy.xml @@ -1,5 +1,5 @@ - - - - + diff --git a/FishBun/src/main/res/layout/activity_photo_album.xml b/FishBun/src/main/res/layout/activity_photo_album.xml index c7d59d68..4e8fa87b 100644 --- a/FishBun/src/main/res/layout/activity_photo_album.xml +++ b/FishBun/src/main/res/layout/activity_photo_album.xml @@ -1,30 +1,30 @@ - - - - - + - + diff --git a/FishBun/src/main/res/layout/activity_photo_picker.xml b/FishBun/src/main/res/layout/activity_photo_picker.xml index f2376970..90dff552 100644 --- a/FishBun/src/main/res/layout/activity_photo_picker.xml +++ b/FishBun/src/main/res/layout/activity_photo_picker.xml @@ -1,29 +1,29 @@ - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/FishBun/src/main/res/layout/detail_item.xml b/FishBun/src/main/res/layout/detail_item.xml index 7f115b8b..e3940d8b 100644 --- a/FishBun/src/main/res/layout/detail_item.xml +++ b/FishBun/src/main/res/layout/detail_item.xml @@ -1,5 +1,5 @@ - @@ -17,4 +17,4 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.5" /> - \ No newline at end of file + \ No newline at end of file diff --git a/FishBunDemo/build.gradle b/FishBunDemo/build.gradle index 08edc3da..bfeb49f9 100644 --- a/FishBunDemo/build.gradle +++ b/FishBunDemo/build.gradle @@ -57,13 +57,13 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':FishBun') - implementation "com.android.support:appcompat-v7:$rootProject.support_version" - implementation "com.android.support:recyclerview-v7:$rootProject.support_version" + implementation "androidx.appcompat:appcompat:$rootProject.androidx_version" + implementation "androidx.recyclerview:recyclerview:$rootProject.androidx_version" debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2' releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2' - implementation "com.android.support:support-v4:$rootProject.support_version" + implementation "androidx.legacy:legacy-support-v4:$rootProject.androidx_version" implementation "com.squareup.picasso:picasso:$rootProject.picasso_version" implementation "com.github.bumptech.glide:glide:$rootProject.glide_version" } diff --git a/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/ImageAdapter.java b/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/ImageAdapter.java index d56c21dd..9fd790df 100644 --- a/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/ImageAdapter.java +++ b/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/ImageAdapter.java @@ -2,7 +2,7 @@ import android.content.Context; import android.net.Uri; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/MainActivity.java b/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/MainActivity.java index b3abae6a..f86ea186 100644 --- a/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/MainActivity.java +++ b/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/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.Button; diff --git a/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/SubFragment.java b/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/SubFragment.java index 87047110..b57c1b82 100644 --- a/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/SubFragment.java +++ b/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/SubFragment.java @@ -5,9 +5,9 @@ import android.graphics.Color; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/WithActivityActivity.java b/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/WithActivityActivity.java index 866e9287..1512fda4 100644 --- a/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/WithActivityActivity.java +++ b/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/WithActivityActivity.java @@ -4,17 +4,16 @@ import android.graphics.Color; import android.net.Uri; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.widget.ImageView; import com.sangcomz.fishbun.FishBun; -import com.sangcomz.fishbun.FishBunCreator; import com.sangcomz.fishbun.adapter.image.impl.GlideAdapter; import com.sangcomz.fishbun.adapter.image.impl.PicassoAdapter; import com.sangcomz.fishbun.define.Define; diff --git a/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/WithFragmentActivity.java b/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/WithFragmentActivity.java index 650f8b0d..c04aa7f0 100644 --- a/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/WithFragmentActivity.java +++ b/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/WithFragmentActivity.java @@ -1,6 +1,6 @@ package com.sangcomz.fishbundemo; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.widget.RelativeLayout; diff --git a/FishBunDemo/src/main/res/layout/activity_main.xml b/FishBunDemo/src/main/res/layout/activity_main.xml index 714e3f42..eb77ee80 100644 --- a/FishBunDemo/src/main/res/layout/activity_main.xml +++ b/FishBunDemo/src/main/res/layout/activity_main.xml @@ -10,7 +10,7 @@ android:paddingTop="@dimen/activity_vertical_margin" tools:context="com.sangcomz.fishbundemo.MainActivity"> - - - - - - diff --git a/README.md b/README.md index dc6ae6b5..351c5c9a 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ _FishBun_ is a highly customizable image picker for Android. -## What's New in _FishBun_ 0.9.1? +## What's New in _FishBun_ 0.10.0? -- Use custom file provider to avoid collision with other plugins ([#151](https://github.com/sangcomz/FishBun/pull/151)) +- Migrate to AndroidX @@ -104,6 +104,7 @@ FishBun.with(WithActivityActivity.this) ## How to Setup +Fishbun 0.10.0 and above only supports projects that have been migrated to [androidx](https://developer.android.com/jetpack/androidx/). For more information, read Google's [migration guide](https://developer.android.com/jetpack/androidx/migrate). Setting up _FishBun_ requires to add this Gradle configuration: @@ -113,21 +114,21 @@ Setting up _FishBun_ requires to add this Gradle configuration: dependencies { // Under the Android Plugin 3.0.0. - compile 'com.sangcomz:FishBun:0.9.1' + compile 'com.sangcomz:FishBun:0.10.0' compile 'com.squareup.picasso:picasso:2.71828' or compile 'com.github.bumptech.glide:glide:4.9.0' // Android plugin 3.0.0 or higher. - implementation 'com.sangcomz:FishBun:0.9.1' + implementation 'com.sangcomz:FishBun:0.10.0' implementation 'com.squareup.picasso:picasso:2.71828' or implementation 'com.github.bumptech.glide:glide:4.9.0' } - + and to allow the following permissions in your `Manifest`: diff --git a/build.gradle b/build.gradle index 8e25576d..60334d15 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,8 @@ buildscript { ext { - support_version = '28.0.0' + androidx_version = '1.0.0' + material_version = '1.0.0' picasso_version = '2.71828' glide_version = '4.9.0' constraint_version = '1.1.3' diff --git a/gradle.properties b/gradle.properties index a5b6b0e4..23b3308a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,3 +12,5 @@ # 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.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/release.gradle b/gradle/release.gradle index 9bfd71fc..713c9692 100644 --- a/gradle/release.gradle +++ b/gradle/release.gradle @@ -99,8 +99,8 @@ if (project.rootProject.file('local.properties').isFile()) { tagName = version targetCommitish = 'master' body = """## Release Note -* Fix Bug (#138, #137) -* Update Glide / Picasso (#139) """ +* Migrate to AndroidX +""" name = version } } diff --git a/settings.gradle b/settings.gradle index 6098b6ec..ab5ec128 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,7 @@ include ':FishBunDemo', ':FishBun' -gradle.ext.versionCode = 24 -gradle.ext.versionName = '0.9.1' +gradle.ext.versionCode = 25 +gradle.ext.versionName = '0.10.0' gradle.ext.set('minSdk', 15) gradle.ext.set('targetSdk', 28)