From c1673a2c02bb6bd841342310b06a958bc59a2ac2 Mon Sep 17 00:00:00 2001
From: Blankj <625783482@qq.com>
Date: Fri, 19 Oct 2018 18:13:34 +0800
Subject: [PATCH] see 10/19 log

---
 __bus__.json                                               | 1 +
 app/build.gradle                                           | 2 +-
 build.gradle                                               | 1 +
 config.gradle                                              | 6 +++---
 utilcode/build.gradle                                      | 1 +
 .../main/java/com/blankj/utilcode/util/FragmentUtils.java  | 7 ++++---
 6 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 __bus__.json

diff --git a/__bus__.json b/__bus__.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/__bus__.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index e1d8717b..a09ef95a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "com.android.application"
-//    id "com.blankj.bus"
+    id "com.blankj.bus"
 }
 // in config.gradle
 configAndroidDomain project
diff --git a/build.gradle b/build.gradle
index 2965e8c2..c96664ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,7 @@ buildscript {
 
     dependencies {
         classpath depConfig.gradle
+        classpath 'com.blankj:bus-gradle-plugin:1.0'
 //        classpath depConfig.kotlin_gradle_plugin
     }
 }
diff --git a/config.gradle b/config.gradle
index b69a2d96..faa30c54 100644
--- a/config.gradle
+++ b/config.gradle
@@ -12,8 +12,8 @@ ext {
 
     versionConfig = [
             // plugin
-            gradle       : '3.2.0',
-            kotlin       : '1.2.30',
+            gradle       : '3.2.1',
+            kotlin       : '1.2.71',
             // lib
             support      : '27.1.1',
             constraint   : '1.0.2',
@@ -37,7 +37,7 @@ ext {
                     design      : "com.android.support:design:$versionConfig.support",
             ],
             constraint          : "com.android.support.constraint:constraint-layout:$versionConfig.constraint",
-            kotlin_stdlib_jdk7  : "org.jetbrains.kotlin:kotlin-stdlib-jdk7",
+            kotlin_stdlib_jdk7  : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versionConfig.kotlin",
             leakcanary          : [
                     android      : "com.squareup.leakcanary:leakcanary-android:$versionConfig.leakcanary",
                     android_no_op: "com.squareup.leakcanary:leakcanary-android-no-op:$versionConfig.leakcanary",
diff --git a/utilcode/build.gradle b/utilcode/build.gradle
index 3f208f18..43e8b077 100644
--- a/utilcode/build.gradle
+++ b/utilcode/build.gradle
@@ -4,6 +4,7 @@ plugins {
     id "com.jfrog.bintray" version "1.8.0"
     id "tech.harmonysoft.oss.traute" version "1.1.8"
     id "readme-core"
+//    id "kotlin-android"
 }
 // in config.gradle
 configAndroidDomain project
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
index 2deff92c..c8888f6b 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
@@ -1341,11 +1341,12 @@ public final class FragmentUtils {
      * @param fm The manager of fragment.
      */
     public static void popAll(@NonNull final FragmentManager fm, final boolean isImmediate) {
-        while (fm.getBackStackEntryCount() > 0) {
+        if (fm.getBackStackEntryCount() > 0) {
+            FragmentManager.BackStackEntry entry = fm.getBackStackEntryAt(0);
             if (isImmediate) {
-                fm.popBackStackImmediate();
+                fm.popBackStackImmediate(entry.getId(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
             } else {
-                fm.popBackStack();
+                fm.popBackStack(entry.getId(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
             }
         }
     }
-- 
GitLab