Merge pull request #113 from ParkSangGwon/feature/version-update-with-targetSdkVersion

Author: ted-prnd

app/build.gradle

@@ -42,8 +42,7 @@ dependencies {
     implementation deps.androidx.appcompat
     implementation 'com.android.support:multidex:1.0.3'
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
-    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 
     implementation deps.glide.glide
     annotationProcessor deps.glide.annotation

app/src/main/java/gun0912/tedimagepicker/sample/MyApplication.kt

@@ -3,21 +3,10 @@ package gun0912.tedimagepicker.sample
 
 import androidx.multidex.MultiDexApplication
 
-import com.squareup.leakcanary.LeakCanary
-
 class MyApplication : MultiDexApplication() {
 
     override fun onCreate() {
         super.onCreate()
-        setLeakCanary()
     }
 
-    private fun setLeakCanary() {
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return
-        }
-        LeakCanary.install(this)
-    }
 }

dependencies.gradle

@@ -1,11 +1,10 @@
 ext {
     versions = [
             'minSdkVersion'    : 17,
-            'compileSdkVersion': 30,
-            'targetSdkVersion' : 30,
-            'gradle'           : '7.0.2',
-            'kotlin'           : '1.5.30',
-            'supportLibrary'   : '25.0.0',
+            'compileSdkVersion': 33,
+            'targetSdkVersion' : 33,
+            'gradle'           : '7.2.0',
+            'kotlin'           : '1.7.0',
     ]
 
     deps = [

gradle.properties

@@ -21,7 +21,7 @@ kotlin.code.style=official
 
 GROUP=io.github.ParkSangGwon
 POM_ARTIFACT_ID=tedimagepicker
-VERSION_NAME=1.2.8
+VERSION_NAME=1.3.2
 
 POM_NAME=TedImagePicker
 POM_PACKAGING=aar

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-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip

tedimagepicker/src/main/AndroidManifest.xml

@@ -1,11 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
     package="gun0912.tedimagepicker">
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28"
-        tools:ignore="ScopedStorage" />
+        android:maxSdkVersion="28" />
 
     <queries>
         <intent>

tedimagepicker/src/main/java/gun0912/tedimagepicker/builder/TedImagePickerBaseBuilder.kt

@@ -97,25 +97,24 @@ open class TedImagePickerBaseBuilder<out B : TedImagePickerBaseBuilder<B>>(
 
     @SuppressLint("CheckResult")
     protected fun startInternal(context: Context) {
-        checkPermission(context)
+        checkPermission()
             .subscribe({ permissionResult ->
                 if (permissionResult.isGranted) {
                     startActivity(context)
                 }
             }, { throwable -> onErrorListener?.onError(throwable) })
     }
 
-    private fun checkPermission(context: Context): Single<TedPermissionResult> {
-        val permissions = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-            arrayOf(
-                Manifest.permission.READ_EXTERNAL_STORAGE,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            )
+    private fun checkPermission(): Single<TedPermissionResult> {
+        val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            Manifest.permission.READ_MEDIA_IMAGES
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            Manifest.permission.READ_EXTERNAL_STORAGE
         } else {
-            arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE)
+            Manifest.permission.WRITE_EXTERNAL_STORAGE
         }
         return TedPermission.create()
-            .setPermissions(*permissions)
+            .setPermissions(permission)
             .request()
     }