From f87e5047ef9da68fac4bc40168149ff50e1d4a09 Mon Sep 17 00:00:00 2001 From: Ben Henning Date: Wed, 26 May 2021 04:17:34 -0700 Subject: [PATCH] [RunAllTests] Fix #3217, part of #2923: migrate flexbox dependency to pull from Google's Maven repository instead of JCenter/bintray (#3249) * Update versions.bzl Update flexbox to use the Google Maven dependency instead of JCenter. * Update build.gradle Update flexbox layout dependency to use Google Maven instead of JCenter. * Update versions.bzl FIx linter error. * Update BUILD.bazel Fix flexbox dependency reference since it's been updated. --- app/BUILD.bazel | 4 ++-- app/build.gradle | 2 +- third_party/versions.bzl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/BUILD.bazel b/app/BUILD.bazel index 5200dfc73ba..3dfc3274556 100644 --- a/app/BUILD.bazel +++ b/app/BUILD.bazel @@ -496,7 +496,7 @@ android_library( "//third_party:androidx_viewpager2_viewpager2", "//third_party:androidx_viewpager_viewpager", "//third_party:circularimageview_circular_image_view", - "//third_party:com_google_android_flexbox", + "//third_party:com_google_android_flexbox_flexbox", "//third_party:com_google_android_material_material", "//third_party:de_hdodenhof_circleimageview", "//third_party:io_github_chaosleung_pinview", @@ -640,7 +640,7 @@ kt_android_library( "//third_party:androidx_viewpager_viewpager", "//third_party:androidx_work_work-runtime-ktx", "//third_party:com_caverock_androidsvg", - "//third_party:com_google_android_flexbox", + "//third_party:com_google_android_flexbox_flexbox", "//third_party:javax_annotation_javax_annotation-api_jar", "//utility", "//utility/src/main/java/org/oppia/android/util/accessibility:prod_module", diff --git a/app/build.gradle b/app/build.gradle index 203ac3c71c6..dd39733fa03 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -112,7 +112,7 @@ dependencies { 'androidx.work:work-runtime-ktx:2.4.0', 'io.github.chaosleung:pinview:1.4.4', 'com.github.bumptech.glide:glide:4.11.0', - 'com.google.android:flexbox:2.0.1', + 'com.google.android.flexbox:flexbox:3.0.0', 'com.google.android.material:material:1.2.0-alpha02', 'com.google.dagger:dagger:2.24', 'com.google.firebase:firebase-analytics:17.5.0', diff --git a/third_party/versions.bzl b/third_party/versions.bzl index 363702697f1..ede3daa5c69 100644 --- a/third_party/versions.bzl +++ b/third_party/versions.bzl @@ -46,8 +46,8 @@ MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = { "com.crashlytics.sdk.android:crashlytics": "2.9.8", "com.github.bumptech.glide:compiler": "4.11.0", "com.github.bumptech.glide:glide": "4.11.0", + "com.google.android.flexbox:flexbox": "3.0.0", "com.google.android.material:material": "1.2.0-alpha02", - "com.google.android:flexbox": "2.0.1", "com.google.firebase:firebase-analytics": "17.5.0", "com.google.firebase:firebase-crashlytics": "17.1.1", "com.google.gms:google-services": "4.3.3",