Updated Robolecticr to 4.7

oppia · Jan 31, 2024 · 35a4207 · 35a4207
1 parent 3ced7e1
commit 35a4207
Show file tree

Hide file tree

Showing 9 changed files with 1,676 additions and 1,445 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -96,8 +96,8 @@ load("@dagger//:workspace_defs.bzl", "DAGGER_ARTIFACTS", "DAGGER_REPOSITORIES")
 # Add support for Robolectric: https://github.com/robolectric/robolectric-bazel
 http_archive(
     name = "robolectric",
-    strip_prefix = "robolectric-bazel-4.5",
-    urls = ["https://github.com/robolectric/robolectric-bazel/archive/4.5.tar.gz"],
+    strip_prefix = "robolectric-bazel-4.7",
+    urls = ["https://github.com/robolectric/robolectric-bazel/archive/4.7.tar.gz"],
 )
 
 load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")

diff --git a/app/build.gradle b/app/build.gradle
@@ -192,16 +192,16 @@ dependencies {
   testImplementation(
       'androidx.test:core:1.2.0',
       'androidx.test.espresso:espresso-contrib:3.1.0',
-      'androidx.test.espresso:espresso-core:3.2.0',
+      'androidx.test.espresso:espresso-core:3.5.0-alpha03',
       'androidx.test.espresso:espresso-intents:3.1.0',
       'androidx.test.ext:junit:1.1.1',
       'androidx.test.ext:truth:1.4.0',
       'androidx.work:work-testing:2.4.0',
       'com.github.bumptech.glide:mocks:4.11.0',
       'com.google.truth:truth:1.1.3',
       'com.google.truth.extensions:truth-liteproto-extension:1.1.3',
-      'org.robolectric:annotations:4.5',
-      'org.robolectric:robolectric:4.5',
+      'org.robolectric:annotations:4.7',
+      'org.robolectric:robolectric:4.7',
       'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
       "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version",
       'org.mockito:mockito-core:2.7.22',
@@ -210,7 +210,7 @@ dependencies {
   androidTestImplementation(
       'androidx.test:core:1.2.0',
       'androidx.test.espresso:espresso-contrib:3.1.0',
-      'androidx.test.espresso:espresso-core:3.2.0',
+      'androidx.test.espresso:espresso-core:3.5.0-alpha03',
       'androidx.test.espresso:espresso-intents:3.1.0',
       'androidx.test.ext:junit:1.1.1',
       'androidx.test.ext:truth:1.4.0',
@@ -220,7 +220,7 @@ dependencies {
       'com.google.truth.extensions:truth-liteproto-extension:1.1.3',
       'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
       'org.mockito:mockito-android:2.7.22',
-      'org.robolectric:annotations:4.5',
+      'org.robolectric:annotations:4.7',
   )
   // Adding the testing module directly causes duplicates of the below groups so we need to
   // exclude them before adding the testing module to the androidTestImplementation dependencies

diff --git a/data/build.gradle b/data/build.gradle
@@ -88,7 +88,7 @@ dependencies {
       'junit:junit:4.12',
       'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
       'org.mockito:mockito-core:2.19.0',
-      'org.robolectric:robolectric:4.5',
+      'org.robolectric:robolectric:4.7',
       project(":testing"),
   )
   // TODO(#59): Remove this once Bazel is introduced
@@ -99,7 +99,7 @@ dependencies {
       'com.squareup.retrofit2:retrofit-mock:2.7.2',
   )
   androidTestImplementation('androidx.test:runner:1.2.0',
-      'androidx.test.espresso:espresso-core:3.2.0')
+      'androidx.test.espresso:espresso-core:3.5.0-alpha03')
   kapt(
       'com.google.dagger:dagger-compiler:2.24',
       'com.squareup.moshi:moshi-kotlin-codegen:1.11.0'

diff --git a/domain/build.gradle b/domain/build.gradle
@@ -106,7 +106,7 @@ dependencies {
   )
   testImplementation(
       'android.arch.core:core-testing:1.1.1',
-      'androidx.test.espresso:espresso-core:3.2.0',
+      'androidx.test.espresso:espresso-core:3.5.0-alpha03',
       'androidx.test.ext:junit:1.1.1',
       'androidx.work:work-testing:2.4.0',
       'com.google.dagger:dagger:2.24',
@@ -118,7 +118,7 @@ dependencies {
       'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2',
       'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
       'org.mockito:mockito-core:3.9.0',
-      'org.robolectric:robolectric:4.5',
+      'org.robolectric:robolectric:4.7',
       project(":testing"),
   )
   kapt(

diff --git a/scripts/assets/maven_dependencies.textproto b/scripts/assets/maven_dependencies.textproto
@@ -1,6 +1,6 @@
 maven_dependency {
-  artifact_name: "androidx.annotation:annotation-experimental:1.0.0"
-  artifact_version: "1.0.0"
+  artifact_name: "androidx.annotation:annotation-experimental:1.1.0"
+  artifact_version: "1.1.0"
   license {
     license_name: "The Apache Software License, Version 2.0"
     original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -10,8 +10,8 @@ maven_dependency {
   }
 }
 maven_dependency {
-  artifact_name: "androidx.annotation:annotation:1.1.0"
-  artifact_version: "1.1.0"
+  artifact_name: "androidx.annotation:annotation:1.2.0"
+  artifact_version: "1.2.0"
   license {
     license_name: "The Apache Software License, Version 2.0"
     original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -208,8 +208,8 @@ maven_dependency {
   }
 }
 maven_dependency {
-  artifact_name: "androidx.lifecycle:lifecycle-common:2.2.0"
-  artifact_version: "2.2.0"
+  artifact_name: "androidx.lifecycle:lifecycle-common:2.3.1"
+  artifact_version: "2.3.1"
   license {
     license_name: "The Apache Software License, Version 2.0"
     original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -962,8 +962,8 @@ maven_dependency {
   }
 }
 maven_dependency {
-  artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-common:1.5.0"
-  artifact_version: "1.5.0"
+  artifact_name: "org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31"
+  artifact_version: "1.5.31"
   license {
     license_name: "The Apache License, Version 2.0"
     original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -995,8 +995,8 @@ maven_dependency {
   }
 }
 maven_dependency {
-  artifact_name: "org.jetbrains.kotlin:kotlin-stdlib:1.5.0"
-  artifact_version: "1.5.0"
+  artifact_name: "org.jetbrains.kotlin:kotlin-stdlib:1.5.31"
+  artifact_version: "1.5.31"
   license {
     license_name: "The Apache License, Version 2.0"
     original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
@@ -1039,11 +1039,11 @@ maven_dependency {
   }
 }
 maven_dependency {
-  artifact_name: "org.ow2.asm:asm:9.1"
-  artifact_version: "9.1"
+  artifact_name: "org.ow2.asm:asm:9.2"
+  artifact_version: "9.2"
   license {
     license_name: "BSD-3-Clause"
-    original_link: "https://asm.ow2.io/license.html"
+    original_link: "https://raw.githubusercontent.com/oppia/oppia-android-licenses/develop/org.ow2.asm%3Aasm%3A7.2-license.txt"
     extracted_copy_link {
       url: "https://raw.githubusercontent.com/oppia/oppia-android-licenses/develop/org.ow2.asm%3Aasm%3A7.2-license.txt"
     }

diff --git a/testing/build.gradle b/testing/build.gradle
@@ -71,7 +71,7 @@ dependencies {
       'androidx.core:core-ktx:1.0.2',
       "androidx.test:core:1.0.0",
       'androidx.test.espresso:espresso-accessibility:3.1.0',
-      'androidx.test.espresso:espresso-core:3.2.0',
+      'androidx.test.espresso:espresso-core:3.5.0-alpha03',
       'androidx.test:runner:1.2.0',
       'com.google.android.material:material:1.3.0',
       'com.google.dagger:dagger:2.24',
@@ -81,7 +81,7 @@ dependencies {
       'com.google.truth.extensions:truth-liteproto-extension:1.1.3',
       'nl.dionsegijn:konfetti:1.2.5',
       'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
-      'org.robolectric:robolectric:4.5',
+      'org.robolectric:robolectric:4.7',
       'org.jetbrains.kotlin:kotlin-reflect:$kotlin_version',
       'org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version',
       'org.mockito:mockito-core:2.19.0',