Merge remote-tracking branch 'origin/master'

# Conflicts: # .idea/modules.xml
ForgetAll · Nov 1, 2017 · 165107a · 165107a
2 parents 5b48c89 + 644cc0b
commit 165107a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/LoadingDialog/build.gradle b/LoadingDialog/build.gradle
@@ -28,6 +28,4 @@ dependencies {
     })
     compile 'com.android.support:appcompat-v7:24.2.0'
     testCompile 'junit:junit:4.12'
-    compile 'io.reactivex:rxandroid:1.1.0'
-    compile 'io.reactivex:rxjava:1.1.0'
 }
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Step 1. 把这玩意加到你的build.gradle里:
 Step 2. 加上这个依赖
 
 	dependencies {
-	        compile 'com.github.ForgetAll:LoadingDialog:v1.0.3'
+	        compile 'com.github.ForgetAll:LoadingDialog:v1.0.4'
 	}
 
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -27,4 +27,6 @@ dependencies {
     compile 'com.android.support:appcompat-v7:24.2.0'
     testCompile 'junit:junit:4.12'
     compile project(':LoadingDialog')
+    compile 'io.reactivex:rxandroid:1.1.0'
+    compile 'io.reactivex:rxjava:1.1.0'
 }