diff options
author | Aurimas Liutikas <aurimas@google.com> | 2021-05-12 21:55:46 +0000 |
---|---|---|
committer | Aurimas Liutikas <aurimas@google.com> | 2021-05-12 21:55:46 +0000 |
commit | 2fee426653cd72c87c78c6ddd91d01d1e8d1e66a (patch) | |
tree | 6f59a75348d07612173246ac6c4fca04bde0df2c /WORKSPACE | |
parent | 399f4f61132f363e9479e59c550a7bcf005922d8 (diff) | |
download | dagger2-2fee426653cd72c87c78c6ddd91d01d1e8d1e66a.tar.gz |
Revert "Merge commit 'upstream/dagger-2.35.1^'"
This reverts commit 399f4f61132f363e9479e59c550a7bcf005922d8.
Reason for revert: b/187908823
Change-Id: I81f7cd3672e65ce1f7e1fa846b6c3e2f87147a26
Diffstat (limited to 'WORKSPACE')
-rw-r--r-- | WORKSPACE | 79 |
1 files changed, 17 insertions, 62 deletions
@@ -12,12 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - -############################# -# Load nested repository -############################# - # Declare the nested workspace so that the top-level workspace doesn't try to # traverse it when calling `bazel build //...` local_repository( @@ -25,9 +19,7 @@ local_repository( path = "examples/bazel", ) -############################# -# Load Bazel-Common repository -############################# +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "google_bazel_common", @@ -40,9 +32,16 @@ load("@google_bazel_common//:workspace_defs.bzl", "google_common_workspace_rules google_common_workspace_rules() -############################# -# Load Protobuf dependencies -############################# +RULES_JVM_EXTERNAL_TAG = "2.7" + +RULES_JVM_EXTERNAL_SHA = "f04b1466a00a2845106801e0c5cec96841f49ea4e7d1df88dc8e4bf31523df74" + +http_archive( + name = "rules_jvm_external", + sha256 = RULES_JVM_EXTERNAL_SHA, + strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG, + url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, +) # rules_python and zlib are required by protobuf. # TODO(ronshapiro): Figure out if zlib is in fact necessary, or if proto can depend on the @@ -66,27 +65,6 @@ http_archive( urls = ["https://github.com/madler/zlib/archive/v1.2.11.tar.gz"], ) -############################# -# Load Robolectric repository -############################# - -ROBOLECTRIC_VERSION = "4.4" - -http_archive( - name = "robolectric", - sha256 = "d4f2eb078a51f4e534ebf5e18b6cd4646d05eae9b362ac40b93831bdf46112c7", - strip_prefix = "robolectric-bazel-%s" % ROBOLECTRIC_VERSION, - urls = ["https://github.com/robolectric/robolectric-bazel/archive/%s.tar.gz" % ROBOLECTRIC_VERSION], -) - -load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories") - -robolectric_repositories() - -############################# -# Load Kotlin repository -############################# - RULES_KOTLIN_COMMIT = "2c283821911439e244285b5bfec39148e7d90e21" RULES_KOTLIN_SHA = "b04cd539e7e3571745179da95069586b6fa76a64306b24bb286154e652010608" @@ -118,21 +96,6 @@ kotlin_repositories(compiler_release = KOTLINC_RELEASE) register_toolchains("//:kotlin_toolchain") -############################# -# Load Maven dependencies -############################# - -RULES_JVM_EXTERNAL_TAG = "2.7" - -RULES_JVM_EXTERNAL_SHA = "f04b1466a00a2845106801e0c5cec96841f49ea4e7d1df88dc8e4bf31523df74" - -http_archive( - name = "rules_jvm_external", - sha256 = RULES_JVM_EXTERNAL_SHA, - strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, -) - load("@rules_jvm_external//:defs.bzl", "maven_install") ANDROID_LINT_VERSION = "26.6.2" @@ -141,16 +104,14 @@ maven_install( artifacts = [ "androidx.annotation:annotation:1.1.0", "androidx.appcompat:appcompat:1.2.0", - "androidx.activity:activity:1.2.2", - "androidx.fragment:fragment:1.3.2", - "androidx.lifecycle:lifecycle-common:2.3.1", - "androidx.lifecycle:lifecycle-viewmodel:2.3.1", - "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1", + "androidx.activity:activity:1.1.0", + "androidx.fragment:fragment:1.2.5", + "androidx.lifecycle:lifecycle-viewmodel:2.2.0", + "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0", "androidx.multidex:multidex:2.0.1", "androidx.savedstate:savedstate:1.0.0", "androidx.test:monitor:1.1.1", "androidx.test:core:1.1.0", - "androidx.test.ext:junit:1.1.2", "com.google.auto:auto-common:0.11", "com.android.support:appcompat-v7:25.0.0", "com.android.support:support-annotations:25.0.0", @@ -165,11 +126,9 @@ maven_install( "com.android.tools:testutils:%s" % ANDROID_LINT_VERSION, "com.github.tschuchortdev:kotlin-compile-testing:1.2.8", "com.google.guava:guava:27.1-android", - "junit:junit:4.13", "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION, - "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.2.0", - "org.robolectric:robolectric:4.4", - "org.robolectric:shadows-framework:4.4", # For ActivityController + "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.1.0", + "org.robolectric:robolectric:4.3.1", ], repositories = [ "https://repo1.maven.org/maven2", @@ -178,10 +137,6 @@ maven_install( ], ) -############################# -# Load Bazel Skylib rules -############################# - BAZEL_SKYLIB_VERSION = "1.0.2" BAZEL_SKYLIB_SHA = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44" |