Merge branch 'master' of https://github.com/akarnokd/RxJava2Interop.git

akarnokd · akarnokd · commit 6f186fe7476f · 2019-06-24T09:36:50.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.13.1'
+        classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0'
         classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.4"
         classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.2.0'
     }
@@ -53,7 +53,7 @@ dependencies {
     compile "io.reactivex.rxjava2:rxjava:2.2.9"
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile 'org.mockito:mockito-core:2.12.0'
+    testCompile 'org.mockito:mockito-core:2.28.2'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.13.1'`
	`10`	`+ classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0'`
`11`	`11`	`classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.4"`
`12`	`12`	`classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.2.0'`
`13`	`13`	`}`
`@@ -53,7 +53,7 @@ dependencies {`
`53`	`53`	`compile "io.reactivex.rxjava2:rxjava:2.2.9"`
`54`	`54`
`55`	`55`	`testCompile group: 'junit', name: 'junit', version: '4.12'`
`56`		`- testCompile 'org.mockito:mockito-core:2.12.0'`
	`56`	`+ testCompile 'org.mockito:mockito-core:2.28.2'`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`task sourcesJar(type: Jar, dependsOn: classes) {`