Skip to content

Commit cafad46

Browse files
authored
Merge pull request #33 from Yelp/update-deps-version
Update version of Dependencies
2 parents e607915 + 2598488 commit cafad46

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
java
88
`kotlin-dsl`
99
`maven-publish`
10-
kotlin("jvm") version "1.3.21"
10+
kotlin("jvm") version "1.3.31"
1111
id("com.gradle.plugin-publish") version "0.10.0"
1212
}
1313

samples/generated-code/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath "com.android.tools.build:gradle:3.2.1"
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21"
11+
classpath "com.android.tools.build:gradle:3.4.1"
12+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
1313
classpath "com.yelp.codegen:plugin:1.0.0"
1414
}
1515
}
@@ -30,8 +30,8 @@ android {
3030

3131
dependencies {
3232
// Kotlin
33-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21"
34-
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.21"
33+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31"
34+
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.31"
3535

3636
// Moshi
3737
implementation "com.squareup.moshi:moshi:1.8.0"
@@ -44,8 +44,8 @@ dependencies {
4444
implementation "com.jakewharton.threetenabp:threetenabp:1.1.1"
4545

4646
// RxJava
47-
implementation "io.reactivex.rxjava2:rxjava:2.2.4"
48-
implementation "io.reactivex.rxjava2:rxandroid:2.1.0"
47+
implementation "io.reactivex.rxjava2:rxjava:2.2.9"
48+
implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
4949

5050
// Testing Dependencies
5151
testImplementation "junit:junit:4.12"

samples/groovy-android/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath "com.android.tools.build:gradle:3.2.1"
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21"
11+
classpath "com.android.tools.build:gradle:3.4.1"
12+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
1313
classpath "com.yelp.codegen:plugin:1.0.0"
1414
}
1515
}
@@ -30,8 +30,8 @@ android {
3030

3131
dependencies {
3232
// Kotlin
33-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21"
34-
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.21"
33+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31"
34+
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.31"
3535

3636
// Moshi
3737
implementation "com.squareup.moshi:moshi:1.8.0"
@@ -44,8 +44,8 @@ dependencies {
4444
implementation "com.jakewharton.threetenabp:threetenabp:1.1.1"
4545

4646
// RxJava
47-
implementation "io.reactivex.rxjava2:rxjava:2.2.4"
48-
implementation "io.reactivex.rxjava2:rxandroid:2.1.0"
47+
implementation "io.reactivex.rxjava2:rxjava:2.2.9"
48+
implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
4949
}
5050

5151
generateSwagger {

samples/junit-tests/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath "com.android.tools.build:gradle:3.2.1"
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21"
11+
classpath "com.android.tools.build:gradle:3.4.1"
12+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
1313
classpath "com.yelp.codegen:plugin:1.1.0-SNAPSHOT"
1414
}
1515
}
@@ -30,8 +30,8 @@ android {
3030

3131
dependencies {
3232
// Kotlin
33-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21"
34-
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.21"
33+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31"
34+
implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.31"
3535

3636
// Moshi
3737
implementation "com.squareup.moshi:moshi:1.8.0"
@@ -44,8 +44,8 @@ dependencies {
4444
implementation "com.jakewharton.threetenabp:threetenabp:1.1.1"
4545

4646
// RxJava
47-
implementation "io.reactivex.rxjava2:rxjava:2.2.4"
48-
implementation "io.reactivex.rxjava2:rxandroid:2.1.0"
47+
implementation "io.reactivex.rxjava2:rxjava:2.2.9"
48+
implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
4949

5050
// Testing Dependencies
5151
testImplementation "junit:junit:4.12"

samples/kotlin-android/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id("com.android.library") version "3.2.1"
3-
kotlin("android") version "1.3.21"
2+
id("com.android.library") version "3.4.1"
3+
kotlin("android") version "1.3.31"
44
id("com.yelp.codegen.plugin") version "1.0.0"
55
}
66

@@ -16,8 +16,8 @@ android {
1616

1717
dependencies {
1818
// Kotlin
19-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21")
20-
implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.21")
19+
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31")
20+
implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.31")
2121

2222
// Moshi
2323
implementation("com.squareup.moshi:moshi:1.8.0")
@@ -30,8 +30,8 @@ dependencies {
3030
implementation("com.jakewharton.threetenabp:threetenabp:1.1.1")
3131

3232
// RxJava
33-
implementation("io.reactivex.rxjava2:rxjava:2.2.4")
34-
implementation("io.reactivex.rxjava2:rxandroid:2.1.0")
33+
implementation("io.reactivex.rxjava2:rxjava:2.2.9")
34+
implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
3535
}
3636

3737
generateSwagger {

0 commit comments

Comments
 (0)