Skip to content

Commit 2690e38

Browse files
committed
Update build.gradle for all Kotlin samples
Change-Id: I7df98968dae602800a2fca1a46cc0b926d82d062
1 parent 17c4f2b commit 2690e38

7 files changed

Lines changed: 11 additions & 24 deletions

File tree

‎Camera2Basic/app/build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ android {
4646
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
4747
}
4848
}
49-
50-
// Necessary for Robolectric (Unit tests)
51-
testOptions.unitTests.includeAndroidResources = true
5249
}
5350

5451
dependencies {
@@ -66,7 +63,7 @@ dependencies {
6663
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
6764

6865
// Navigation library
69-
def nav_version = '2.2.1'
66+
def nav_version = '2.2.2'
7067
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
7168
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
7269

‎Camera2Basic/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ buildscript {
2626
jcenter()
2727
}
2828
dependencies {
29-
classpath 'com.android.tools.build:gradle:3.6.2'
29+
classpath 'com.android.tools.build:gradle:3.6.3'
3030
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
31-
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.1"
31+
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.2"
3232

3333
// NOTE: Do not place your application dependencies here; they belong
3434
// in the individual module build.gradle files

‎Camera2SlowMotion/app/build.gradle‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,13 @@ android {
5757
java.srcDir sharedTestDir
5858
}
5959
}
60-
61-
// Necessary for Robolectric (Unit tests)
62-
testOptions.unitTests.includeAndroidResources = true
6360
}
6461

6562
dependencies {
6663
implementation project(':utils')
6764

6865
// Kotlin lang
69-
implementation 'androidx.core:core-ktx:1.2.0'
66+
implementation 'androidx.core:core-ktx:1.3.0'
7067
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
7168
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.4'
7269

@@ -76,7 +73,7 @@ dependencies {
7673
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
7774

7875
// Navigation library
79-
def nav_version = "2.2.1"
76+
def nav_version = "2.2.2"
8077
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
8178
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
8279

‎Camera2SlowMotion/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ buildscript {
2626
jcenter()
2727
}
2828
dependencies {
29-
classpath 'com.android.tools.build:gradle:3.6.2'
29+
classpath 'com.android.tools.build:gradle:3.6.3'
3030
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
31-
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.1"
31+
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.2"
3232

3333
// NOTE: Do not place your application dependencies here; they belong
3434
// in the individual module build.gradle files

‎CameraUtils/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ buildscript {
2626
jcenter()
2727
}
2828
dependencies {
29-
classpath 'com.android.tools.build:gradle:3.6.1'
29+
classpath 'com.android.tools.build:gradle:3.6.3'
3030
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
3131

3232
// NOTE: Do not place your application dependencies here; they belong

‎CameraXBasic/app/build.gradle‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,13 @@ android {
4646
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
4747
}
4848
}
49-
50-
// Necessary for Robolectric (Unit tests)
51-
testOptions {
52-
unitTests {
53-
includeAndroidResources = true
54-
}
55-
}
5649
}
5750

5851
dependencies {
5952
// Kotlin lang
6053
implementation 'androidx.core:core-ktx:1.3.0'
6154
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
62-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
55+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.4'
6356

6457
// App compat and UI things
6558
implementation 'androidx.appcompat:appcompat:1.1.0'

‎CameraXBasic/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ buildscript {
2626
jcenter()
2727
}
2828
dependencies {
29-
classpath 'com.android.tools.build:gradle:4.0.0'
29+
classpath 'com.android.tools.build:gradle:3.6.3'
3030
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
31-
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.1"
31+
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.2"
3232

3333
// NOTE: Do not place your application dependencies here; they belong
3434
// in the individual module build.gradle files

0 commit comments

Comments
 (0)