Skip to content

Commit

Permalink
Upgrade to RxJava 1.3.3 & Gradle 4.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
akarnokd committed Oct 20, 2017
1 parent a7204da commit d88dbd9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Library to convert between RxJava 1.x and 2.x reactive types.

```
dependencies {
compile "com.github.akarnokd:rxjava2-interop:0.10.7"
compile "com.github.akarnokd:rxjava2-interop:0.10.8"
}
```

Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ buildscript {

dependencies {
classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.13.1'
classpath "me.champeau.gradle:jmh-gradle-plugin:0.2.0"
classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.1.0'
classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.4"
classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.2.0'
}
}

Expand Down Expand Up @@ -49,7 +49,7 @@ dependencies {
signature 'org.codehaus.mojo.signature:java16:1.1@signature'

compile "org.reactivestreams:reactive-streams:1.0.1"
compile "io.reactivex:rxjava:1.3.2"
compile "io.reactivex:rxjava:1.3.3"
compile "io.reactivex.rxjava2:rxjava:2.1.5"

testCompile group: 'junit', name: 'junit', version: '4.12'
Expand Down Expand Up @@ -107,7 +107,7 @@ publishing {
}

jmh {
jmhVersion = '1.16'
jmhVersion = '1.19'
humanOutputFile = null
if (project.hasProperty('jmh')) {
include = ".*" + project.jmh + ".*"
Expand Down Expand Up @@ -141,7 +141,7 @@ license {
}

jacoco {
toolVersion = '0.7.7.201606060606' // See http://www.eclemma.org/jacoco/.
toolVersion = '0.7.9' // See http://www.eclemma.org/jacoco/.
}

jacocoTestReport {
Expand Down Expand Up @@ -170,7 +170,7 @@ pmdMain {
}
}

task pmdPrint(dependsOn: 'pmdMain') << {
task pmdPrint(dependsOn: 'pmdMain') doLast {
File file = rootProject.file('build/reports/pmd/main.xml')
if (file.exists()) {

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=0.10.7
version=0.10.8
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jul 05 21:36:15 CEST 2016
#Fri Oct 20 09:29:43 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip

0 comments on commit d88dbd9

Please sign in to comment.