update dependencies, to fix camera for targetAPI>=24

Zhengfa DANG · Zhengfa DANG · commit d9408189df13 · 2018-11-30T10:34:07.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-apply plugin: 'com.github.ben-manes.versions'
+apply plugin: "com.github.ben-manes.versions"
 
 buildscript {
     repositories {
         jcenter()
+        google()
+
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -17,9 +19,23 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+ext {
+    minSdkVersion = 17
+    targetSdkVersion = 24
+    compileSdkVersion = 26
+    // https://developer.android.com/studio/releases/build-tools
+    buildToolsVersion = '28.0.3'
+    FRESCO_VERSION = '1.11.0'
+    // https://developer.android.com/topic/libraries/support-library/revisions
+    SUPPORT_LIBRARY_VERSION = '27.1.1'
+    RXJAVA2_VERSION = '2.2.3'
+    RXANDROID2_VERSION = '2.1.0'
+}
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         applicationId "com.zfdang.multipleimagesselector"
-        minSdkVersion 15
-        targetSdkVersion 23
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
         versionCode 1
         versionName "1.0"
     }
@@ -20,11 +20,20 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'com.android.support:design:23.3.0'
-    compile 'com.android.support:support-v4:23.3.0'
-    compile 'com.android.support:recyclerview-v7:23.3.0'
-    compile project(':multiple-images-selector')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
+    implementation "com.android.support:appcompat-v7:$rootProject.SUPPORT_LIBRARY_VERSION"
+    implementation "com.android.support:design:$rootProject.SUPPORT_LIBRARY_VERSION"
+    implementation "com.android.support:support-v4:$rootProject.SUPPORT_LIBRARY_VERSION"
+    implementation "com.android.support:recyclerview-v7:$rootProject.SUPPORT_LIBRARY_VERSION"
+    implementation project(':multiple-images-selector')
+
+    // Fresco
+    implementation "com.facebook.fresco:fresco:$rootProject.FRESCO_VERSION"
+    // For animated GIF support
+    implementation "com.facebook.fresco:animated-gif:$rootProject.FRESCO_VERSION"
+    // For WebP support, including animated WebP
+    implementation "com.facebook.fresco:webpsupport:$rootProject.FRESCO_VERSION"
+    implementation "com.facebook.fresco:animated-webp:$rootProject.FRESCO_VERSION"
+
 }
diff --git a/demo/src/main/java/com/zfdang/demo/DemoApplication.java b/demo/src/main/java/com/zfdang/demo/DemoApplication.java
@@ -4,6 +4,7 @@
 
 import com.facebook.drawee.backends.pipeline.Fresco;
 
+
 /**
  * Created by zfdang on 2016-4-15.
  */
diff --git 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-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/multiple-images-selector/build.gradle b/multiple-images-selector/build.gradle
@@ -3,16 +3,16 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'com.zfdang.multiple-images-selector'
     PUBLISH_ARTIFACT_ID = 'multiple-images-selector'
-    PUBLISH_VERSION = '1.1.3'
+    PUBLISH_VERSION = '1.1.5'
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 23
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
         versionCode 1
         versionName "1.0"
     }
@@ -25,22 +25,25 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'com.android.support:recyclerview-v7:23.3.0'
-    compile 'com.android.support:support-v4:23.3.0'
-    compile 'io.reactivex:rxjava:1.1.3'
-    compile 'io.reactivex:rxandroid:1.1.0'
-
-    compile 'com.facebook.fresco:fresco:0.10.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
+    implementation "com.android.support:appcompat-v7:$rootProject.SUPPORT_LIBRARY_VERSION"
+    implementation "com.android.support:recyclerview-v7:$rootProject.SUPPORT_LIBRARY_VERSION"
+    implementation "com.android.support:support-v4:$rootProject.SUPPORT_LIBRARY_VERSION"
+    implementation "io.reactivex.rxjava2:rxjava:$rootProject.RXJAVA2_VERSION"
+    implementation "io.reactivex.rxjava2:rxandroid:$rootProject.RXANDROID2_VERSION"
+
+
+    // Fresco
+    implementation "com.facebook.fresco:fresco:$rootProject.FRESCO_VERSION"
     // For animated GIF support
-    compile 'com.facebook.fresco:animated-gif:0.10.0'
+    implementation "com.facebook.fresco:animated-gif:$rootProject.FRESCO_VERSION"
     // For WebP support, including animated WebP
-    compile 'com.facebook.fresco:animated-webp:0.10.0'
-    compile 'com.facebook.fresco:webpsupport:0.10.0'
+    implementation "com.facebook.fresco:webpsupport:$rootProject.FRESCO_VERSION"
+    implementation "com.facebook.fresco:animated-webp:$rootProject.FRESCO_VERSION"
+
 
-    compile 'xyz.danoz:recyclerviewfastscroller:0.1.3'
+    implementation 'xyz.danoz:recyclerviewfastscroller:0.1.3'
 }
 
 // https://github.com/blundell/release-android-library
diff --git a/multiple-images-selector/src/main/java/com/zfdang/multiple_images_selector/ImagesSelectorActivity.java b/multiple-images-selector/src/main/java/com/zfdang/multiple_images_selector/ImagesSelectorActivity.java
@@ -9,6 +9,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.StrictMode;
 import android.provider.MediaStore;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
@@ -33,16 +34,22 @@
 import com.zfdang.multiple_images_selector.utilities.FileUtils;
 import com.zfdang.multiple_images_selector.utilities.StringUtils;
 
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import rx.Observable;
-import rx.Subscriber;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Func1;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Function;
+import io.reactivex.internal.operators.observable.ObserverResourceWrapper;
+import io.reactivex.schedulers.Schedulers;
 import xyz.danoz.recyclerviewfastscroller.vertical.VerticalRecyclerViewFastScroller;
 
 public class ImagesSelectorActivity extends AppCompatActivity
@@ -96,6 +103,10 @@ protected void onCreate(Bundle savedInstanceState) {
             ImageListContent.SELECTED_IMAGES.addAll(selected);
         }
 
+        // https://stackoverflow.com/questions/41144898/android-camera-intent-fileuriexposedexception-for-sdk-24
+        StrictMode.VmPolicy.Builder newbuilder = new StrictMode.VmPolicy.Builder();
+        StrictMode.setVmPolicy(newbuilder.build());
+
         // initialize widgets in custom actionbar
         mButtonBack = (ImageView) findViewById(R.id.selector_button_back);
         mButtonBack.setOnClickListener(this);
@@ -222,10 +233,11 @@ public void onRequestPermissionsResult(int requestCode, String permissions[], in
     // this method is to load images and folders for all
     public void LoadFolderAndImages() {
         Log.d(TAG, "Load Folder And Images...");
+
         Observable.just("")
-                .flatMap(new Func1<String, Observable<ImageItem>>() {
+                .flatMap(new Function<String, Observable<ImageItem>>() {
                     @Override
-                    public Observable<ImageItem> call(String folder) {
+                    public Observable<ImageItem> apply(String folder) throws Exception {
                         List<ImageItem> results = new ArrayList<>();
 
                         Uri contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
@@ -282,19 +294,15 @@ public Observable<ImageItem> call(String folder) {
                             } while (cursor.moveToNext());
                             cursor.close();
                         } // } else if (cursor.moveToFirst()) {
-                        return Observable.from(results);
+                        return Observable.fromIterable(results);
                     }
                 })
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Subscriber<ImageItem>() {
+                .subscribe(new Observer<ImageItem>() {
                     @Override
-                    public void onCompleted() {
-                    }
+                    public void onSubscribe(Disposable d) {
 
-                    @Override
-                    public void onError(Throwable e) {
-                        Log.d(TAG, "onError: " + Log.getStackTraceString(e));
                     }
 
                     @Override
@@ -303,6 +311,16 @@ public void onNext(ImageItem imageItem) {
                         ImageListContent.addItem(imageItem);
                         recyclerView.getAdapter().notifyItemChanged(ImageListContent.IMAGES.size()-1);
                     }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        Log.d(TAG, "onError: " + Log.getStackTraceString(e));
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
                 });
     }
 
