Fix #1547: Change 'correct_answer' field in GaeSolution.kt to 'Any?'

BUILD.bazel

@@ -0,0 +1 @@
+# TODO(#1532): Rename file to 'BUILD' post-Gradle.

WORKSPACE

@@ -0,0 +1,143 @@
+'''
+This file lists and imports all external dependencies needed to build Oppia Android.
+'''
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+
+# Android SDK configuration. For more details, see:
+# https://docs.bazel.build/versions/master/be/android.html#android_sdk_repository
+android_sdk_repository(
+    name = "androidsdk",
+    api_level = 28,
+)
+
+# Add support for JVM rules: https://github.com/bazelbuild/rules_jvm_external
+RULES_JVM_EXTERNAL_TAG = "2.9"
+RULES_JVM_EXTERNAL_SHA = "e5b97a31a3e8feed91636f42e19b11c49487b85e5de2f387c999ea14d77c7f45"
+http_archive(
+    name = "rules_jvm_external",
+    strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
+    sha256 = RULES_JVM_EXTERNAL_SHA,
+    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
+)
+
+# Add support for Kotlin: https://github.com/bazelbuild/rules_kotlin.
+RULES_KOTLIN_VERSION = "legacy-1.4.0-rcx-oppia-exclusive-rc01"
+RULES_KOTLIN_SHA = "600f3d916eda5531dd70614ec96dc92b4ac24da0e1d815eb94559976e9bea8aa"
+http_archive(
+   name = "io_bazel_rules_kotlin",
+   urls = ["https://github.com/oppia/rules_kotlin/archive/%s.zip" % RULES_KOTLIN_VERSION],
+   type = "zip",
+   strip_prefix = "rules_kotlin-%s" % RULES_KOTLIN_VERSION,
+   sha256 = RULES_KOTLIN_SHA,
+)
+
+# TODO(#1535): Remove once rules_kotlin is released because these lines become unnecessary
+load("@io_bazel_rules_kotlin//kotlin:dependencies.bzl", "kt_download_local_dev_dependencies")
+kt_download_local_dev_dependencies()
+
+load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
+kotlin_repositories()
+kt_register_toolchains()
+
+# rules_proto defines abstract rules for building Protocol Buffers.
+http_archive(
+    name = "rules_proto",
+    sha256 = "2490dca4f249b8a9a3ab07bd1ba6eca085aaf8e45a734af92aad0c42d9dc7aaf",
+    strip_prefix = "rules_proto-218ffa7dfa5408492dc86c01ee637614f8695c45",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/218ffa7dfa5408492dc86c01ee637614f8695c45.tar.gz",
+        "https://github.com/bazelbuild/rules_proto/archive/218ffa7dfa5408492dc86c01ee637614f8695c45.tar.gz",
+    ],
+)
+
+load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
+rules_proto_dependencies()
+rules_proto_toolchains()
+
+# rules_java defines rules for generating Java code from Protocol Buffers.
+http_archive(
+    name = "rules_java",
+    sha256 = "ccf00372878d141f7d5568cedc4c42ad4811ba367ea3e26bc7c43445bbc52895",
+    strip_prefix = "rules_java-d7bf804c8731edd232cb061cb2a9fe003a85d8ee",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/d7bf804c8731edd232cb061cb2a9fe003a85d8ee.tar.gz",
+        "https://github.com/bazelbuild/rules_java/archive/d7bf804c8731edd232cb061cb2a9fe003a85d8ee.tar.gz",
+    ],
+)
+
+load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
+rules_java_dependencies()
+rules_java_toolchains()
+
+# Add support for Dagger
+DAGGER_TAG = "2.28.1"
+DAGGER_SHA = "9e69ab2f9a47e0f74e71fe49098bea908c528aa02fa0c5995334447b310d0cdd"
+http_archive(
+    name = "dagger",
+    strip_prefix = "dagger-dagger-%s" % DAGGER_TAG,
+    sha256 = DAGGER_SHA,
+    urls = ["https://github.com/google/dagger/archive/dagger-%s.zip" % DAGGER_TAG],
+)
+
+load("@dagger//:workspace_defs.bzl", "DAGGER_ARTIFACTS", "DAGGER_REPOSITORIES")
+
+# Add support for Robolectric: https://github.com/robolectric/robolectric-bazel
+http_archive(
+    name = "robolectric",
+    urls = ["https://github.com/oppia/robolectric-bazel/archive/4.x-oppia-exclusive-rc02.tar.gz"],
+    strip_prefix = "robolectric-bazel-4.x-oppia-exclusive-rc02",
+)
+load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
+robolectric_repositories()
+
+# Add support for Firebase Crashlytics
+git_repository(
+    name = "tools_android",
+    commit = "00e6f4b7bdd75911e33c618a9bc57bab7a6e8930",
+    remote = "https://github.com/bazelbuild/tools_android",
+)
+
+load("@tools_android//tools/googleservices:defs.bzl", "google_services_workspace_dependencies")
+google_services_workspace_dependencies()
+
+load("@rules_jvm_external//:defs.bzl", "maven_install")
+
+maven_install(
+    artifacts = DAGGER_ARTIFACTS + [
+        "org.robolectric:robolectric:4.3",
+        "org.robolectric:annotations:4.3",
+        "androidx.appcompat:appcompat:1.0.2",
+        "androidx.annotation:annotation:1.1.0",
+        "com.android.support:support-annotations:28.0.0",
+        "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2",
+        "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.8",
+        "androidx.core:core-ktx:1.0.1",
+        "junit:junit:4.12",
+        "com.google.truth:truth:0.43",
+        "com.github.bumptech.glide:glide:4.11.0",
+        "com.caverock:androidsvg-aar:1.4",
+        "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0-alpha03",
+        "org.mockito:mockito-core:2.19.0",
+        "androidx.test.ext:junit:1.1.1",
+        "android.arch.core:core-testing:1.1.1",
+        "androidx.arch.core:core-testing:2.1.0",
+        "org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.3.72",
+        "org.jetbrains.kotlin:kotlin-test-junit:1.3.72",
+        "org.robolectric:annotations:4.3",
+        "com.crashlytics.sdk.android:crashlytics:2.9.8",
+        "io.fabric.sdk.android:fabric:1.4.7",
+        "com.google.firebase:firebase-analytics:17.4.4",
+        "com.google.firebase:firebase-crashlytics:17.1.1",
+        "org.jetbrains.kotlin:kotlin-reflect:1.3.41",
+    ],
+    repositories = DAGGER_REPOSITORIES + [
+        "https://maven.google.com",
+        "https://repo1.maven.org/maven2",
+        "https://jcenter.bintray.com/",
+        "https://bintray.com/bintray/jcenter",
+        "https://maven.fabric.io/public",
+    ],
+)

data/BUILD.bazel

@@ -0,0 +1,27 @@
+# TODO(#1532): Rename file to 'BUILD' post-Gradle.
+'''
+This library provides data to the rest of the application.
+'''
+
+load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
+load("@rules_jvm_external//:defs.bzl", "artifact")
+load("@dagger//:workspace_defs.bzl", "dagger_rules")
+
+kt_android_library(
+    name = "cache_store",
+    custom_package = "org.oppia.data.persistence",
+    srcs = glob(["src/main/java/org/oppia/data/persistence/*.kt"]),
+    manifest = "src/main/AndroidManifest.xml",
+    deps = [
+        ":dagger",
+        "//model",
+        "//utility",
+        artifact("androidx.appcompat:appcompat"),
+        artifact("com.github.bumptech.glide:glide"),
+        artifact("com.caverock:androidsvg-aar"),
+        artifact("androidx.lifecycle:lifecycle-livedata-ktx"),
+    ],
+    visibility = ["//visibility:public"],
+)
+
+dagger_rules()

data/src/main/java/org/oppia/data/backends/gae/model/GaeSolution.kt

@@ -12,7 +12,7 @@ data class GaeSolution(
 
   @Json(name = "interaction_id") val interactionId: String?,
   @Json(name = "answer_is_exclusive") val isAnswerExclusive: Boolean?,
-  @Json(name = "correct_answer") val correctAnswer: String?,
+  @Json(name = "correct_answer") val correctAnswer: Any?,
   @Json(name = "explanation") val explanation: GaeSubtitledHtml?
 
 )