Fix oppia#2917, oppia#2969: Build bazel for util/extensions and fix t…

…ypo in versions.bzl (oppia#2955) * Added protbuf-lite dependency to versions.bzl, made the necessary changes to utility/BUILD.bazel to accomodate the new extensions/BUILD.bazel file created * Converted the '.'s and ':'s to '_' in the dependencies in the extensions/BUILD.bazel file and added the bundle_extensions library to app/BUILD.bazel * Reverted accidental changes to .idea/misc.xml * Removed visibility and dependency from the live_data_ext library as it isn't being used anywhere * Added back lifecycle dependency to live_data_ext library * Fixed type in versions.bzl * Renamed LiveDataExt.kt to Extensions.kt and made corresponding changes to its library * Removed Extensions.kt and it's corresponding library
Akshatkamboj14 · Mar 31, 2021 · 2b8c66b · 2b8c66b
1 parent 239ab72
commit 2b8c66b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/app/BUILD.bazel b/app/BUILD.bazel
@@ -634,6 +634,7 @@ kt_android_library(
         "//third_party:javax_annotation_javax_annotation-api_jar",
         "//utility",
         "//utility/src/main/java/org/oppia/android/util/accessibility:prod_module",
+        "//utility/src/main/java/org/oppia/android/util/extensions:bundle_extensions",
     ],
 )
 

diff --git a/third_party/versions.bzl b/third_party/versions.bzl
@@ -5,7 +5,7 @@ dependency elsewhere in the app.
 
 Note that dependencies can only be represented once in the list--that's by design to protect against
 one-version violations. See https://docs.bazel.build/versions/master/best-practices.html#versioning
-for more information on mutli-version violations.
+for more information on multi-version violations.
 
 Note that each of the dependencies will have all ':'s & '.'s replaced with underscores. For example,
 the dependency "android.arch.core:core-testing": "1.1.1" will be referencable with the following:
@@ -53,6 +53,7 @@ MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = {
     "com.google.firebase:firebase-crashlytics": "17.1.1",
     "com.google.gms:google-services": "4.3.3",
     "com.google.guava:guava": "28.1-android",
+    "com.google.protobuf:protobuf-lite": "3.0.0",
     "com.squareup.retrofit2:converter-gson": "2.5.0",
     "com.squareup.retrofit2:retrofit": "2.9.0",
     "de.hdodenhof:circleimageview": "3.0.1",

diff --git a/utility/BUILD.bazel b/utility/BUILD.bazel
@@ -15,6 +15,7 @@ MIGRATED_PROD_FILES = glob([
     "src/main/java/org/oppia/android/util/accessibility/*.kt",
     "src/main/java/org/oppia/android/util/profile/*.kt",
     "src/main/java/org/oppia/android/util/datetime/*.kt",
+    "src/main/java/org/oppia/android/util/extensions/*.kt",
     "src/main/java/org/oppia/android/util/system/*.kt",
     "src/main/java/org/oppia/android/util/networking/*.kt",
     "src/main/java/org/oppia/android/util/threading/*.kt",

diff --git a/utility/src/main/java/org/oppia/android/util/extensions/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/extensions/BUILD.bazel
@@ -0,0 +1,16 @@
+"""
+General purposes utilities to manage extensions
+"""
+
+load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
+
+kt_android_library(
+    name = "bundle_extensions",
+    srcs = [
+        "BundleExtensions.kt",
+    ],
+    visibility = ["//:oppia_api_visibility"],
+    deps = [
+        "//third_party:com_google_protobuf_protobuf-lite",
+    ],
+)
diff --git a/utility/src/main/java/org/oppia/android/util/extensions/LiveDataExt.kt b/utility/src/main/java/org/oppia/android/util/extensions/LiveDataExt.kt