From 41969f6720526cbb3d78a6c3d104fac48efcbef3 Mon Sep 17 00:00:00 2001 From: Martin Sumera Date: Thu, 31 Oct 2019 17:35:21 +0100 Subject: [PATCH] Bump dependencies and RxJava to 2.12.3 --- build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- rxdebug/build.gradle | 10 +++++----- sample/build.gradle | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 6f05d0e..0f6b2ed 100644 --- a/build.gradle +++ b/build.gradle @@ -2,14 +2,14 @@ buildscript { ext.versions = [ - 'support': '27.1.0', + 'support': '27.1.1', 'robolectric': '3.7.1', 'junit': '4.12', - 'rxjava': '2.2.2', + 'rxjava': '2.2.13', 'rxschedulerrule': '1.0.2' ] - ext.kotlin_version = '1.2.30' + ext.kotlin_version = '1.3.50' ext.bintray_plugin = '1.4' ext.github_maven_plugin = '1.4.1' @@ -19,7 +19,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.5.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 26122f6..1454e1e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 04 16:59:42 CET 2018 +#Thu Oct 31 13:53:02 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/rxdebug/build.gradle b/rxdebug/build.gradle index 99be248..3a3a1e6 100644 --- a/rxdebug/build.gradle +++ b/rxdebug/build.gradle @@ -16,8 +16,8 @@ ext { siteUrl = 'https://github.com/SumeraMartin/RxDebug' gitUrl = 'https://github.com/SumeraMartin/RxDebug.git' - libraryVersion = '1.1.2' - libraryVersionCode = 6 + libraryVersion = '1.1.3' + libraryVersionCode = 7 developerId = 'sumeramartin' developerName = 'Martin Sumera' @@ -29,11 +29,11 @@ ext { } android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode libraryVersionCode versionName libraryVersion @@ -51,7 +51,7 @@ android { dependencies { implementation "io.reactivex.rxjava2:rxjava:${versions.rxjava}" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlin_version}" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}" testImplementation "com.github.Plastix.RxSchedulerRule:rx2:${versions.rxschedulerrule}" testImplementation "org.robolectric:robolectric:${versions.robolectric}" diff --git a/sample/build.gradle b/sample/build.gradle index 22f8f9e..dcdb53f 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -27,6 +27,6 @@ dependencies { implementation "io.reactivex.rxjava2:rxjava:${versions.rxjava}" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlin_version}" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}" implementation "com.android.support:appcompat-v7:${versions.support}" }