Merge branch '3.x' of https://github.com/akarnokd/RxJavaInterop.git into 3.x

akarnokd · akarnokd · commit 98a97742ba42 · 2019-12-24T10:26:31.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     compile "io.reactivex.rxjava3:rxjava:3.0.0-RC6"
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile 'org.mockito:mockito-core:3.2.0'
+    testCompile 'org.mockito:mockito-core:3.2.4'
 }
 
 apply plugin: 'maven'

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ dependencies {`
`51`	`51`	`compile "io.reactivex.rxjava3:rxjava:3.0.0-RC6"`
`52`	`52`
`53`	`53`	`testCompile group: 'junit', name: 'junit', version: '4.12'`
`54`		`- testCompile 'org.mockito:mockito-core:3.2.0'`
	`54`	`+ testCompile 'org.mockito:mockito-core:3.2.4'`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`apply plugin: 'maven'`