summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-08-11 20:23:56 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-08-11 20:23:56 +0000
commit7f40ded4f771084a55f12d177abbc38c8463a954 (patch)
tree846a5dabf35daa642977005114cc316d55bae7f2
parent371c692acad0468870c1e193c2586d9751ee68cf (diff)
parent2dd2136888b7da1112473fef4106da56b0d51565 (diff)
downloaddata-binding-studio-2022.1.1-canary.tar.gz
Snap for 8934313 from 2dd2136888b7da1112473fef4106da56b0d51565 to studio-ee-releasestudio-2022.1.1-canarystudio-2022.1.1-beta2studio-canarystudio-2022.1.1-canary
Change-Id: Ia60aae313b77f1db3ecd7e9ddd059a4a412fe039
-rw-r--r--compilationTests/BUILD.bazel12
-rw-r--r--integration-tests-support/TestApp/app/build.gradle4
-rw-r--r--integration-tests/TestApp/app/build.gradle4
3 files changed, 8 insertions, 12 deletions
diff --git a/compilationTests/BUILD.bazel b/compilationTests/BUILD.bazel
index 13007f2f..f7c6c741 100644
--- a/compilationTests/BUILD.bazel
+++ b/compilationTests/BUILD.bazel
@@ -52,13 +52,13 @@ maven_repository(
"@maven//:android.arch.navigation.navigation-fragment_1.0.0",
"@maven//:android.arch.navigation.navigation-ui_1.0.0",
"@maven//:android.arch.persistence.room.runtime_1.0.0",
- "@maven//:androidx.annotation.annotation_1.2.0-beta01",
+ "@maven//:androidx.annotation.annotation_1.2.0-rc01",
"@maven//:androidx.appcompat.appcompat_1.0.2",
"@maven//:androidx.appcompat.appcompat_1.3.0",
"@maven//:androidx.benchmark.benchmark-gradle-plugin_1.1.0-beta04",
- "@maven//:androidx.compose.compiler.compiler_1.2.0-alpha05",
- "@maven//:androidx.compose.ui.ui-test-junit4_1.2.0-alpha05",
- "@maven//:androidx.compose.ui.ui-tooling_1.2.0-alpha05",
+ "@maven//:androidx.compose.compiler.compiler_1.2.0",
+ "@maven//:androidx.compose.ui.ui-test-junit4_1.2.0",
+ "@maven//:androidx.compose.ui.ui-tooling_1.2.0",
"@maven//:androidx.constraintlayout.constraintlayout_1.1.3",
"@maven//:androidx.constraintlayout.constraintlayout_2.1.3",
"@maven//:androidx.core.core-ktx_1.0.1",
@@ -89,7 +89,7 @@ maven_repository(
"@maven//:androidx.slice.slice-builders_1.0.0",
"@maven//:androidx.test.espresso.espresso-core_3.1.0",
"@maven//:androidx.test.espresso.espresso-core_3.2.0",
- "@maven//:androidx.test.ext.junit_1.1.1",
+ "@maven//:androidx.test.ext.junit_1.1.2",
"@maven//:androidx.wear.wear_1.2.0",
"@maven//:com.android.support.appcompat-v7_25.4.0",
"@maven//:com.android.support.constraint.constraint-layout_1.0.2",
@@ -139,6 +139,6 @@ maven_repository(
"@maven//:org.jetbrains.kotlin.kotlin-stdlib-jdk7_1.4.32",
"@maven//:org.jetbrains.kotlin.kotlin-stdlib-jdk8_1.4.31",
"@maven//:org.jetbrains.kotlin.kotlin-stdlib-jdk8_1.5.21",
- "@maven//:org.mockito.mockito-core_3.0.0",
+ "@maven//:org.mockito.mockito-core_3.12.4",
],
)
diff --git a/integration-tests-support/TestApp/app/build.gradle b/integration-tests-support/TestApp/app/build.gradle
index 1522a484..c410b2b5 100644
--- a/integration-tests-support/TestApp/app/build.gradle
+++ b/integration-tests-support/TestApp/app/build.gradle
@@ -45,9 +45,7 @@ dependencies {
exclude module: 'support-annotations'
}
testImplementation 'junit:junit:4.12'
- androidTestImplementation "org.mockito:mockito-core:3.0.0"
- androidTestImplementation "com.google.dexmaker:dexmaker:1.2"
- androidTestImplementation "com.google.dexmaker:dexmaker-mockito:1.2"
+ androidTestImplementation "org.mockito:mockito-core:3.12.4"
}
gradle.projectsEvaluated {
diff --git a/integration-tests/TestApp/app/build.gradle b/integration-tests/TestApp/app/build.gradle
index 440be3a8..3171b4d3 100644
--- a/integration-tests/TestApp/app/build.gradle
+++ b/integration-tests/TestApp/app/build.gradle
@@ -47,9 +47,7 @@ dependencies {
exclude module: 'support-annotations'
}
testImplementation 'junit:junit:4.12'
- androidTestImplementation "org.mockito:mockito-core:3.0.0"
- androidTestImplementation "com.linkedin.dexmaker:dexmaker:2.19.0"
- androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:2.19.0"
+ androidTestImplementation "org.mockito:mockito-core:3.12.4"
}
gradle.projectsEvaluated {