Skip to content
This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Commit 442bde9

Browse files
authored
Merge pull request #109 from android/update-agp-4.2.1
Update MediaStore to AGP 4.2.1
2 parents a153f20 + 087f3e1 commit 442bde9

4 files changed

Lines changed: 15 additions & 16 deletions

File tree

MediaStore/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ android {
3838
versionName "1.0"
3939
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4040
}
41-
dataBinding {
42-
enabled true
41+
buildFeatures {
42+
dataBinding true
4343
}
4444
kotlinOptions {
4545
jvmTarget = "1.8"

MediaStore/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@
1818

1919
buildscript {
2020
ext {
21-
activity_ktx_version = '1.2.0-alpha03'
22-
appcompat_version = '1.1.0'
23-
constraint_layout_version = '1.1.3'
21+
activity_ktx_version = '1.2.3'
22+
appcompat_version = '1.3.0'
23+
constraint_layout_version = '2.0.4'
2424
coroutines_version = '1.2.1'
25-
espresso_version = '3.2.0'
26-
glide_version = '4.9.0'
25+
espresso_version = '3.3.0'
26+
glide_version = '4.12.0'
2727
gradleVersion = '3.4.2'
28-
junit_version = '4.12'
29-
kotlin_version = '1.3.50'
30-
material_version = '1.1.0'
28+
junit_version = '4.13.2'
29+
kotlin_version = '1.4.32'
30+
material_version = '1.3.0'
3131
navigation_version = '2.1.0-beta02'
3232
recyclerview_version = '1.1.0-beta01'
33-
test_runner_version = '1.2.0'
33+
test_runner_version = '1.3.0'
3434
vectordrawable_version = '1.1.0'
3535
}
3636
repositories {
3737
google()
38-
jcenter()
38+
mavenCentral()
3939
}
4040
dependencies {
41-
classpath 'com.android.tools.build:gradle:3.6.2'
41+
classpath 'com.android.tools.build:gradle:4.2.1'
4242
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
4343
// NOTE: Do not place your application dependencies here; they belong
4444
// in the individual module build.gradle files
@@ -48,7 +48,7 @@ buildscript {
4848
allprojects {
4949
repositories {
5050
google()
51-
jcenter()
51+
mavenCentral()
5252
}
5353
}
5454

MediaStore/gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@ android.useAndroidX=true
3535
android.enableJetifier=true
3636
# Kotlin code style for this project: "official" or "obsolete":
3737
kotlin.code.style=official
38-
android.databinding.enableV2=true

MediaStore/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME
1818
distributionPath=wrapper/dists
1919
zipStoreBase=GRADLE_USER_HOME
2020
zipStorePath=wrapper/dists
21-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
21+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

0 commit comments

Comments
 (0)