Merge remote-tracking branch 'origin/master'

ForgetAll · ForgetAll · commit 165107a74020 · 2017-11-01T11:24:14.000+08:00
# Conflicts:
#	.idea/modules.xml
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'
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,4 @@ dependencies {`
`28`	`28`	`})`
`29`	`29`	`compile 'com.android.support:appcompat-v7:24.2.0'`
`30`	`30`	`testCompile 'junit:junit:4.12'`
`31`		`- compile 'io.reactivex:rxandroid:1.1.0'`
`32`		`- compile 'io.reactivex:rxjava:1.1.0'`
`33`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ Step 1. 把这玩意加到你的build.gradle里:`
`14`	`14`	`Step 2. 加上这个依赖`
`15`	`15`
`16`	`16`	`dependencies {`
`17`		`- compile 'com.github.ForgetAll:LoadingDialog:v1.0.3'`
	`17`	`+ compile 'com.github.ForgetAll:LoadingDialog:v1.0.4'`
`18`	`18`	`}`
`19`	`19`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,6 @@ dependencies {`
`27`	`27`	`compile 'com.android.support:appcompat-v7:24.2.0'`
`28`	`28`	`testCompile 'junit:junit:4.12'`
`29`	`29`	`compile project(':LoadingDialog')`
	`30`	`+ compile 'io.reactivex:rxandroid:1.1.0'`
	`31`	`+ compile 'io.reactivex:rxjava:1.1.0'`
`30`	`32`	`}`