Skip to content

Commit

Permalink
Upgrade Gradle and Kotlin dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
hpost committed Oct 24, 2019
1 parent c453a81 commit ccc89ce
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ It is inspired by concepts like
## Binaries
```gradle
dependencies {
implementation "cc.femto:rx-mvi:4.0.0"
implementation "cc.femto:rx-mvi:4.0.1"
}
```

Expand Down
11 changes: 6 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.gradle_version = '3.0.1'
ext.kotlin_version = '1.3.0'
ext.rxjava_version = '2.1.7'
ext.versions = [
'kotlin': '1.3.50',
'rxjava': '2.1.7'
]

repositories {
google()
jcenter()
}
dependencies {
classpath "com.android.tools.build:gradle:$gradle_version"
classpath "com.github.dcendents:android-maven-gradle-plugin:2.0"
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ 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 rx-mvi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
jcenter()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
}
}

Expand All @@ -20,8 +20,8 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 28
versionCode 8
versionName "4.0.0"
versionCode 9
versionName "4.0.1"
}
buildTypes {
release {
Expand All @@ -35,8 +35,8 @@ android {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
implementation "io.reactivex.rxjava2:rxjava:${versions.rxjava}"
}

task sourcesJar(type: Jar) {
Expand Down

0 comments on commit ccc89ce

Please sign in to comment.