see 10/19 log

Blankj · Blankj · commit c1673a2c02bb · 2018-10-19T18:13:34.000+08:00
diff --git a/__bus__.json b/__bus__.json
@@ -0,0 +1 @@
+{}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1341,11 +1341,12 @@ public static void popAll(@NonNull final FragmentManager fm) {
      * @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);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id "com.android.application"`
`3`		`-// id "com.blankj.bus"`
	`3`	`+ id "com.blankj.bus"`
`4`	`4`	`}`
`5`	`5`	`// in config.gradle`
`6`	`6`	`configAndroidDomain project`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ buildscript {`
`8`	`8`
`9`	`9`	`dependencies {`
`10`	`10`	`classpath depConfig.gradle`
	`11`	`+ classpath 'com.blankj:bus-gradle-plugin:1.0'`
`11`	`12`	`// classpath depConfig.kotlin_gradle_plugin`
`12`	`13`	`}`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ plugins {`
`4`	`4`	`id "com.jfrog.bintray" version "1.8.0"`
`5`	`5`	`id "tech.harmonysoft.oss.traute" version "1.1.8"`
`6`	`6`	`id "readme-core"`
	`7`	`+// id "kotlin-android"`
`7`	`8`	`}`
`8`	`9`	`// in config.gradle`
`9`	`10`	`configAndroidDomain project`
Original file line number	Diff line number	Diff line change
`@@ -1341,11 +1341,12 @@ public static void popAll(@NonNull final FragmentManager fm) {`
`1341`	`1341`	`* @param fm The manager of fragment.`
`1342`	`1342`	`*/`
`1343`	`1343`	`public static void popAll(@NonNull final FragmentManager fm, final boolean isImmediate) {`
`1344`		`- while (fm.getBackStackEntryCount() > 0) {`
	`1344`	`+ if (fm.getBackStackEntryCount() > 0) {`
	`1345`	`+ FragmentManager.BackStackEntry entry = fm.getBackStackEntryAt(0);`
`1345`	`1346`	`if (isImmediate) {`
`1346`		`- fm.popBackStackImmediate();`
	`1347`	`+ fm.popBackStackImmediate(entry.getId(), FragmentManager.POP_BACK_STACK_INCLUSIVE);`
`1347`	`1348`	`} else {`
`1348`		`- fm.popBackStack();`
	`1349`	`+ fm.popBackStack(entry.getId(), FragmentManager.POP_BACK_STACK_INCLUSIVE);`
`1349`	`1350`	`}`
`1350`	`1351`	`}`
`1351`	`1352`	`}`