Skip to content

Commit aadd50d

Browse files
committed
Merge pull request #4 from googlesamples:update_kotlin_1_4
PiperOrigin-RevId: 343545647
2 parents baa5c0f + b452179 commit aadd50d

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.idea
2+
.gradle
3+
local.properties
4+
build
5+
capture

app/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ android {
4949
dependencies {
5050
implementation fileTree(dir: "libs", include: ["*.jar"])
5151
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
52-
implementation 'androidx.core:core-ktx:1.3.1'
52+
implementation 'androidx.core:core-ktx:1.3.2'
5353
implementation 'androidx.appcompat:appcompat:1.2.0'
5454
implementation 'com.google.android.material:material:1.2.0'
5555
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
5656
implementation 'com.google.android.gms:play-services-tasks:17.2.0'
5757
// Coroutines dependencies
58-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
59-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
58+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1'
59+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
6060
// Lifecycle library
6161
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
6262

@@ -65,9 +65,10 @@ dependencies {
6565
// Source: https://github.com/ashdavies/rx-tasks
6666
implementation 'io.ashdavies.rx.rxtasks:rx-tasks:2.2.0'
6767
// [END rx_gradle]
68+
implementation "org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlin_version"
6869
// [START ktx_gradle]
6970
// Source: https://github.com/Kotlin/kotlinx.coroutines/tree/master/integration/kotlinx-coroutines-play-services
70-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.9'
71+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.4.1'
7172
// [END ktx_gradle]
7273
// [START guava_gradle]
7374
implementation "androidx.concurrent:concurrent-futures:1.1.0"

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
*/
1515
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1616
buildscript {
17-
ext.kotlin_version = "1.3.72"
17+
ext.kotlin_version = "1.4.10"
1818
repositories {
1919
google()
2020
jcenter()
2121
}
2222
dependencies {
23-
classpath "com.android.tools.build:gradle:4.0.1"
23+
classpath "com.android.tools.build:gradle:4.1.1"
2424
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2525

2626
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Aug 14 10:59:44 CDT 2020
1+
#Fri Nov 20 09:11:31 CST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

0 commit comments

Comments
 (0)