Skip to content

Commit

Permalink
Merge pull request #28 from SumeraMartin/feature/bump-dependencies-nu…
Browse files Browse the repository at this point in the history
…mber

Bump dependencies and RxJava to 2.12.3
  • Loading branch information
SumeraMartin authored Oct 31, 2019
2 parents 2daf35d + 41969f6 commit 61ef2e4
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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"
}
}
Expand Down
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 @@
#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
10 changes: 5 additions & 5 deletions rxdebug/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -29,11 +29,11 @@ ext {
}

android {
compileSdkVersion 27
compileSdkVersion 28

defaultConfig {
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 28
versionCode libraryVersionCode
versionName libraryVersion

Expand All @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}

0 comments on commit 61ef2e4

Please sign in to comment.