From e3e91bd77ab61451d6e4496458cb1f9151bc00ae Mon Sep 17 00:00:00 2001 From: "edwin.rahman" Date: Wed, 25 Feb 2026 18:38:02 +0700 Subject: [PATCH 1/6] Bump RJE to 6.10 --- WORKSPACE | 1111 ++++++++++------- build.gradle | 8 +- constants.gradle | 2 +- .../grab/grazel/bazel/rules/CommonRules.kt | 42 + .../com/grab/grazel/bazel/rules/MavenRules.kt | 5 + .../grazel/extension/BazelCommonExtension.kt | 35 +- .../grazel/extension/MavenInstallExtension.kt | 12 +- .../grab/grazel/extension/RulesExtension.kt | 2 +- .../MavenInstallArtifactsCalculator.kt | 6 +- .../migrate/dependencies/MavenInstallData.kt | 3 +- .../migrate/internal/WorkspaceBuilder.kt | 10 + keystore/BUILD.bazel | 15 +- 12 files changed, 785 insertions(+), 466 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 6bd68aa6..4505f19e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,525 +1,744 @@ workspace(name = "grazel") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( - name = "io_bazel_rules_kotlin", - sha256 = "3b772976fec7bdcda1d84b9d39b176589424c047eb2175bed09aac630e50af43", - url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.6/rules_kotlin-v1.9.6.tar.gz", + name = "io_bazel_rules_kotlin", + sha256 = "3b772976fec7bdcda1d84b9d39b176589424c047eb2175bed09aac630e50af43", + url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.6/rules_kotlin-v1.9.6.tar.gz" ) KOTLIN_VERSION = "1.9.25" - KOTLINC_RELEASE_SHA = "6ab72d6144e71cbbc380b770c2ad380972548c63ab6ed4c79f11c88f2967332e" - KSP_VERSION = "1.9.25-1.0.20" - KSP_COMPILER_RELEASE_SHA = "3a2d24623409ac5904c87a7e130f5b39ce9fd67ca8b44e4fe5b784a6ec102b81" -load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version", "ksp_version") +load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version", "ksp_version") KOTLINC_RELEASE = kotlinc_version( - release = KOTLIN_VERSION, - sha256 = KOTLINC_RELEASE_SHA, -) - + release = KOTLIN_VERSION, + sha256 = KOTLINC_RELEASE_SHA + ) KSP_COMPILER_RELEASE = ksp_version( - release = KSP_VERSION, - sha256 = KSP_COMPILER_RELEASE_SHA, -) - -kotlin_repositories( - compiler_release = KOTLINC_RELEASE, - ksp_compiler_release = KSP_COMPILER_RELEASE, -) - + release = KSP_VERSION, + sha256 = KSP_COMPILER_RELEASE_SHA + ) +kotlin_repositories(compiler_release = KOTLINC_RELEASE, ksp_compiler_release = KSP_COMPILER_RELEASE) register_toolchains("//:kotlin_toolchain") -load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") +http_archive(name = "rules_java", urls = [ + "https://github.com/bazelbuild/rules_java/releases/download/7.6.1/rules_java-7.6.1.tar.gz", + ], sha256 = "f8ae9ed3887df02f40de9f4f7ac3873e6dd7a471f9cddf63952538b94b59aeb3", patches = [ + "//patches/rules_java:turbine_worker.patch", + ], patch_args = [ + "-p1", + ]) + +load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") git_repository( - name = "grab_bazel_common", - commit = "8cfb7bcb84f6d9631b01bb14c25644030ad2ecf8", - remote = "https://github.com/grab/grab-bazel-common.git", + name = "grab_bazel_common", + commit = "0962a9aaeee64ed17eb65b577060693c3b3dc244", + remote = "https://github.com/grab/grab-bazel-common.git" ) -load("@grab_bazel_common//rules:repositories.bzl", "bazel_common_dependencies") +load("@grab_bazel_common//rules:repositories.bzl", "bazel_common_dependencies") bazel_common_dependencies() -load("@grab_bazel_common//rules:setup.bzl", "bazel_common_setup") +load("@grab_bazel_common//rules:deps_init.bzl", "bazel_common_deps_init") -bazel_common_setup( - buildifier_version = "6.3.3", - patched_android_tools = True, -) +bazel_common_deps_init() + +load("@grab_bazel_common//rules:setup.bzl", "bazel_common_setup") -load("@grab_bazel_common//rules:maven.bzl", "pin_bazel_common_dependencies") +bazel_common_setup(patched_android_tools = True, buildifier_version = "6.3.3", pinned_maven_install = True, additional_coursier_options = [ + "--parallel", + "12", + ]) + +load("@grab_bazel_common//rules:maven.bzl", "pin_bazel_common_dependencies") pin_bazel_common_dependencies() DAGGER_TAG = "2.47" - DAGGER_SHA = "154cdfa4f6f552a9873e2b4448f7a80415cb3427c4c771a50c6a8a8b434ffd0a" - http_archive( - name = "dagger", - sha256 = DAGGER_SHA, - strip_prefix = "dagger-dagger-%s" % DAGGER_TAG, - url = "https://github.com/google/dagger/archive/dagger-%s.zip" % DAGGER_TAG, + name = "dagger", + strip_prefix = "dagger-dagger-%s" % DAGGER_TAG, + sha256 = DAGGER_SHA, + url = "https://github.com/google/dagger/archive/dagger-%s.zip" % DAGGER_TAG ) -load("@dagger//:workspace_defs.bzl", "DAGGER_ARTIFACTS", "DAGGER_REPOSITORIES") -load("@grab_bazel_common//:workspace_defs.bzl", "GRAB_BAZEL_COMMON_ARTIFACTS") +load("@dagger//:workspace_defs.bzl", "DAGGER_ARTIFACTS", "DAGGER_REPOSITORIES") + +load("@grab_bazel_common//:workspace_defs.bzl", "GRAB_BAZEL_COMMON_ARTIFACTS") http_archive( - name = "rules_jvm_external", - sha256 = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac", - strip_prefix = "rules_jvm_external-5.3", - url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/5.3/rules_jvm_external-5.3.tar.gz", + name = "rules_jvm_external", + strip_prefix = "rules_jvm_external-6.10", + sha256 = "e5f83b8f2678d2b26441e5eafefb1b061826608417b8d24e5e8e15e585eab1ba", + url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/6.10/rules_jvm_external-6.10.tar.gz" ) -load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps") +load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps") rules_jvm_external_deps() - -load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup") +load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup") rules_jvm_external_setup() +load("@rules_jvm_external//:defs.bzl", "maven_install") -load("@rules_jvm_external//:defs.bzl", "maven_install") -load("@rules_jvm_external//:specs.bzl", "maven") +load("@rules_jvm_external//:specs.bzl", "maven") maven_install( - name = "android_test_maven", - artifacts = [ - "androidx.annotation:annotation-experimental:1.1.0", - "androidx.annotation:annotation:1.2.0", - "androidx.test:annotation:1.0.1", - "androidx.test:monitor:1.6.1", - "androidx.tracing:tracing:1.0.0", - ], - excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], - fail_if_repin_required = False, - fail_on_missing_checksum = False, - jetify = True, - jetify_include_list = [ - "com.android.support:cardview-v7", - "com.android.support:support-annotations", - "com.android.support:support-compat", - "com.android.support:support-core-ui", - "com.android.support:support-core-utils", - ], - maven_install_json = "//:android_test_maven_install.json", - override_targets = { - "androidx.annotation:annotation": "@maven//:androidx_annotation_annotation_jvm", - "androidx.annotation:annotation-experimental": "@maven//:androidx_annotation_annotation_experimental", - "androidx.test:annotation": "@maven//:androidx_test_annotation", - "androidx.tracing:tracing": "@maven//:androidx_tracing_tracing", - }, - repositories = [ - "https://dl.google.com/dl/android/maven2/", - ], - resolve_timeout = 1000, - version_conflict_policy = "pinned", + name = "android_test_maven", + artifacts = [ + "androidx.annotation:annotation-experimental:1.1.0" +, + "androidx.annotation:annotation:1.2.0" +, + "androidx.test:annotation:1.0.1" +, + "androidx.test:monitor:1.6.1" +, + "androidx.tracing:tracing:1.0.0" +, + ], + repositories = [ + "https://dl.google.com/dl/android/maven2/", + ] , + jetify = True, + jetify_include_list = [ + "com.android.support:cardview-v7", + "com.android.support:support-annotations", + "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", + ], + fail_on_missing_checksum = False, + resolve_timeout = 1000, + excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], + override_targets = { + "androidx.annotation:annotation" : "@maven//:androidx_annotation_annotation_jvm", + "androidx.annotation:annotation-experimental" : "@maven//:androidx_annotation_annotation_experimental", + "androidx.test:annotation" : "@maven//:androidx_test_annotation", + "androidx.tracing:tracing" : "@maven//:androidx_tracing_tracing", + }, + maven_install_json = "//:android_test_maven_install.json", + version_conflict_policy = "pinned", + fail_if_repin_required = False, + additional_coursier_options = [ + "--parallel", + "12", + ] ) -load("@android_test_maven//:defs.bzl", android_test_maven_pinned_maven_install = "pinned_maven_install") +load("@android_test_maven//:defs.bzl", android_test_maven_pinned_maven_install = "pinned_maven_install") android_test_maven_pinned_maven_install() - maven_install( - name = "debug_maven", - artifacts = [ - "androidx.annotation:annotation:1.1.0", - "androidx.arch.core:core-common:2.1.0", - "androidx.arch.core:core-runtime:2.1.0", - "androidx.collection:collection:1.0.0", - "androidx.core:core-ktx:1.2.0", - "androidx.core:core:1.3.2", - "androidx.customview:customview:1.0.0", - "androidx.lifecycle:lifecycle-common:2.2.0", - "androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0", - "androidx.lifecycle:lifecycle-livedata-core:2.2.0", - "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0", - "androidx.lifecycle:lifecycle-livedata:2.2.0", - "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0", - "androidx.lifecycle:lifecycle-runtime:2.2.0", - "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0", - "androidx.lifecycle:lifecycle-viewmodel:2.2.0", - "androidx.paging:paging-common-ktx:3.1.1", - "androidx.paging:paging-common:3.1.1", - "androidx.paging:paging-runtime:3.1.1", - "androidx.recyclerview:recyclerview:1.2.0", - "androidx.versionedparcelable:versionedparcelable:1.1.0", - "org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31", - "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30", - "org.jetbrains.kotlin:kotlin-stdlib:1.5.31", - "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2", - "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2", - "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2", - "org.jetbrains:annotations:13.0", - ], - excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], - fail_if_repin_required = False, - fail_on_missing_checksum = False, - jetify = True, - jetify_include_list = [ - "android.arch.core:common", - "android.arch.core:runtime", - "android.arch.lifecycle:common", - "android.arch.lifecycle:livedata", - "android.arch.lifecycle:livedata-core", - "android.arch.lifecycle:runtime", - "android.arch.lifecycle:viewmodel", - "android.arch.paging:common", - "com.android.support:cardview-v7", - "com.android.support:collections", - "com.android.support:customview", - "com.android.support:recyclerview-v7", - "com.android.support:support-annotations", - "com.android.support:support-compat", - "com.android.support:support-core-ui", - "com.android.support:support-core-utils", - "com.android.support:versionedparcelable", - ], - maven_install_json = "//:debug_maven_install.json", - override_targets = { - "androidx.annotation:annotation": "@maven//:androidx_annotation_annotation_jvm", - "androidx.arch.core:core-common": "@maven//:androidx_arch_core_core_common", - "androidx.arch.core:core-runtime": "@maven//:androidx_arch_core_core_runtime", - "androidx.collection:collection": "@maven//:androidx_collection_collection", - "androidx.core:core": "@maven//:androidx_core_core", - "androidx.core:core-ktx": "@maven//:androidx_core_core_ktx", - "androidx.customview:customview": "@maven//:androidx_customview_customview", - "androidx.lifecycle:lifecycle-common": "@maven//:androidx_lifecycle_lifecycle_common", - "androidx.lifecycle:lifecycle-livedata": "@maven//:androidx_lifecycle_lifecycle_livedata", - "androidx.lifecycle:lifecycle-livedata-core": "@maven//:androidx_lifecycle_lifecycle_livedata_core", - "androidx.lifecycle:lifecycle-livedata-core-ktx": "@maven//:androidx_lifecycle_lifecycle_livedata_core_ktx", - "androidx.lifecycle:lifecycle-runtime": "@maven//:androidx_lifecycle_lifecycle_runtime", - "androidx.lifecycle:lifecycle-runtime-ktx": "@maven//:androidx_lifecycle_lifecycle_runtime_ktx", - "androidx.lifecycle:lifecycle-viewmodel": "@maven//:androidx_lifecycle_lifecycle_viewmodel", - "androidx.lifecycle:lifecycle-viewmodel-ktx": "@maven//:androidx_lifecycle_lifecycle_viewmodel_ktx", - "androidx.versionedparcelable:versionedparcelable": "@maven//:androidx_versionedparcelable_versionedparcelable", - "org.jetbrains.kotlin:kotlin-stdlib": "@maven//:org_jetbrains_kotlin_kotlin_stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common": "@maven//:org_jetbrains_kotlin_kotlin_stdlib_common", - "org.jetbrains.kotlin:kotlin-stdlib-jdk7": "@maven//:org_jetbrains_kotlin_kotlin_stdlib_jdk7", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8": "@maven//:org_jetbrains_kotlin_kotlin_stdlib_jdk8", - "org.jetbrains.kotlinx:kotlinx-coroutines-android": "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_android", - "org.jetbrains.kotlinx:kotlinx-coroutines-core": "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core", - "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm": "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm", - "org.jetbrains:annotations": "@maven//:org_jetbrains_annotations", - }, - repositories = [ - "https://dl.google.com/dl/android/maven2/", - "https://repo.maven.apache.org/maven2/", - ], - resolve_timeout = 1000, - version_conflict_policy = "pinned", + name = "debug_maven", + artifacts = [ + "androidx.annotation:annotation:1.1.0" +, + "androidx.arch.core:core-common:2.1.0" +, + "androidx.arch.core:core-runtime:2.1.0" +, + "androidx.collection:collection:1.0.0" +, + "androidx.core:core-ktx:1.2.0" +, + "androidx.core:core:1.3.2" +, + "androidx.customview:customview:1.0.0" +, + "androidx.lifecycle:lifecycle-common:2.2.0" +, + "androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0" +, + "androidx.lifecycle:lifecycle-livedata-core:2.2.0" +, + "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0" +, + "androidx.lifecycle:lifecycle-livedata:2.2.0" +, + "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0" +, + "androidx.lifecycle:lifecycle-runtime:2.2.0" +, + "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0" +, + "androidx.lifecycle:lifecycle-viewmodel:2.2.0" +, + "androidx.paging:paging-common-ktx:3.1.1" +, + "androidx.paging:paging-common:3.1.1" +, + "androidx.paging:paging-runtime:3.1.1" +, + "androidx.recyclerview:recyclerview:1.2.0" +, + "androidx.versionedparcelable:versionedparcelable:1.1.0" +, + "org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31" +, + "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30" +, + "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30" +, + "org.jetbrains.kotlin:kotlin-stdlib:1.5.31" +, + "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2" +, + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2" +, + "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2" +, + "org.jetbrains:annotations:13.0" +, + ], + repositories = [ + "https://dl.google.com/dl/android/maven2/", + "https://repo.maven.apache.org/maven2/", + ] , + jetify = True, + jetify_include_list = [ + "android.arch.core:common", + "android.arch.core:runtime", + "android.arch.lifecycle:common", + "android.arch.lifecycle:livedata", + "android.arch.lifecycle:livedata-core", + "android.arch.lifecycle:runtime", + "android.arch.lifecycle:viewmodel", + "android.arch.paging:common", + "com.android.support:cardview-v7", + "com.android.support:collections", + "com.android.support:customview", + "com.android.support:recyclerview-v7", + "com.android.support:support-annotations", + "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", + "com.android.support:versionedparcelable", + ], + fail_on_missing_checksum = False, + resolve_timeout = 1000, + excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], + override_targets = { + "androidx.annotation:annotation" : "@maven//:androidx_annotation_annotation_jvm", + "androidx.arch.core:core-common" : "@maven//:androidx_arch_core_core_common", + "androidx.arch.core:core-runtime" : "@maven//:androidx_arch_core_core_runtime", + "androidx.collection:collection" : "@maven//:androidx_collection_collection", + "androidx.core:core" : "@maven//:androidx_core_core", + "androidx.core:core-ktx" : "@maven//:androidx_core_core_ktx", + "androidx.customview:customview" : "@maven//:androidx_customview_customview", + "androidx.lifecycle:lifecycle-common" : "@maven//:androidx_lifecycle_lifecycle_common", + "androidx.lifecycle:lifecycle-livedata" : "@maven//:androidx_lifecycle_lifecycle_livedata", + "androidx.lifecycle:lifecycle-livedata-core" : "@maven//:androidx_lifecycle_lifecycle_livedata_core", + "androidx.lifecycle:lifecycle-livedata-core-ktx" : "@maven//:androidx_lifecycle_lifecycle_livedata_core_ktx", + "androidx.lifecycle:lifecycle-runtime" : "@maven//:androidx_lifecycle_lifecycle_runtime", + "androidx.lifecycle:lifecycle-runtime-ktx" : "@maven//:androidx_lifecycle_lifecycle_runtime_ktx", + "androidx.lifecycle:lifecycle-viewmodel" : "@maven//:androidx_lifecycle_lifecycle_viewmodel", + "androidx.lifecycle:lifecycle-viewmodel-ktx" : "@maven//:androidx_lifecycle_lifecycle_viewmodel_ktx", + "androidx.versionedparcelable:versionedparcelable" : "@maven//:androidx_versionedparcelable_versionedparcelable", + "org.jetbrains.kotlin:kotlin-stdlib" : "@maven//:org_jetbrains_kotlin_kotlin_stdlib", + "org.jetbrains.kotlin:kotlin-stdlib-common" : "@maven//:org_jetbrains_kotlin_kotlin_stdlib_common", + "org.jetbrains.kotlin:kotlin-stdlib-jdk7" : "@maven//:org_jetbrains_kotlin_kotlin_stdlib_jdk7", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8" : "@maven//:org_jetbrains_kotlin_kotlin_stdlib_jdk8", + "org.jetbrains.kotlinx:kotlinx-coroutines-android" : "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_android", + "org.jetbrains.kotlinx:kotlinx-coroutines-core" : "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core", + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm" : "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm", + "org.jetbrains:annotations" : "@maven//:org_jetbrains_annotations", + }, + maven_install_json = "//:debug_maven_install.json", + version_conflict_policy = "pinned", + fail_if_repin_required = False, + additional_coursier_options = [ + "--parallel", + "12", + ] ) -load("@debug_maven//:defs.bzl", debug_maven_pinned_maven_install = "pinned_maven_install") +load("@debug_maven//:defs.bzl", debug_maven_pinned_maven_install = "pinned_maven_install") debug_maven_pinned_maven_install() - maven_install( - name = "ksp_maven", - artifacts = [ - "com.squareup.moshi:moshi-kotlin-codegen:1.15.0", - ], - excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], - fail_if_repin_required = False, - fail_on_missing_checksum = False, - maven_install_json = "//:ksp_maven_install.json", - repositories = [ - "https://repo.maven.apache.org/maven2/", - ], - resolve_timeout = 1000, - version_conflict_policy = "pinned", + name = "ksp_maven", + artifacts = [ + "com.squareup.moshi:moshi-kotlin-codegen:1.15.0" +, + ], + repositories = [ + "https://repo.maven.apache.org/maven2/", + ] , + fail_on_missing_checksum = False, + resolve_timeout = 1000, + excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], + maven_install_json = "//:ksp_maven_install.json", + version_conflict_policy = "pinned", + fail_if_repin_required = False, + additional_coursier_options = [ + "--parallel", + "12", + ] ) -load("@ksp_maven//:defs.bzl", ksp_maven_pinned_maven_install = "pinned_maven_install") +load("@ksp_maven//:defs.bzl", ksp_maven_pinned_maven_install = "pinned_maven_install") ksp_maven_pinned_maven_install() - maven_install( - name = "lint_maven", - artifacts = [ - "com.google.auto.service:auto-service-annotations:1.1.1", - "com.slack.lint:slack-lint-checks:0.2.3", - ], - excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], - fail_if_repin_required = False, - fail_on_missing_checksum = False, - jetify = True, - jetify_include_list = [ - "com.android.support:cardview-v7", - "com.android.support:support-annotations", - "com.android.support:support-compat", - "com.android.support:support-core-ui", - "com.android.support:support-core-utils", - ], - maven_install_json = "//:lint_maven_install.json", - override_targets = { - "com.google.auto.service:auto-service-annotations": "@maven//:com_google_auto_service_auto_service_annotations", - }, - repositories = [ - "https://repo.maven.apache.org/maven2/", - ], - resolve_timeout = 1000, - version_conflict_policy = "pinned", + name = "lint_maven", + artifacts = [ + "com.google.auto.service:auto-service-annotations:1.1.1" +, + "com.slack.lint:slack-lint-checks:0.2.3" +, + ], + repositories = [ + "https://repo.maven.apache.org/maven2/", + ] , + jetify = True, + jetify_include_list = [ + "com.android.support:cardview-v7", + "com.android.support:support-annotations", + "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", + ], + fail_on_missing_checksum = False, + resolve_timeout = 1000, + excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], + override_targets = { + "com.google.auto.service:auto-service-annotations" : "@maven//:com_google_auto_service_auto_service_annotations", + }, + maven_install_json = "//:lint_maven_install.json", + version_conflict_policy = "pinned", + fail_if_repin_required = False, + additional_coursier_options = [ + "--parallel", + "12", + ] ) -load("@lint_maven//:defs.bzl", lint_maven_pinned_maven_install = "pinned_maven_install") +load("@lint_maven//:defs.bzl", lint_maven_pinned_maven_install = "pinned_maven_install") lint_maven_pinned_maven_install() - maven_install( - name = "maven", - artifacts = DAGGER_ARTIFACTS + GRAB_BAZEL_COMMON_ARTIFACTS + [ - "androidx.activity:activity-compose:1.7.2", - "androidx.activity:activity-ktx:1.7.2", - "androidx.activity:activity:1.7.2", - "androidx.annotation:annotation-experimental:1.4.1", - "androidx.annotation:annotation-jvm:1.8.1", - "androidx.annotation:annotation:1.8.1", - "androidx.appcompat:appcompat-resources:1.6.1", - "androidx.appcompat:appcompat:1.6.1", - "androidx.arch.core:core-common:2.2.0", - "androidx.arch.core:core-runtime:2.2.0", - "androidx.autofill:autofill:1.0.0", - "androidx.collection:collection-jvm:1.4.4", - "androidx.collection:collection-ktx:1.4.4", - "androidx.collection:collection:1.4.4", - "androidx.compose.animation:animation-android:1.7.8", - "androidx.compose.animation:animation-core-android:1.7.8", - "androidx.compose.animation:animation-core:1.7.8", - "androidx.compose.animation:animation:1.7.8", - "androidx.compose.foundation:foundation-android:1.7.8", - "androidx.compose.foundation:foundation-layout-android:1.7.8", - "androidx.compose.foundation:foundation-layout:1.7.8", - "androidx.compose.foundation:foundation:1.7.8", - "androidx.compose.material:material-android:1.7.8", - "androidx.compose.material:material-ripple-android:1.7.8", - "androidx.compose.material:material-ripple:1.7.8", - "androidx.compose.material:material:1.7.8", - "androidx.compose.runtime:runtime-android:1.7.8", - "androidx.compose.runtime:runtime-saveable-android:1.7.8", - "androidx.compose.runtime:runtime-saveable:1.7.8", - "androidx.compose.runtime:runtime:1.7.8", - "androidx.compose.ui:ui-android:1.7.8", - "androidx.compose.ui:ui-geometry-android:1.7.8", - "androidx.compose.ui:ui-geometry:1.7.8", - "androidx.compose.ui:ui-graphics-android:1.7.8", - "androidx.compose.ui:ui-graphics:1.7.8", - "androidx.compose.ui:ui-test-junit4:1.4.3", - "androidx.compose.ui:ui-test-manifest:1.4.3", - "androidx.compose.ui:ui-test:1.4.3", - "androidx.compose.ui:ui-text-android:1.7.8", - "androidx.compose.ui:ui-text:1.7.8", - "androidx.compose.ui:ui-tooling-android:1.7.8", - "androidx.compose.ui:ui-tooling-data-android:1.7.8", - "androidx.compose.ui:ui-tooling-data:1.7.8", - "androidx.compose.ui:ui-tooling-preview-android:1.7.8", - "androidx.compose.ui:ui-tooling-preview:1.7.8", - "androidx.compose.ui:ui-tooling:1.7.8", - "androidx.compose.ui:ui-unit-android:1.7.8", - "androidx.compose.ui:ui-unit:1.7.8", - "androidx.compose.ui:ui-util-android:1.7.8", - "androidx.compose.ui:ui-util:1.7.8", - "androidx.compose.ui:ui:1.7.8", - "androidx.concurrent:concurrent-futures:1.1.0", - "androidx.constraintlayout:constraintlayout-core:1.0.4", - maven.artifact( - artifact = "constraintlayout", - exclusions = [ - "androidx.appcompat:appcompat", - "androidx.core:core", - ], - group = "androidx.constraintlayout", - version = "2.1.4", - ), - "androidx.core:core-ktx:1.13.1", - "androidx.core:core:1.13.1", - "androidx.cursoradapter:cursoradapter:1.0.0", - "androidx.customview:customview-poolingcontainer:1.0.0", - "androidx.customview:customview:1.0.0", - "androidx.databinding:databinding-adapters:8.6.1", - "androidx.databinding:databinding-common:8.6.1", - "androidx.databinding:databinding-ktx:8.6.1", - "androidx.databinding:databinding-runtime:8.6.1", - "androidx.databinding:viewbinding:8.6.1", - "androidx.drawerlayout:drawerlayout:1.0.0", - "androidx.emoji2:emoji2-views-helper:1.3.0", - "androidx.emoji2:emoji2:1.3.0", - "androidx.fragment:fragment:1.3.6", - "androidx.graphics:graphics-path:1.0.1", - "androidx.interpolator:interpolator:1.0.0", - "androidx.lifecycle:lifecycle-common-jvm:2.8.3", - "androidx.lifecycle:lifecycle-common:2.8.3", - "androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.3", - "androidx.lifecycle:lifecycle-livedata-core:2.8.3", - "androidx.lifecycle:lifecycle-livedata:2.8.3", - "androidx.lifecycle:lifecycle-process:2.8.3", - "androidx.lifecycle:lifecycle-runtime-android:2.8.3", - "androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3", - "androidx.lifecycle:lifecycle-runtime-compose:2.8.3", - "androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.3", - "androidx.lifecycle:lifecycle-runtime-ktx:2.8.3", - "androidx.lifecycle:lifecycle-runtime:2.8.3", - "androidx.lifecycle:lifecycle-service:2.8.3", - "androidx.lifecycle:lifecycle-viewmodel-android:2.8.3", - "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3", - "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.3", - "androidx.lifecycle:lifecycle-viewmodel:2.8.3", - "androidx.loader:loader:1.0.0", - "androidx.profileinstaller:profileinstaller:1.3.1", - "androidx.resourceinspection:resourceinspection-annotation:1.0.1", - "androidx.savedstate:savedstate-ktx:1.2.1", - "androidx.savedstate:savedstate:1.2.1", - "androidx.startup:startup-runtime:1.1.1", - "androidx.test.espresso:espresso-core:3.5.1", - "androidx.test.espresso:espresso-idling-resource:3.5.1", - "androidx.test.ext:junit:1.1.5", - "androidx.test.services:storage:1.4.2", - "androidx.test:annotation:1.0.1", - "androidx.test:core:1.5.0", - "androidx.test:monitor:1.6.1", - "androidx.test:rules:1.5.0", - "androidx.test:runner:1.5.2", - "androidx.tracing:tracing:1.0.0", - "androidx.vectordrawable:vectordrawable-animated:1.1.0", - "androidx.vectordrawable:vectordrawable:1.1.0", - "androidx.versionedparcelable:versionedparcelable:1.1.1", - "androidx.viewpager:viewpager:1.0.0", - "com.android.tools.build:manifest-merger:31.5.0-alpha02", - "com.android.tools.external.com-intellij:intellij-core:31.5.0-alpha02", - "com.android.tools.external.com-intellij:kotlin-compiler:31.5.0-alpha02", - "com.android.tools.external.org-jetbrains:uast:31.5.0-alpha02", - "com.android.tools.layoutlib:layoutlib-api:31.5.0-alpha02", - "com.android.tools.lint:lint-api:31.5.0-alpha02", - "com.android.tools.lint:lint-checks:31.5.0-alpha02", - "com.android.tools.lint:lint-model:31.5.0-alpha02", - "com.android.tools:annotations:31.5.0-alpha02", - "com.android.tools:common:31.5.0-alpha02", - "com.android.tools:repository:31.5.0-alpha02", - "com.android.tools:sdk-common:31.5.0-alpha02", - "com.android.tools:sdklib:31.5.0-alpha02", - "com.google.ar.sceneform.ux:sceneform-ux:1.15.0", - "com.google.ar.sceneform:core:1.15.0", - "com.google.ar.sceneform:filament-android:1.15.0", - "com.google.ar.sceneform:rendering:1.15.0", - "com.google.ar.sceneform:sceneform-base:1.15.0", - "com.google.ar:core:1.15.0", - "com.google.auto.service:auto-service-annotations:1.1.1", - "com.google.auto.service:auto-service:1.1.1", - "com.google.auto:auto-common:1.2.1", - "com.google.code.findbugs:jsr305:3.0.2", - "com.google.dagger:dagger:2.47", - "com.google.errorprone:error_prone_annotations:2.18.0", - "com.google.guava:failureaccess:1.0.1", - "com.google.guava:guava:32.0.1-jre", - "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava", - "com.google.j2objc:j2objc-annotations:2.8", - "com.jakewharton.timber:timber:5.0.1", - "com.squareup.moshi:moshi:1.15.0", - "com.squareup.okio:okio:2.10.0", - "com.squareup:javawriter:2.1.1", - "commons-io:commons-io:2.13.0", - "javax.inject:javax.inject:1", - "junit:junit:4.13.2", - "net.sf.kxml:kxml2:2.3.0", - "org.checkerframework:checker-compat-qual:2.5.5", - "org.checkerframework:checker-qual:3.33.0", - "org.hamcrest:hamcrest-core:1.3", - "org.hamcrest:hamcrest-integration:1.3", - "org.hamcrest:hamcrest-library:1.3", - "org.jetbrains.kotlin:kotlin-reflect:1.9.20", - "org.jetbrains.kotlin:kotlin-stdlib-common:1.9.25", - "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20", - "org.jetbrains.kotlin:kotlin-stdlib:1.9.25", - "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3", - "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3", - "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3", - "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3", - "org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.6.4", - "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4", - "org.jetbrains:annotations:23.0.0", - "org.ow2.asm:asm-tree:9.6", - "org.ow2.asm:asm:9.6", - ], - excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], - fail_if_repin_required = False, - fail_on_missing_checksum = False, - jetify = True, - jetify_include_list = [ - "android.arch.core:common", - "android.arch.core:runtime", - "android.arch.lifecycle:common", - "android.arch.lifecycle:livedata", - "android.arch.lifecycle:livedata-core", - "android.arch.lifecycle:runtime", - "android.arch.lifecycle:viewmodel", - "com.android.databinding:baseLibrary", - "com.android.databinding:library", - "com.android.support.test.espresso:espresso-core", - "com.android.support.test.espresso:espresso-idling-resource", - "com.android.support.test:monitor", - "com.android.support.test:runner", - "com.android.support:animated-vector-drawable", - "com.android.support:appcompat-v7", - "com.android.support:cardview-v7", - "com.android.support:collections", - "com.android.support:cursoradapter", - "com.android.support:customview", - "com.android.support:drawerlayout", - "com.android.support:interpolator", - "com.android.support:loader", - "com.android.support:support-annotations", - "com.android.support:support-compat", - "com.android.support:support-core-ui", - "com.android.support:support-core-utils", - "com.android.support:support-fragment", - "com.android.support:support-vector-drawable", - "com.android.support:versionedparcelable", - "com.android.support:viewpager", - "com.google.ar.sceneform.ux:sceneform-ux", - ], - maven_install_json = "//:maven_install.json", - override_targets = { - "androidx.annotation:annotation": "@maven//:androidx_annotation_annotation_jvm", - }, - repositories = [ - "https://dl.google.com/dl/android/maven2/", - "https://repo.maven.apache.org/maven2/", - ] + DAGGER_REPOSITORIES, - resolve_timeout = 1000, - version_conflict_policy = "pinned", + name = "maven", + artifacts = DAGGER_ARTIFACTS + GRAB_BAZEL_COMMON_ARTIFACTS + [ + "androidx.activity:activity-compose:1.7.2" +, + "androidx.activity:activity-ktx:1.7.2" +, + "androidx.activity:activity:1.7.2" +, + "androidx.annotation:annotation-experimental:1.4.1" +, + "androidx.annotation:annotation-jvm:1.8.1" +, + "androidx.annotation:annotation:1.8.1" +, + "androidx.appcompat:appcompat-resources:1.6.1" +, + "androidx.appcompat:appcompat:1.6.1" +, + "androidx.arch.core:core-common:2.2.0" +, + "androidx.arch.core:core-runtime:2.2.0" +, + "androidx.autofill:autofill:1.0.0" +, + "androidx.collection:collection-jvm:1.4.4" +, + "androidx.collection:collection-ktx:1.4.4" +, + "androidx.collection:collection:1.4.4" +, + "androidx.compose.animation:animation-android:1.7.8" +, + "androidx.compose.animation:animation-core-android:1.7.8" +, + "androidx.compose.animation:animation-core:1.7.8" +, + "androidx.compose.animation:animation:1.7.8" +, + "androidx.compose.foundation:foundation-android:1.7.8" +, + "androidx.compose.foundation:foundation-layout-android:1.7.8" +, + "androidx.compose.foundation:foundation-layout:1.7.8" +, + "androidx.compose.foundation:foundation:1.7.8" +, + "androidx.compose.material:material-android:1.7.8" +, + "androidx.compose.material:material-ripple-android:1.7.8" +, + "androidx.compose.material:material-ripple:1.7.8" +, + "androidx.compose.material:material:1.7.8" +, + "androidx.compose.runtime:runtime-android:1.7.8" +, + "androidx.compose.runtime:runtime-saveable-android:1.7.8" +, + "androidx.compose.runtime:runtime-saveable:1.7.8" +, + "androidx.compose.runtime:runtime:1.7.8" +, + "androidx.compose.ui:ui-android:1.7.8" +, + "androidx.compose.ui:ui-geometry-android:1.7.8" +, + "androidx.compose.ui:ui-geometry:1.7.8" +, + "androidx.compose.ui:ui-graphics-android:1.7.8" +, + "androidx.compose.ui:ui-graphics:1.7.8" +, + "androidx.compose.ui:ui-test-junit4:1.4.3" +, + "androidx.compose.ui:ui-test-manifest:1.4.3" +, + "androidx.compose.ui:ui-test:1.4.3" +, + "androidx.compose.ui:ui-text-android:1.7.8" +, + "androidx.compose.ui:ui-text:1.7.8" +, + "androidx.compose.ui:ui-tooling-android:1.7.8" +, + "androidx.compose.ui:ui-tooling-data-android:1.7.8" +, + "androidx.compose.ui:ui-tooling-data:1.7.8" +, + "androidx.compose.ui:ui-tooling-preview-android:1.7.8" +, + "androidx.compose.ui:ui-tooling-preview:1.7.8" +, + "androidx.compose.ui:ui-tooling:1.7.8" +, + "androidx.compose.ui:ui-unit-android:1.7.8" +, + "androidx.compose.ui:ui-unit:1.7.8" +, + "androidx.compose.ui:ui-util-android:1.7.8" +, + "androidx.compose.ui:ui-util:1.7.8" +, + "androidx.compose.ui:ui:1.7.8" +, + "androidx.concurrent:concurrent-futures:1.1.0" +, + "androidx.constraintlayout:constraintlayout-core:1.0.4" +, + maven.artifact( + group = "androidx.constraintlayout", + artifact = "constraintlayout", + version = "2.1.4", + exclusions = [ + "androidx.appcompat:appcompat" +, + "androidx.core:core" +, + ] ) -load("@maven//:defs.bzl", maven_pinned_maven_install = "pinned_maven_install") +, + "androidx.core:core-ktx:1.13.1" +, + "androidx.core:core:1.13.1" +, + "androidx.cursoradapter:cursoradapter:1.0.0" +, + "androidx.customview:customview-poolingcontainer:1.0.0" +, + "androidx.customview:customview:1.0.0" +, + "androidx.databinding:databinding-adapters:8.6.1" +, + "androidx.databinding:databinding-common:8.6.1" +, + "androidx.databinding:databinding-ktx:8.6.1" +, + "androidx.databinding:databinding-runtime:8.6.1" +, + "androidx.databinding:viewbinding:8.6.1" +, + "androidx.drawerlayout:drawerlayout:1.0.0" +, + "androidx.emoji2:emoji2-views-helper:1.3.0" +, + "androidx.emoji2:emoji2:1.3.0" +, + "androidx.fragment:fragment:1.3.6" +, + "androidx.graphics:graphics-path:1.0.1" +, + "androidx.interpolator:interpolator:1.0.0" +, + "androidx.lifecycle:lifecycle-common-jvm:2.8.3" +, + "androidx.lifecycle:lifecycle-common:2.8.3" +, + "androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.3" +, + "androidx.lifecycle:lifecycle-livedata-core:2.8.3" +, + "androidx.lifecycle:lifecycle-livedata:2.8.3" +, + "androidx.lifecycle:lifecycle-process:2.8.3" +, + "androidx.lifecycle:lifecycle-runtime-android:2.8.3" +, + "androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3" +, + "androidx.lifecycle:lifecycle-runtime-compose:2.8.3" +, + "androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.3" +, + "androidx.lifecycle:lifecycle-runtime-ktx:2.8.3" +, + "androidx.lifecycle:lifecycle-runtime:2.8.3" +, + "androidx.lifecycle:lifecycle-service:2.8.3" +, + "androidx.lifecycle:lifecycle-viewmodel-android:2.8.3" +, + "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3" +, + "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.3" +, + "androidx.lifecycle:lifecycle-viewmodel:2.8.3" +, + "androidx.loader:loader:1.0.0" +, + "androidx.profileinstaller:profileinstaller:1.3.1" +, + "androidx.resourceinspection:resourceinspection-annotation:1.0.1" +, + "androidx.savedstate:savedstate-ktx:1.2.1" +, + "androidx.savedstate:savedstate:1.2.1" +, + "androidx.startup:startup-runtime:1.1.1" +, + "androidx.test.espresso:espresso-core:3.5.1" +, + "androidx.test.espresso:espresso-idling-resource:3.5.1" +, + "androidx.test.ext:junit:1.1.5" +, + "androidx.test.services:storage:1.4.2" +, + "androidx.test:annotation:1.0.1" +, + "androidx.test:core:1.5.0" +, + "androidx.test:monitor:1.6.1" +, + "androidx.test:rules:1.5.0" +, + "androidx.test:runner:1.5.2" +, + "androidx.tracing:tracing:1.0.0" +, + "androidx.vectordrawable:vectordrawable-animated:1.1.0" +, + "androidx.vectordrawable:vectordrawable:1.1.0" +, + "androidx.versionedparcelable:versionedparcelable:1.1.1" +, + "androidx.viewpager:viewpager:1.0.0" +, + "com.android.tools.build:manifest-merger:31.5.0-alpha02" +, + "com.android.tools.external.com-intellij:intellij-core:31.5.0-alpha02" +, + "com.android.tools.external.com-intellij:kotlin-compiler:31.5.0-alpha02" +, + "com.android.tools.external.org-jetbrains:uast:31.5.0-alpha02" +, + "com.android.tools.layoutlib:layoutlib-api:31.5.0-alpha02" +, + "com.android.tools.lint:lint-api:31.5.0-alpha02" +, + "com.android.tools.lint:lint-checks:31.5.0-alpha02" +, + "com.android.tools.lint:lint-model:31.5.0-alpha02" +, + "com.android.tools:annotations:31.5.0-alpha02" +, + "com.android.tools:common:31.5.0-alpha02" +, + "com.android.tools:repository:31.5.0-alpha02" +, + "com.android.tools:sdk-common:31.5.0-alpha02" +, + "com.android.tools:sdklib:31.5.0-alpha02" +, + "com.google.ar.sceneform.ux:sceneform-ux:1.15.0" +, + "com.google.ar.sceneform:core:1.15.0" +, + "com.google.ar.sceneform:filament-android:1.15.0" +, + "com.google.ar.sceneform:rendering:1.15.0" +, + "com.google.ar.sceneform:sceneform-base:1.15.0" +, + "com.google.ar:core:1.15.0" +, + "com.google.auto.service:auto-service-annotations:1.1.1" +, + "com.google.auto.service:auto-service:1.1.1" +, + "com.google.auto:auto-common:1.2.1" +, + "com.google.code.findbugs:jsr305:3.0.2" +, + "com.google.dagger:dagger:2.47" +, + "com.google.errorprone:error_prone_annotations:2.18.0" +, + "com.google.guava:failureaccess:1.0.1" +, + "com.google.guava:guava:32.0.1-jre" +, + "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" +, + "com.google.j2objc:j2objc-annotations:2.8" +, + "com.jakewharton.timber:timber:5.0.1" +, + "com.squareup.moshi:moshi:1.15.0" +, + "com.squareup.okio:okio:2.10.0" +, + "com.squareup:javawriter:2.1.1" +, + "commons-io:commons-io:2.13.0" +, + "javax.inject:javax.inject:1" +, + "junit:junit:4.13.2" +, + "net.sf.kxml:kxml2:2.3.0" +, + "org.checkerframework:checker-compat-qual:2.5.5" +, + "org.checkerframework:checker-qual:3.33.0" +, + "org.hamcrest:hamcrest-core:1.3" +, + "org.hamcrest:hamcrest-integration:1.3" +, + "org.hamcrest:hamcrest-library:1.3" +, + "org.jetbrains.kotlin:kotlin-reflect:1.9.20" +, + "org.jetbrains.kotlin:kotlin-stdlib-common:1.9.25" +, + "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20" +, + "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20" +, + "org.jetbrains.kotlin:kotlin-stdlib:1.9.25" +, + "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" +, + "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3" +, + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3" +, + "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3" +, + "org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.6.4" +, + "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4" +, + "org.jetbrains:annotations:23.0.0" +, + "org.ow2.asm:asm-tree:9.6" +, + "org.ow2.asm:asm:9.6" +, + ], + repositories = [ + "https://dl.google.com/dl/android/maven2/", + "https://repo.maven.apache.org/maven2/", + ] + DAGGER_REPOSITORIES, + jetify = True, + jetify_include_list = [ + "android.arch.core:common", + "android.arch.core:runtime", + "android.arch.lifecycle:common", + "android.arch.lifecycle:livedata", + "android.arch.lifecycle:livedata-core", + "android.arch.lifecycle:runtime", + "android.arch.lifecycle:viewmodel", + "com.android.databinding:baseLibrary", + "com.android.databinding:library", + "com.android.support.test.espresso:espresso-core", + "com.android.support.test.espresso:espresso-idling-resource", + "com.android.support.test:monitor", + "com.android.support.test:runner", + "com.android.support:animated-vector-drawable", + "com.android.support:appcompat-v7", + "com.android.support:cardview-v7", + "com.android.support:collections", + "com.android.support:cursoradapter", + "com.android.support:customview", + "com.android.support:drawerlayout", + "com.android.support:interpolator", + "com.android.support:loader", + "com.android.support:support-annotations", + "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", + "com.android.support:support-fragment", + "com.android.support:support-vector-drawable", + "com.android.support:versionedparcelable", + "com.android.support:viewpager", + "com.google.ar.sceneform.ux:sceneform-ux", + ], + fail_on_missing_checksum = False, + resolve_timeout = 1000, + excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], + override_targets = { + "androidx.annotation:annotation" : "@maven//:androidx_annotation_annotation_jvm", + }, + maven_install_json = "//:maven_install.json", + version_conflict_policy = "pinned", + fail_if_repin_required = False, + additional_coursier_options = [ + "--parallel", + "12", + ] +) -maven_pinned_maven_install() +load("@maven//:defs.bzl", maven_pinned_maven_install = "pinned_maven_install") +maven_pinned_maven_install() android_sdk_repository( - name = "androidsdk", - api_level = 34, - build_tools_version = "33.0.1", + name = "androidsdk", + api_level = 34, + build_tools_version = "33.0.1" ) android_ndk_repository( - name = "androidndk", - api_level = 30, + name = "androidndk", + api_level = 30 ) git_repository( - name = "tools_android", - commit = "7224f55d7fafe12a72066eb1a2ad1e1526a854c4", - remote = "https://github.com/bazelbuild/tools_android.git", + name = "tools_android", + commit = "7224f55d7fafe12a72066eb1a2ad1e1526a854c4", + remote = "https://github.com/bazelbuild/tools_android.git" ) -load("@tools_android//tools/googleservices:defs.bzl", "google_services_workspace_dependencies") +load("@tools_android//tools/googleservices:defs.bzl", "google_services_workspace_dependencies") google_services_workspace_dependencies() diff --git a/build.gradle b/build.gradle index db5a4f3e..cab551cb 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ grazel { rules { bazelCommon { gitRepository { - commit = "8cfb7bcb84f6d9631b01bb14c25644030ad2ecf8" + commit = "0962a9aaeee64ed17eb65b577060693c3b3dc244" remote = "https://github.com/grab/grab-bazel-common.git" } toolchains { @@ -92,9 +92,9 @@ grazel { } mavenInstall { httpArchiveRepository { - sha256 = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac" - stripPrefix = "rules_jvm_external-5.3" - url = String.format("https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz", "5.3", "5.3") + sha256 = "e5f83b8f2678d2b26441e5eafefb1b061826608417b8d24e5e8e15e585eab1ba" + stripPrefix = "rules_jvm_external-6.10" + url = String.format("https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz", "6.10", "6.10") } includeCredentials = false resolveTimeout = 1000 diff --git a/constants.gradle b/constants.gradle index 9d36b1f3..03c8d56d 100644 --- a/constants.gradle +++ b/constants.gradle @@ -15,7 +15,7 @@ */ ext { groupId = "com.grab.grazel" - versionName = project.hasProperty("versionName") ? versionName : "0.4.2-alpha.13" + versionName = project.hasProperty("versionName") ? versionName : "0.4.2-alpha.14" website = "https://grab.github.io/Grazel/" } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt index dd8877a9..9bd82b69 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt @@ -18,9 +18,11 @@ package com.grab.grazel.bazel.rules import com.grab.grazel.bazel.starlark.StatementsBuilder import com.grab.grazel.bazel.starlark.add +import com.grab.grazel.bazel.starlark.array import com.grab.grazel.bazel.starlark.function import com.grab.grazel.bazel.starlark.load import com.grab.grazel.bazel.starlark.quote +import com.grab.grazel.extension.PreBazelCommonArchive const val GRAB_BAZEL_COMMON = "grab_bazel_common" const val GRAB_BAZEL_COMMON_ARTIFACTS = "GRAB_BAZEL_COMMON_ARTIFACTS" @@ -49,13 +51,18 @@ fun StatementsBuilder.registerToolchain(toolchain: String) { fun StatementsBuilder.bazelCommonRepository( repositoryRule: GitRepositoryRule, buildifierVersion: String, + pinnedMavenInstall: Boolean = true, + additionalCoursierOptions: List = listOf("--parallel", "12"), ) { add(repositoryRule) val bazelCommonRepoName = repositoryRule.name bazelCommonDependencies(bazelCommonRepoName) + bazelCommonDepsInit(bazelCommonRepoName) bazelCommonInitialize( bazelCommonRepoName, buildifierVersion, + pinnedMavenInstall, + additionalCoursierOptions, ) pinBazelCommonArtifacts(bazelCommonRepoName) } @@ -70,13 +77,48 @@ fun StatementsBuilder.bazelCommonDependencies(bazelCommonRepoName: String) { function("bazel_common_dependencies") } +fun StatementsBuilder.bazelCommonDepsInit(bazelCommonRepoName: String) { + load("@${bazelCommonRepoName}//rules:deps_init.bzl", "bazel_common_deps_init") + function("bazel_common_deps_init") +} + fun StatementsBuilder.bazelCommonInitialize( bazelCommonRepoName: String, buildifierVersion: String, + pinnedMavenInstall: Boolean = true, + additionalCoursierOptions: List = listOf("--parallel", "12"), ) { load("@${bazelCommonRepoName}//rules:setup.bzl", "bazel_common_setup") function("bazel_common_setup") { "patched_android_tools" `=` "True" "buildifier_version" `=` buildifierVersion.quote + "pinned_maven_install" `=` if (pinnedMavenInstall) "True" else "False" + if (additionalCoursierOptions.isNotEmpty()) { + "additional_coursier_options" `=` array(additionalCoursierOptions.quote) + } + } +} + +fun StatementsBuilder.preBazelCommonArchives(archives: List) { + archives.forEach { archive -> + function("http_archive") { + "name" `=` archive.name.quote + if (archive.urls.isNotEmpty()) { + "urls" `=` array(archive.urls.quote) + } else if (archive.url.isNotEmpty()) { + "url" `=` archive.url.quote + } + "sha256" `=` archive.sha256.quote + val stripPrefix = archive.stripPrefix + if (stripPrefix != null) { + "strip_prefix" `=` stripPrefix.quote + } + if (archive.patches.isNotEmpty()) { + "patches" `=` array(archive.patches.quote) + } + if (archive.patchArgs.isNotEmpty()) { + "patch_args" `=` array(archive.patchArgs.quote) + } + } } } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/MavenRules.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/MavenRules.kt index 7201cd00..76c7cbd9 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/MavenRules.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/MavenRules.kt @@ -91,6 +91,7 @@ fun StatementsBuilder.mavenInstall( overrideTargets: Map = emptyMap(), versionConflictPolicy: String? = null, artifactPinning: Boolean = false, + additionalCoursierOptions: List = emptyList(), ) { load("@$rulesJvmExternalName//:defs.bzl", "maven_install") load("@$rulesJvmExternalName//:specs.bzl", "maven") @@ -146,6 +147,10 @@ fun StatementsBuilder.mavenInstall( if (artifactPinning) { "fail_if_repin_required" `=` "False" } + + if (additionalCoursierOptions.isNotEmpty()) { + "additional_coursier_options" `=` array(additionalCoursierOptions.quote) + } } if (artifactPinning) { diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/BazelCommonExtension.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/BazelCommonExtension.kt index 1943c66e..1a174a86 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/BazelCommonExtension.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/BazelCommonExtension.kt @@ -19,11 +19,44 @@ package com.grab.grazel.extension import com.grab.grazel.bazel.rules.GRAB_BAZEL_COMMON import com.grab.grazel.bazel.rules.GitRepositoryRule import groovy.lang.Closure +import org.gradle.api.model.ObjectFactory +import org.gradle.api.provider.ListProperty +import org.gradle.api.provider.Property +import org.gradle.kotlin.dsl.listProperty +import org.gradle.kotlin.dsl.property + +/** + * Configuration for http archives needed before bazel_common initialization + * (e.g., remote_java_tools, rules_java_builtin, rules_java) + */ +open class PreBazelCommonArchive( + open var name: String = "", + open var sha256: String = "", + open var url: String = "", + open var urls: List = emptyList(), + open var stripPrefix: String? = null, + open var patches: List = emptyList(), + open var patchArgs: List = emptyList(), +) class BazelCommonExtension( + private val objects: ObjectFactory? = null, var repository: GitRepositoryRule = GitRepositoryRule(name = GRAB_BAZEL_COMMON), - var toolchains: CommonToolchainExtension = CommonToolchainExtension() + var toolchains: CommonToolchainExtension = CommonToolchainExtension(), + private val _preBazelCommonArchives: MutableList = mutableListOf(), ) { + var pinnedMavenInstall: Property? = objects?.property()?.convention(true) + var additionalCoursierOptions: ListProperty? = objects?.listProperty()?.convention( + listOf("--parallel", "12") + ) + + var preBazelCommonArchives: List + get() = _preBazelCommonArchives + set(value) { + _preBazelCommonArchives.clear() + _preBazelCommonArchives.addAll(value) + } + fun gitRepository(closure: Closure<*>) { closure.delegate = repository closure.call() diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/MavenInstallExtension.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/MavenInstallExtension.kt index 8aa18933..59dc1410 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/MavenInstallExtension.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/MavenInstallExtension.kt @@ -29,14 +29,15 @@ import org.gradle.kotlin.dsl.property internal const val RULES_JVM_EXTERNAL_NAME = "rules_jvm_external" internal const val RULES_JVM_EXTERNAL_SHA256 = - "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac" -internal const val RULES_JVM_EXTERNAl_TAG = "5.3" + "e5f83b8f2678d2b26441e5eafefb1b061826608417b8d24e5e8e15e585eab1ba" +internal const val RULES_JVM_EXTERNAl_TAG = "6.10" internal val MAVEN_INSTALL_REPOSITORY = HttpArchiveRule( name = RULES_JVM_EXTERNAL_NAME, sha256 = RULES_JVM_EXTERNAL_SHA256, stripPrefix = "rules_jvm_external-%s".format(RULES_JVM_EXTERNAl_TAG), - url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip".format( + url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz".format( + RULES_JVM_EXTERNAl_TAG, RULES_JVM_EXTERNAl_TAG ) ) @@ -57,6 +58,8 @@ internal val MAVEN_INSTALL_REPOSITORY = HttpArchiveRule( * `maven_install.override_targets` param. * @param jetifyIncludeList Maven artifacts in `groupId:artifact` format that should be added * `maven_install.jetify_include_list` + * @param additionalCoursierOptions Additional options to pass to Coursier, maps to + * `maven_install.additional_coursier_options` */ data class MavenInstallExtension( private val objects: ObjectFactory, @@ -70,6 +73,9 @@ data class MavenInstallExtension( var jetifyExcludeList: ListProperty = objects.listProperty(), var versionConflictPolicy: String? = null, var includeCredentials: Boolean = true, + var additionalCoursierOptions: ListProperty = objects.listProperty().convention( + listOf("--parallel", "12") + ), ) { // TODO GitRepositoryRule /** diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/RulesExtension.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/RulesExtension.kt index 18c10de9..bcb0acc0 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/RulesExtension.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/RulesExtension.kt @@ -50,7 +50,7 @@ data class DependenciesExtension( */ data class RulesExtension( private val objects: ObjectFactory, - val bazelCommon: BazelCommonExtension = BazelCommonExtension(), + val bazelCommon: BazelCommonExtension = BazelCommonExtension(objects), val googleServices: GoogleServicesExtension = GoogleServicesExtension(), val mavenInstall: MavenInstallExtension = MavenInstallExtension(objects), val kotlin: KotlinExtension = KotlinExtension(), diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/dependencies/MavenInstallArtifactsCalculator.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/dependencies/MavenInstallArtifactsCalculator.kt index 67806461..ddb2d1ec 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/dependencies/MavenInstallArtifactsCalculator.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/dependencies/MavenInstallArtifactsCalculator.kt @@ -120,7 +120,8 @@ constructor( artifactPinning = mavenInstallExtension.artifactPinning.enabled.get(), versionConflictPolicy = mavenInstallExtension.versionConflictPolicy, mavenInstallJson = mavenInstallJson.name, - isMavenInstallJsonEnabled = mavenInstallExtension.artifactPinning.enabled.get() && mavenInstallJson.exists() + isMavenInstallJsonEnabled = mavenInstallExtension.artifactPinning.enabled.get() && mavenInstallJson.exists(), + additionalCoursierOptions = mavenInstallExtension.additionalCoursierOptions.get() ) } @@ -151,7 +152,8 @@ constructor( artifactPinning = mavenInstallExtension.artifactPinning.enabled.get(), versionConflictPolicy = mavenInstallExtension.versionConflictPolicy, mavenInstallJson = kspMavenInstallJson.name, - isMavenInstallJsonEnabled = mavenInstallExtension.artifactPinning.enabled.get() && kspMavenInstallJson.exists() + isMavenInstallJsonEnabled = mavenInstallExtension.artifactPinning.enabled.get() && kspMavenInstallJson.exists(), + additionalCoursierOptions = mavenInstallExtension.additionalCoursierOptions.get() ) ) } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/dependencies/MavenInstallData.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/dependencies/MavenInstallData.kt index 200f37ab..74e68aab 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/dependencies/MavenInstallData.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/dependencies/MavenInstallData.kt @@ -21,7 +21,8 @@ internal data class MavenInstallData( * then in generated code maven_install_json will be commented out */ val isMavenInstallJsonEnabled: Boolean, - val versionConflictPolicy: String? + val versionConflictPolicy: String?, + val additionalCoursierOptions: List = listOf("--parallel", "12") ) internal data class JetifierConfig( diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/internal/WorkspaceBuilder.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/internal/WorkspaceBuilder.kt index 84dc09bd..eebce47a 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/internal/WorkspaceBuilder.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/internal/WorkspaceBuilder.kt @@ -30,6 +30,7 @@ import com.grab.grazel.bazel.rules.kotlinRepository import com.grab.grazel.bazel.rules.loadBazelCommonArtifacts import com.grab.grazel.bazel.rules.loadDaggerArtifactsAndRepositories import com.grab.grazel.bazel.rules.mavenInstall +import com.grab.grazel.bazel.rules.preBazelCommonArchives import com.grab.grazel.bazel.rules.registerKotlinToolchain import com.grab.grazel.bazel.rules.setupMavenInstall import com.grab.grazel.bazel.rules.toolAndroidRepository @@ -87,6 +88,12 @@ internal class WorkspaceBuilder( kotlinRules() + // Generate pre-bazel_common http_archive rules + val bazelCommon = grazelExtension.rules.bazelCommon + if (bazelCommon.preBazelCommonArchives.isNotEmpty()) { + preBazelCommonArchives(bazelCommon.preBazelCommonArchives) + } + bazelCommon() buildJvmRules() @@ -139,6 +146,7 @@ internal class WorkspaceBuilder( artifactPinning = mavenInstallData.artifactPinning, mavenInstallJson = mavenInstallData.mavenInstallJson, mavenInstallJsonEnabled = mavenInstallData.isMavenInstallJsonEnabled, + additionalCoursierOptions = mavenInstallData.additionalCoursierOptions, ) } } @@ -153,6 +161,8 @@ internal class WorkspaceBuilder( bazelCommonRepository( bazelCommonRepo, buildifier.releaseVersion, + bazelCommon.pinnedMavenInstall?.get() ?: true, + bazelCommon.additionalCoursierOptions?.get() ?: listOf("--parallel", "12"), ) } diff --git a/keystore/BUILD.bazel b/keystore/BUILD.bazel index bb11ee34..a44148b1 100644 --- a/keystore/BUILD.bazel +++ b/keystore/BUILD.bazel @@ -1,9 +1,10 @@ filegroup( - name = "debug-keystore", - srcs = [ - "debug.keystore", - ], - visibility = [ - "//visibility:public", - ], + name = "debug-keystore", + srcs = [ + "debug.keystore", + ], + visibility = [ + "//visibility:public", + ] ) + From d272448ed1ae3d0ea83502888a667a5067d96d26 Mon Sep 17 00:00:00 2001 From: "edwin.rahman" Date: Wed, 25 Feb 2026 18:44:35 +0700 Subject: [PATCH 2/6] Fix Formatting --- WORKSPACE | 1134 ++++++++++++++++++++++------------------------------- 1 file changed, 472 insertions(+), 662 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 4505f19e..edb89858 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,744 +1,554 @@ workspace(name = "grazel") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( - name = "io_bazel_rules_kotlin", - sha256 = "3b772976fec7bdcda1d84b9d39b176589424c047eb2175bed09aac630e50af43", - url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.6/rules_kotlin-v1.9.6.tar.gz" + name = "io_bazel_rules_kotlin", + sha256 = "3b772976fec7bdcda1d84b9d39b176589424c047eb2175bed09aac630e50af43", + url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.6/rules_kotlin-v1.9.6.tar.gz", ) KOTLIN_VERSION = "1.9.25" + KOTLINC_RELEASE_SHA = "6ab72d6144e71cbbc380b770c2ad380972548c63ab6ed4c79f11c88f2967332e" + KSP_VERSION = "1.9.25-1.0.20" + KSP_COMPILER_RELEASE_SHA = "3a2d24623409ac5904c87a7e130f5b39ce9fd67ca8b44e4fe5b784a6ec102b81" -load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version", "ksp_version") +load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version", "ksp_version") KOTLINC_RELEASE = kotlinc_version( - release = KOTLIN_VERSION, - sha256 = KOTLINC_RELEASE_SHA - ) + release = KOTLIN_VERSION, + sha256 = KOTLINC_RELEASE_SHA, +) + KSP_COMPILER_RELEASE = ksp_version( - release = KSP_VERSION, - sha256 = KSP_COMPILER_RELEASE_SHA - ) -kotlin_repositories(compiler_release = KOTLINC_RELEASE, ksp_compiler_release = KSP_COMPILER_RELEASE) -register_toolchains("//:kotlin_toolchain") + release = KSP_VERSION, + sha256 = KSP_COMPILER_RELEASE_SHA, +) -http_archive(name = "rules_java", urls = [ - "https://github.com/bazelbuild/rules_java/releases/download/7.6.1/rules_java-7.6.1.tar.gz", - ], sha256 = "f8ae9ed3887df02f40de9f4f7ac3873e6dd7a471f9cddf63952538b94b59aeb3", patches = [ - "//patches/rules_java:turbine_worker.patch", - ], patch_args = [ - "-p1", - ]) +kotlin_repositories( + compiler_release = KOTLINC_RELEASE, + ksp_compiler_release = KSP_COMPILER_RELEASE, +) -load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") +register_toolchains("//:kotlin_toolchain") + +load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") git_repository( - name = "grab_bazel_common", - commit = "0962a9aaeee64ed17eb65b577060693c3b3dc244", - remote = "https://github.com/grab/grab-bazel-common.git" + name = "grab_bazel_common", + commit = "0962a9aaeee64ed17eb65b577060693c3b3dc244", + remote = "https://github.com/grab/grab-bazel-common.git", ) -load("@grab_bazel_common//rules:repositories.bzl", "bazel_common_dependencies") +load("@grab_bazel_common//rules:repositories.bzl", "bazel_common_dependencies") bazel_common_dependencies() -load("@grab_bazel_common//rules:deps_init.bzl", "bazel_common_deps_init") +load("@grab_bazel_common//rules:deps_init.bzl", "bazel_common_deps_init") bazel_common_deps_init() -load("@grab_bazel_common//rules:setup.bzl", "bazel_common_setup") +load("@grab_bazel_common//rules:setup.bzl", "bazel_common_setup") -bazel_common_setup(patched_android_tools = True, buildifier_version = "6.3.3", pinned_maven_install = True, additional_coursier_options = [ - "--parallel", - "12", - ]) +bazel_common_setup( + additional_coursier_options = [ + "--parallel", + "12", + ], + buildifier_version = "6.3.3", + patched_android_tools = True, + pinned_maven_install = True, +) -load("@grab_bazel_common//rules:maven.bzl", "pin_bazel_common_dependencies") +load("@grab_bazel_common//rules:maven.bzl", "pin_bazel_common_dependencies") pin_bazel_common_dependencies() DAGGER_TAG = "2.47" + DAGGER_SHA = "154cdfa4f6f552a9873e2b4448f7a80415cb3427c4c771a50c6a8a8b434ffd0a" + http_archive( - name = "dagger", - strip_prefix = "dagger-dagger-%s" % DAGGER_TAG, - sha256 = DAGGER_SHA, - url = "https://github.com/google/dagger/archive/dagger-%s.zip" % DAGGER_TAG + name = "dagger", + sha256 = DAGGER_SHA, + strip_prefix = "dagger-dagger-%s" % DAGGER_TAG, + url = "https://github.com/google/dagger/archive/dagger-%s.zip" % DAGGER_TAG, ) -load("@dagger//:workspace_defs.bzl", "DAGGER_ARTIFACTS", "DAGGER_REPOSITORIES") - -load("@grab_bazel_common//:workspace_defs.bzl", "GRAB_BAZEL_COMMON_ARTIFACTS") +load("@dagger//:workspace_defs.bzl", "DAGGER_ARTIFACTS", "DAGGER_REPOSITORIES") +load("@grab_bazel_common//:workspace_defs.bzl", "GRAB_BAZEL_COMMON_ARTIFACTS") http_archive( - name = "rules_jvm_external", - strip_prefix = "rules_jvm_external-6.10", - sha256 = "e5f83b8f2678d2b26441e5eafefb1b061826608417b8d24e5e8e15e585eab1ba", - url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/6.10/rules_jvm_external-6.10.tar.gz" + name = "rules_jvm_external", + sha256 = "e5f83b8f2678d2b26441e5eafefb1b061826608417b8d24e5e8e15e585eab1ba", + strip_prefix = "rules_jvm_external-6.10", + url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/6.10/rules_jvm_external-6.10.tar.gz", ) -load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps") +load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps") rules_jvm_external_deps() -load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup") + +load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup") rules_jvm_external_setup() -load("@rules_jvm_external//:defs.bzl", "maven_install") -load("@rules_jvm_external//:specs.bzl", "maven") +load("@rules_jvm_external//:defs.bzl", "maven_install") +load("@rules_jvm_external//:specs.bzl", "maven") maven_install( - name = "android_test_maven", - artifacts = [ - "androidx.annotation:annotation-experimental:1.1.0" -, - "androidx.annotation:annotation:1.2.0" -, - "androidx.test:annotation:1.0.1" -, - "androidx.test:monitor:1.6.1" -, - "androidx.tracing:tracing:1.0.0" -, - ], - repositories = [ - "https://dl.google.com/dl/android/maven2/", - ] , - jetify = True, - jetify_include_list = [ - "com.android.support:cardview-v7", - "com.android.support:support-annotations", - "com.android.support:support-compat", - "com.android.support:support-core-ui", - "com.android.support:support-core-utils", - ], - fail_on_missing_checksum = False, - resolve_timeout = 1000, - excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], - override_targets = { - "androidx.annotation:annotation" : "@maven//:androidx_annotation_annotation_jvm", - "androidx.annotation:annotation-experimental" : "@maven//:androidx_annotation_annotation_experimental", - "androidx.test:annotation" : "@maven//:androidx_test_annotation", - "androidx.tracing:tracing" : "@maven//:androidx_tracing_tracing", - }, - maven_install_json = "//:android_test_maven_install.json", - version_conflict_policy = "pinned", - fail_if_repin_required = False, - additional_coursier_options = [ - "--parallel", - "12", - ] + name = "android_test_maven", + additional_coursier_options = [ + "--parallel", + "12", + ], + artifacts = [ + "androidx.annotation:annotation-experimental:1.1.0", + "androidx.annotation:annotation:1.2.0", + "androidx.test:annotation:1.0.1", + "androidx.test:monitor:1.6.1", + "androidx.tracing:tracing:1.0.0", + ], + excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], + fail_if_repin_required = False, + fail_on_missing_checksum = False, + jetify = True, + jetify_include_list = [ + "com.android.support:cardview-v7", + "com.android.support:support-annotations", + "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", + ], + maven_install_json = "//:android_test_maven_install.json", + override_targets = { + "androidx.annotation:annotation": "@maven//:androidx_annotation_annotation_jvm", + "androidx.annotation:annotation-experimental": "@maven//:androidx_annotation_annotation_experimental", + "androidx.test:annotation": "@maven//:androidx_test_annotation", + "androidx.tracing:tracing": "@maven//:androidx_tracing_tracing", + }, + repositories = [ + "https://dl.google.com/dl/android/maven2/", + ], + resolve_timeout = 1000, + version_conflict_policy = "pinned", ) -load("@android_test_maven//:defs.bzl", android_test_maven_pinned_maven_install = "pinned_maven_install") +load("@android_test_maven//:defs.bzl", android_test_maven_pinned_maven_install = "pinned_maven_install") android_test_maven_pinned_maven_install() + maven_install( - name = "debug_maven", - artifacts = [ - "androidx.annotation:annotation:1.1.0" -, - "androidx.arch.core:core-common:2.1.0" -, - "androidx.arch.core:core-runtime:2.1.0" -, - "androidx.collection:collection:1.0.0" -, - "androidx.core:core-ktx:1.2.0" -, - "androidx.core:core:1.3.2" -, - "androidx.customview:customview:1.0.0" -, - "androidx.lifecycle:lifecycle-common:2.2.0" -, - "androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0" -, - "androidx.lifecycle:lifecycle-livedata-core:2.2.0" -, - "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0" -, - "androidx.lifecycle:lifecycle-livedata:2.2.0" -, - "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0" -, - "androidx.lifecycle:lifecycle-runtime:2.2.0" -, - "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0" -, - "androidx.lifecycle:lifecycle-viewmodel:2.2.0" -, - "androidx.paging:paging-common-ktx:3.1.1" -, - "androidx.paging:paging-common:3.1.1" -, - "androidx.paging:paging-runtime:3.1.1" -, - "androidx.recyclerview:recyclerview:1.2.0" -, - "androidx.versionedparcelable:versionedparcelable:1.1.0" -, - "org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31" -, - "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30" -, - "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30" -, - "org.jetbrains.kotlin:kotlin-stdlib:1.5.31" -, - "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2" -, - "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2" -, - "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2" -, - "org.jetbrains:annotations:13.0" -, - ], - repositories = [ - "https://dl.google.com/dl/android/maven2/", - "https://repo.maven.apache.org/maven2/", - ] , - jetify = True, - jetify_include_list = [ - "android.arch.core:common", - "android.arch.core:runtime", - "android.arch.lifecycle:common", - "android.arch.lifecycle:livedata", - "android.arch.lifecycle:livedata-core", - "android.arch.lifecycle:runtime", - "android.arch.lifecycle:viewmodel", - "android.arch.paging:common", - "com.android.support:cardview-v7", - "com.android.support:collections", - "com.android.support:customview", - "com.android.support:recyclerview-v7", - "com.android.support:support-annotations", - "com.android.support:support-compat", - "com.android.support:support-core-ui", - "com.android.support:support-core-utils", - "com.android.support:versionedparcelable", - ], - fail_on_missing_checksum = False, - resolve_timeout = 1000, - excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], - override_targets = { - "androidx.annotation:annotation" : "@maven//:androidx_annotation_annotation_jvm", - "androidx.arch.core:core-common" : "@maven//:androidx_arch_core_core_common", - "androidx.arch.core:core-runtime" : "@maven//:androidx_arch_core_core_runtime", - "androidx.collection:collection" : "@maven//:androidx_collection_collection", - "androidx.core:core" : "@maven//:androidx_core_core", - "androidx.core:core-ktx" : "@maven//:androidx_core_core_ktx", - "androidx.customview:customview" : "@maven//:androidx_customview_customview", - "androidx.lifecycle:lifecycle-common" : "@maven//:androidx_lifecycle_lifecycle_common", - "androidx.lifecycle:lifecycle-livedata" : "@maven//:androidx_lifecycle_lifecycle_livedata", - "androidx.lifecycle:lifecycle-livedata-core" : "@maven//:androidx_lifecycle_lifecycle_livedata_core", - "androidx.lifecycle:lifecycle-livedata-core-ktx" : "@maven//:androidx_lifecycle_lifecycle_livedata_core_ktx", - "androidx.lifecycle:lifecycle-runtime" : "@maven//:androidx_lifecycle_lifecycle_runtime", - "androidx.lifecycle:lifecycle-runtime-ktx" : "@maven//:androidx_lifecycle_lifecycle_runtime_ktx", - "androidx.lifecycle:lifecycle-viewmodel" : "@maven//:androidx_lifecycle_lifecycle_viewmodel", - "androidx.lifecycle:lifecycle-viewmodel-ktx" : "@maven//:androidx_lifecycle_lifecycle_viewmodel_ktx", - "androidx.versionedparcelable:versionedparcelable" : "@maven//:androidx_versionedparcelable_versionedparcelable", - "org.jetbrains.kotlin:kotlin-stdlib" : "@maven//:org_jetbrains_kotlin_kotlin_stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common" : "@maven//:org_jetbrains_kotlin_kotlin_stdlib_common", - "org.jetbrains.kotlin:kotlin-stdlib-jdk7" : "@maven//:org_jetbrains_kotlin_kotlin_stdlib_jdk7", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8" : "@maven//:org_jetbrains_kotlin_kotlin_stdlib_jdk8", - "org.jetbrains.kotlinx:kotlinx-coroutines-android" : "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_android", - "org.jetbrains.kotlinx:kotlinx-coroutines-core" : "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core", - "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm" : "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm", - "org.jetbrains:annotations" : "@maven//:org_jetbrains_annotations", - }, - maven_install_json = "//:debug_maven_install.json", - version_conflict_policy = "pinned", - fail_if_repin_required = False, - additional_coursier_options = [ - "--parallel", - "12", - ] + name = "debug_maven", + additional_coursier_options = [ + "--parallel", + "12", + ], + artifacts = [ + "androidx.annotation:annotation:1.1.0", + "androidx.arch.core:core-common:2.1.0", + "androidx.arch.core:core-runtime:2.1.0", + "androidx.collection:collection:1.0.0", + "androidx.core:core-ktx:1.2.0", + "androidx.core:core:1.3.2", + "androidx.customview:customview:1.0.0", + "androidx.lifecycle:lifecycle-common:2.2.0", + "androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0", + "androidx.lifecycle:lifecycle-livedata-core:2.2.0", + "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0", + "androidx.lifecycle:lifecycle-livedata:2.2.0", + "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0", + "androidx.lifecycle:lifecycle-runtime:2.2.0", + "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0", + "androidx.lifecycle:lifecycle-viewmodel:2.2.0", + "androidx.paging:paging-common-ktx:3.1.1", + "androidx.paging:paging-common:3.1.1", + "androidx.paging:paging-runtime:3.1.1", + "androidx.recyclerview:recyclerview:1.2.0", + "androidx.versionedparcelable:versionedparcelable:1.1.0", + "org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31", + "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30", + "org.jetbrains.kotlin:kotlin-stdlib:1.5.31", + "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2", + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2", + "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2", + "org.jetbrains:annotations:13.0", + ], + excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], + fail_if_repin_required = False, + fail_on_missing_checksum = False, + jetify = True, + jetify_include_list = [ + "android.arch.core:common", + "android.arch.core:runtime", + "android.arch.lifecycle:common", + "android.arch.lifecycle:livedata", + "android.arch.lifecycle:livedata-core", + "android.arch.lifecycle:runtime", + "android.arch.lifecycle:viewmodel", + "android.arch.paging:common", + "com.android.support:cardview-v7", + "com.android.support:collections", + "com.android.support:customview", + "com.android.support:recyclerview-v7", + "com.android.support:support-annotations", + "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", + "com.android.support:versionedparcelable", + ], + maven_install_json = "//:debug_maven_install.json", + override_targets = { + "androidx.annotation:annotation": "@maven//:androidx_annotation_annotation_jvm", + "androidx.arch.core:core-common": "@maven//:androidx_arch_core_core_common", + "androidx.arch.core:core-runtime": "@maven//:androidx_arch_core_core_runtime", + "androidx.collection:collection": "@maven//:androidx_collection_collection", + "androidx.core:core": "@maven//:androidx_core_core", + "androidx.core:core-ktx": "@maven//:androidx_core_core_ktx", + "androidx.customview:customview": "@maven//:androidx_customview_customview", + "androidx.lifecycle:lifecycle-common": "@maven//:androidx_lifecycle_lifecycle_common", + "androidx.lifecycle:lifecycle-livedata": "@maven//:androidx_lifecycle_lifecycle_livedata", + "androidx.lifecycle:lifecycle-livedata-core": "@maven//:androidx_lifecycle_lifecycle_livedata_core", + "androidx.lifecycle:lifecycle-livedata-core-ktx": "@maven//:androidx_lifecycle_lifecycle_livedata_core_ktx", + "androidx.lifecycle:lifecycle-runtime": "@maven//:androidx_lifecycle_lifecycle_runtime", + "androidx.lifecycle:lifecycle-runtime-ktx": "@maven//:androidx_lifecycle_lifecycle_runtime_ktx", + "androidx.lifecycle:lifecycle-viewmodel": "@maven//:androidx_lifecycle_lifecycle_viewmodel", + "androidx.lifecycle:lifecycle-viewmodel-ktx": "@maven//:androidx_lifecycle_lifecycle_viewmodel_ktx", + "androidx.versionedparcelable:versionedparcelable": "@maven//:androidx_versionedparcelable_versionedparcelable", + "org.jetbrains.kotlin:kotlin-stdlib": "@maven//:org_jetbrains_kotlin_kotlin_stdlib", + "org.jetbrains.kotlin:kotlin-stdlib-common": "@maven//:org_jetbrains_kotlin_kotlin_stdlib_common", + "org.jetbrains.kotlin:kotlin-stdlib-jdk7": "@maven//:org_jetbrains_kotlin_kotlin_stdlib_jdk7", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8": "@maven//:org_jetbrains_kotlin_kotlin_stdlib_jdk8", + "org.jetbrains.kotlinx:kotlinx-coroutines-android": "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_android", + "org.jetbrains.kotlinx:kotlinx-coroutines-core": "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core", + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm": "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm", + "org.jetbrains:annotations": "@maven//:org_jetbrains_annotations", + }, + repositories = [ + "https://dl.google.com/dl/android/maven2/", + "https://repo.maven.apache.org/maven2/", + ], + resolve_timeout = 1000, + version_conflict_policy = "pinned", ) -load("@debug_maven//:defs.bzl", debug_maven_pinned_maven_install = "pinned_maven_install") +load("@debug_maven//:defs.bzl", debug_maven_pinned_maven_install = "pinned_maven_install") debug_maven_pinned_maven_install() + maven_install( - name = "ksp_maven", - artifacts = [ - "com.squareup.moshi:moshi-kotlin-codegen:1.15.0" -, - ], - repositories = [ - "https://repo.maven.apache.org/maven2/", - ] , - fail_on_missing_checksum = False, - resolve_timeout = 1000, - excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], - maven_install_json = "//:ksp_maven_install.json", - version_conflict_policy = "pinned", - fail_if_repin_required = False, - additional_coursier_options = [ - "--parallel", - "12", - ] + name = "ksp_maven", + additional_coursier_options = [ + "--parallel", + "12", + ], + artifacts = [ + "com.squareup.moshi:moshi-kotlin-codegen:1.15.0", + ], + excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], + fail_if_repin_required = False, + fail_on_missing_checksum = False, + maven_install_json = "//:ksp_maven_install.json", + repositories = [ + "https://repo.maven.apache.org/maven2/", + ], + resolve_timeout = 1000, + version_conflict_policy = "pinned", ) -load("@ksp_maven//:defs.bzl", ksp_maven_pinned_maven_install = "pinned_maven_install") +load("@ksp_maven//:defs.bzl", ksp_maven_pinned_maven_install = "pinned_maven_install") ksp_maven_pinned_maven_install() + maven_install( - name = "lint_maven", - artifacts = [ - "com.google.auto.service:auto-service-annotations:1.1.1" -, - "com.slack.lint:slack-lint-checks:0.2.3" -, - ], - repositories = [ - "https://repo.maven.apache.org/maven2/", - ] , - jetify = True, - jetify_include_list = [ - "com.android.support:cardview-v7", - "com.android.support:support-annotations", - "com.android.support:support-compat", - "com.android.support:support-core-ui", - "com.android.support:support-core-utils", - ], - fail_on_missing_checksum = False, - resolve_timeout = 1000, - excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], - override_targets = { - "com.google.auto.service:auto-service-annotations" : "@maven//:com_google_auto_service_auto_service_annotations", - }, - maven_install_json = "//:lint_maven_install.json", - version_conflict_policy = "pinned", - fail_if_repin_required = False, - additional_coursier_options = [ - "--parallel", - "12", - ] + name = "lint_maven", + additional_coursier_options = [ + "--parallel", + "12", + ], + artifacts = [ + "com.google.auto.service:auto-service-annotations:1.1.1", + "com.slack.lint:slack-lint-checks:0.2.3", + ], + excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], + fail_if_repin_required = False, + fail_on_missing_checksum = False, + jetify = True, + jetify_include_list = [ + "com.android.support:cardview-v7", + "com.android.support:support-annotations", + "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", + ], + maven_install_json = "//:lint_maven_install.json", + override_targets = { + "com.google.auto.service:auto-service-annotations": "@maven//:com_google_auto_service_auto_service_annotations", + }, + repositories = [ + "https://repo.maven.apache.org/maven2/", + ], + resolve_timeout = 1000, + version_conflict_policy = "pinned", ) -load("@lint_maven//:defs.bzl", lint_maven_pinned_maven_install = "pinned_maven_install") +load("@lint_maven//:defs.bzl", lint_maven_pinned_maven_install = "pinned_maven_install") lint_maven_pinned_maven_install() -maven_install( - name = "maven", - artifacts = DAGGER_ARTIFACTS + GRAB_BAZEL_COMMON_ARTIFACTS + [ - "androidx.activity:activity-compose:1.7.2" -, - "androidx.activity:activity-ktx:1.7.2" -, - "androidx.activity:activity:1.7.2" -, - "androidx.annotation:annotation-experimental:1.4.1" -, - "androidx.annotation:annotation-jvm:1.8.1" -, - "androidx.annotation:annotation:1.8.1" -, - "androidx.appcompat:appcompat-resources:1.6.1" -, - "androidx.appcompat:appcompat:1.6.1" -, - "androidx.arch.core:core-common:2.2.0" -, - "androidx.arch.core:core-runtime:2.2.0" -, - "androidx.autofill:autofill:1.0.0" -, - "androidx.collection:collection-jvm:1.4.4" -, - "androidx.collection:collection-ktx:1.4.4" -, - "androidx.collection:collection:1.4.4" -, - "androidx.compose.animation:animation-android:1.7.8" -, - "androidx.compose.animation:animation-core-android:1.7.8" -, - "androidx.compose.animation:animation-core:1.7.8" -, - "androidx.compose.animation:animation:1.7.8" -, - "androidx.compose.foundation:foundation-android:1.7.8" -, - "androidx.compose.foundation:foundation-layout-android:1.7.8" -, - "androidx.compose.foundation:foundation-layout:1.7.8" -, - "androidx.compose.foundation:foundation:1.7.8" -, - "androidx.compose.material:material-android:1.7.8" -, - "androidx.compose.material:material-ripple-android:1.7.8" -, - "androidx.compose.material:material-ripple:1.7.8" -, - "androidx.compose.material:material:1.7.8" -, - "androidx.compose.runtime:runtime-android:1.7.8" -, - "androidx.compose.runtime:runtime-saveable-android:1.7.8" -, - "androidx.compose.runtime:runtime-saveable:1.7.8" -, - "androidx.compose.runtime:runtime:1.7.8" -, - "androidx.compose.ui:ui-android:1.7.8" -, - "androidx.compose.ui:ui-geometry-android:1.7.8" -, - "androidx.compose.ui:ui-geometry:1.7.8" -, - "androidx.compose.ui:ui-graphics-android:1.7.8" -, - "androidx.compose.ui:ui-graphics:1.7.8" -, - "androidx.compose.ui:ui-test-junit4:1.4.3" -, - "androidx.compose.ui:ui-test-manifest:1.4.3" -, - "androidx.compose.ui:ui-test:1.4.3" -, - "androidx.compose.ui:ui-text-android:1.7.8" -, - "androidx.compose.ui:ui-text:1.7.8" -, - "androidx.compose.ui:ui-tooling-android:1.7.8" -, - "androidx.compose.ui:ui-tooling-data-android:1.7.8" -, - "androidx.compose.ui:ui-tooling-data:1.7.8" -, - "androidx.compose.ui:ui-tooling-preview-android:1.7.8" -, - "androidx.compose.ui:ui-tooling-preview:1.7.8" -, - "androidx.compose.ui:ui-tooling:1.7.8" -, - "androidx.compose.ui:ui-unit-android:1.7.8" -, - "androidx.compose.ui:ui-unit:1.7.8" -, - "androidx.compose.ui:ui-util-android:1.7.8" -, - "androidx.compose.ui:ui-util:1.7.8" -, - "androidx.compose.ui:ui:1.7.8" -, - "androidx.concurrent:concurrent-futures:1.1.0" -, - "androidx.constraintlayout:constraintlayout-core:1.0.4" -, - maven.artifact( - group = "androidx.constraintlayout", - artifact = "constraintlayout", - version = "2.1.4", - exclusions = [ - "androidx.appcompat:appcompat" -, - "androidx.core:core" -, - ] -) -, - "androidx.core:core-ktx:1.13.1" -, - "androidx.core:core:1.13.1" -, - "androidx.cursoradapter:cursoradapter:1.0.0" -, - "androidx.customview:customview-poolingcontainer:1.0.0" -, - "androidx.customview:customview:1.0.0" -, - "androidx.databinding:databinding-adapters:8.6.1" -, - "androidx.databinding:databinding-common:8.6.1" -, - "androidx.databinding:databinding-ktx:8.6.1" -, - "androidx.databinding:databinding-runtime:8.6.1" -, - "androidx.databinding:viewbinding:8.6.1" -, - "androidx.drawerlayout:drawerlayout:1.0.0" -, - "androidx.emoji2:emoji2-views-helper:1.3.0" -, - "androidx.emoji2:emoji2:1.3.0" -, - "androidx.fragment:fragment:1.3.6" -, - "androidx.graphics:graphics-path:1.0.1" -, - "androidx.interpolator:interpolator:1.0.0" -, - "androidx.lifecycle:lifecycle-common-jvm:2.8.3" -, - "androidx.lifecycle:lifecycle-common:2.8.3" -, - "androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.3" -, - "androidx.lifecycle:lifecycle-livedata-core:2.8.3" -, - "androidx.lifecycle:lifecycle-livedata:2.8.3" -, - "androidx.lifecycle:lifecycle-process:2.8.3" -, - "androidx.lifecycle:lifecycle-runtime-android:2.8.3" -, - "androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3" -, - "androidx.lifecycle:lifecycle-runtime-compose:2.8.3" -, - "androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.3" -, - "androidx.lifecycle:lifecycle-runtime-ktx:2.8.3" -, - "androidx.lifecycle:lifecycle-runtime:2.8.3" -, - "androidx.lifecycle:lifecycle-service:2.8.3" -, - "androidx.lifecycle:lifecycle-viewmodel-android:2.8.3" -, - "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3" -, - "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.3" -, - "androidx.lifecycle:lifecycle-viewmodel:2.8.3" -, - "androidx.loader:loader:1.0.0" -, - "androidx.profileinstaller:profileinstaller:1.3.1" -, - "androidx.resourceinspection:resourceinspection-annotation:1.0.1" -, - "androidx.savedstate:savedstate-ktx:1.2.1" -, - "androidx.savedstate:savedstate:1.2.1" -, - "androidx.startup:startup-runtime:1.1.1" -, - "androidx.test.espresso:espresso-core:3.5.1" -, - "androidx.test.espresso:espresso-idling-resource:3.5.1" -, - "androidx.test.ext:junit:1.1.5" -, - "androidx.test.services:storage:1.4.2" -, - "androidx.test:annotation:1.0.1" -, - "androidx.test:core:1.5.0" -, - "androidx.test:monitor:1.6.1" -, - "androidx.test:rules:1.5.0" -, - "androidx.test:runner:1.5.2" -, - "androidx.tracing:tracing:1.0.0" -, - "androidx.vectordrawable:vectordrawable-animated:1.1.0" -, - "androidx.vectordrawable:vectordrawable:1.1.0" -, - "androidx.versionedparcelable:versionedparcelable:1.1.1" -, - "androidx.viewpager:viewpager:1.0.0" -, - "com.android.tools.build:manifest-merger:31.5.0-alpha02" -, - "com.android.tools.external.com-intellij:intellij-core:31.5.0-alpha02" -, - "com.android.tools.external.com-intellij:kotlin-compiler:31.5.0-alpha02" -, - "com.android.tools.external.org-jetbrains:uast:31.5.0-alpha02" -, - "com.android.tools.layoutlib:layoutlib-api:31.5.0-alpha02" -, - "com.android.tools.lint:lint-api:31.5.0-alpha02" -, - "com.android.tools.lint:lint-checks:31.5.0-alpha02" -, - "com.android.tools.lint:lint-model:31.5.0-alpha02" -, - "com.android.tools:annotations:31.5.0-alpha02" -, - "com.android.tools:common:31.5.0-alpha02" -, - "com.android.tools:repository:31.5.0-alpha02" -, - "com.android.tools:sdk-common:31.5.0-alpha02" -, - "com.android.tools:sdklib:31.5.0-alpha02" -, - "com.google.ar.sceneform.ux:sceneform-ux:1.15.0" -, - "com.google.ar.sceneform:core:1.15.0" -, - "com.google.ar.sceneform:filament-android:1.15.0" -, - "com.google.ar.sceneform:rendering:1.15.0" -, - "com.google.ar.sceneform:sceneform-base:1.15.0" -, - "com.google.ar:core:1.15.0" -, - "com.google.auto.service:auto-service-annotations:1.1.1" -, - "com.google.auto.service:auto-service:1.1.1" -, - "com.google.auto:auto-common:1.2.1" -, - "com.google.code.findbugs:jsr305:3.0.2" -, - "com.google.dagger:dagger:2.47" -, - "com.google.errorprone:error_prone_annotations:2.18.0" -, - "com.google.guava:failureaccess:1.0.1" -, - "com.google.guava:guava:32.0.1-jre" -, - "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" -, - "com.google.j2objc:j2objc-annotations:2.8" -, - "com.jakewharton.timber:timber:5.0.1" -, - "com.squareup.moshi:moshi:1.15.0" -, - "com.squareup.okio:okio:2.10.0" -, - "com.squareup:javawriter:2.1.1" -, - "commons-io:commons-io:2.13.0" -, - "javax.inject:javax.inject:1" -, - "junit:junit:4.13.2" -, - "net.sf.kxml:kxml2:2.3.0" -, - "org.checkerframework:checker-compat-qual:2.5.5" -, - "org.checkerframework:checker-qual:3.33.0" -, - "org.hamcrest:hamcrest-core:1.3" -, - "org.hamcrest:hamcrest-integration:1.3" -, - "org.hamcrest:hamcrest-library:1.3" -, - "org.jetbrains.kotlin:kotlin-reflect:1.9.20" -, - "org.jetbrains.kotlin:kotlin-stdlib-common:1.9.25" -, - "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20" -, - "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20" -, - "org.jetbrains.kotlin:kotlin-stdlib:1.9.25" -, - "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3" -, - "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3" -, - "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3" -, - "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3" -, - "org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.6.4" -, - "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4" -, - "org.jetbrains:annotations:23.0.0" -, - "org.ow2.asm:asm-tree:9.6" -, - "org.ow2.asm:asm:9.6" -, - ], - repositories = [ - "https://dl.google.com/dl/android/maven2/", - "https://repo.maven.apache.org/maven2/", - ] + DAGGER_REPOSITORIES, - jetify = True, - jetify_include_list = [ - "android.arch.core:common", - "android.arch.core:runtime", - "android.arch.lifecycle:common", - "android.arch.lifecycle:livedata", - "android.arch.lifecycle:livedata-core", - "android.arch.lifecycle:runtime", - "android.arch.lifecycle:viewmodel", - "com.android.databinding:baseLibrary", - "com.android.databinding:library", - "com.android.support.test.espresso:espresso-core", - "com.android.support.test.espresso:espresso-idling-resource", - "com.android.support.test:monitor", - "com.android.support.test:runner", - "com.android.support:animated-vector-drawable", - "com.android.support:appcompat-v7", - "com.android.support:cardview-v7", - "com.android.support:collections", - "com.android.support:cursoradapter", - "com.android.support:customview", - "com.android.support:drawerlayout", - "com.android.support:interpolator", - "com.android.support:loader", - "com.android.support:support-annotations", - "com.android.support:support-compat", - "com.android.support:support-core-ui", - "com.android.support:support-core-utils", - "com.android.support:support-fragment", - "com.android.support:support-vector-drawable", - "com.android.support:versionedparcelable", - "com.android.support:viewpager", - "com.google.ar.sceneform.ux:sceneform-ux", - ], - fail_on_missing_checksum = False, - resolve_timeout = 1000, - excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], - override_targets = { - "androidx.annotation:annotation" : "@maven//:androidx_annotation_annotation_jvm", - }, - maven_install_json = "//:maven_install.json", - version_conflict_policy = "pinned", - fail_if_repin_required = False, - additional_coursier_options = [ - "--parallel", - "12", - ] +maven_install( + name = "maven", + additional_coursier_options = [ + "--parallel", + "12", + ], + artifacts = DAGGER_ARTIFACTS + GRAB_BAZEL_COMMON_ARTIFACTS + [ + "androidx.activity:activity-compose:1.7.2", + "androidx.activity:activity-ktx:1.7.2", + "androidx.activity:activity:1.7.2", + "androidx.annotation:annotation-experimental:1.4.1", + "androidx.annotation:annotation-jvm:1.8.1", + "androidx.annotation:annotation:1.8.1", + "androidx.appcompat:appcompat-resources:1.6.1", + "androidx.appcompat:appcompat:1.6.1", + "androidx.arch.core:core-common:2.2.0", + "androidx.arch.core:core-runtime:2.2.0", + "androidx.autofill:autofill:1.0.0", + "androidx.collection:collection-jvm:1.4.4", + "androidx.collection:collection-ktx:1.4.4", + "androidx.collection:collection:1.4.4", + "androidx.compose.animation:animation-android:1.7.8", + "androidx.compose.animation:animation-core-android:1.7.8", + "androidx.compose.animation:animation-core:1.7.8", + "androidx.compose.animation:animation:1.7.8", + "androidx.compose.foundation:foundation-android:1.7.8", + "androidx.compose.foundation:foundation-layout-android:1.7.8", + "androidx.compose.foundation:foundation-layout:1.7.8", + "androidx.compose.foundation:foundation:1.7.8", + "androidx.compose.material:material-android:1.7.8", + "androidx.compose.material:material-ripple-android:1.7.8", + "androidx.compose.material:material-ripple:1.7.8", + "androidx.compose.material:material:1.7.8", + "androidx.compose.runtime:runtime-android:1.7.8", + "androidx.compose.runtime:runtime-saveable-android:1.7.8", + "androidx.compose.runtime:runtime-saveable:1.7.8", + "androidx.compose.runtime:runtime:1.7.8", + "androidx.compose.ui:ui-android:1.7.8", + "androidx.compose.ui:ui-geometry-android:1.7.8", + "androidx.compose.ui:ui-geometry:1.7.8", + "androidx.compose.ui:ui-graphics-android:1.7.8", + "androidx.compose.ui:ui-graphics:1.7.8", + "androidx.compose.ui:ui-test-junit4:1.4.3", + "androidx.compose.ui:ui-test-manifest:1.4.3", + "androidx.compose.ui:ui-test:1.4.3", + "androidx.compose.ui:ui-text-android:1.7.8", + "androidx.compose.ui:ui-text:1.7.8", + "androidx.compose.ui:ui-tooling-android:1.7.8", + "androidx.compose.ui:ui-tooling-data-android:1.7.8", + "androidx.compose.ui:ui-tooling-data:1.7.8", + "androidx.compose.ui:ui-tooling-preview-android:1.7.8", + "androidx.compose.ui:ui-tooling-preview:1.7.8", + "androidx.compose.ui:ui-tooling:1.7.8", + "androidx.compose.ui:ui-unit-android:1.7.8", + "androidx.compose.ui:ui-unit:1.7.8", + "androidx.compose.ui:ui-util-android:1.7.8", + "androidx.compose.ui:ui-util:1.7.8", + "androidx.compose.ui:ui:1.7.8", + "androidx.concurrent:concurrent-futures:1.1.0", + "androidx.constraintlayout:constraintlayout-core:1.0.4", + maven.artifact( + artifact = "constraintlayout", + exclusions = [ + "androidx.appcompat:appcompat", + "androidx.core:core", + ], + group = "androidx.constraintlayout", + version = "2.1.4", + ), + "androidx.core:core-ktx:1.13.1", + "androidx.core:core:1.13.1", + "androidx.cursoradapter:cursoradapter:1.0.0", + "androidx.customview:customview-poolingcontainer:1.0.0", + "androidx.customview:customview:1.0.0", + "androidx.databinding:databinding-adapters:8.6.1", + "androidx.databinding:databinding-common:8.6.1", + "androidx.databinding:databinding-ktx:8.6.1", + "androidx.databinding:databinding-runtime:8.6.1", + "androidx.databinding:viewbinding:8.6.1", + "androidx.drawerlayout:drawerlayout:1.0.0", + "androidx.emoji2:emoji2-views-helper:1.3.0", + "androidx.emoji2:emoji2:1.3.0", + "androidx.fragment:fragment:1.3.6", + "androidx.graphics:graphics-path:1.0.1", + "androidx.interpolator:interpolator:1.0.0", + "androidx.lifecycle:lifecycle-common-jvm:2.8.3", + "androidx.lifecycle:lifecycle-common:2.8.3", + "androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.3", + "androidx.lifecycle:lifecycle-livedata-core:2.8.3", + "androidx.lifecycle:lifecycle-livedata:2.8.3", + "androidx.lifecycle:lifecycle-process:2.8.3", + "androidx.lifecycle:lifecycle-runtime-android:2.8.3", + "androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3", + "androidx.lifecycle:lifecycle-runtime-compose:2.8.3", + "androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.3", + "androidx.lifecycle:lifecycle-runtime-ktx:2.8.3", + "androidx.lifecycle:lifecycle-runtime:2.8.3", + "androidx.lifecycle:lifecycle-service:2.8.3", + "androidx.lifecycle:lifecycle-viewmodel-android:2.8.3", + "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3", + "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.3", + "androidx.lifecycle:lifecycle-viewmodel:2.8.3", + "androidx.loader:loader:1.0.0", + "androidx.profileinstaller:profileinstaller:1.3.1", + "androidx.resourceinspection:resourceinspection-annotation:1.0.1", + "androidx.savedstate:savedstate-ktx:1.2.1", + "androidx.savedstate:savedstate:1.2.1", + "androidx.startup:startup-runtime:1.1.1", + "androidx.test.espresso:espresso-core:3.5.1", + "androidx.test.espresso:espresso-idling-resource:3.5.1", + "androidx.test.ext:junit:1.1.5", + "androidx.test.services:storage:1.4.2", + "androidx.test:annotation:1.0.1", + "androidx.test:core:1.5.0", + "androidx.test:monitor:1.6.1", + "androidx.test:rules:1.5.0", + "androidx.test:runner:1.5.2", + "androidx.tracing:tracing:1.0.0", + "androidx.vectordrawable:vectordrawable-animated:1.1.0", + "androidx.vectordrawable:vectordrawable:1.1.0", + "androidx.versionedparcelable:versionedparcelable:1.1.1", + "androidx.viewpager:viewpager:1.0.0", + "com.android.tools.build:manifest-merger:31.5.0-alpha02", + "com.android.tools.external.com-intellij:intellij-core:31.5.0-alpha02", + "com.android.tools.external.com-intellij:kotlin-compiler:31.5.0-alpha02", + "com.android.tools.external.org-jetbrains:uast:31.5.0-alpha02", + "com.android.tools.layoutlib:layoutlib-api:31.5.0-alpha02", + "com.android.tools.lint:lint-api:31.5.0-alpha02", + "com.android.tools.lint:lint-checks:31.5.0-alpha02", + "com.android.tools.lint:lint-model:31.5.0-alpha02", + "com.android.tools:annotations:31.5.0-alpha02", + "com.android.tools:common:31.5.0-alpha02", + "com.android.tools:repository:31.5.0-alpha02", + "com.android.tools:sdk-common:31.5.0-alpha02", + "com.android.tools:sdklib:31.5.0-alpha02", + "com.google.ar.sceneform.ux:sceneform-ux:1.15.0", + "com.google.ar.sceneform:core:1.15.0", + "com.google.ar.sceneform:filament-android:1.15.0", + "com.google.ar.sceneform:rendering:1.15.0", + "com.google.ar.sceneform:sceneform-base:1.15.0", + "com.google.ar:core:1.15.0", + "com.google.auto.service:auto-service-annotations:1.1.1", + "com.google.auto.service:auto-service:1.1.1", + "com.google.auto:auto-common:1.2.1", + "com.google.code.findbugs:jsr305:3.0.2", + "com.google.dagger:dagger:2.47", + "com.google.errorprone:error_prone_annotations:2.18.0", + "com.google.guava:failureaccess:1.0.1", + "com.google.guava:guava:32.0.1-jre", + "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava", + "com.google.j2objc:j2objc-annotations:2.8", + "com.jakewharton.timber:timber:5.0.1", + "com.squareup.moshi:moshi:1.15.0", + "com.squareup.okio:okio:2.10.0", + "com.squareup:javawriter:2.1.1", + "commons-io:commons-io:2.13.0", + "javax.inject:javax.inject:1", + "junit:junit:4.13.2", + "net.sf.kxml:kxml2:2.3.0", + "org.checkerframework:checker-compat-qual:2.5.5", + "org.checkerframework:checker-qual:3.33.0", + "org.hamcrest:hamcrest-core:1.3", + "org.hamcrest:hamcrest-integration:1.3", + "org.hamcrest:hamcrest-library:1.3", + "org.jetbrains.kotlin:kotlin-reflect:1.9.20", + "org.jetbrains.kotlin:kotlin-stdlib-common:1.9.25", + "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20", + "org.jetbrains.kotlin:kotlin-stdlib:1.9.25", + "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3", + "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3", + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3", + "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3", + "org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.6.4", + "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4", + "org.jetbrains:annotations:23.0.0", + "org.ow2.asm:asm-tree:9.6", + "org.ow2.asm:asm:9.6", + ], + excluded_artifacts = ["androidx.test.espresso:espresso-contrib"], + fail_if_repin_required = False, + fail_on_missing_checksum = False, + jetify = True, + jetify_include_list = [ + "android.arch.core:common", + "android.arch.core:runtime", + "android.arch.lifecycle:common", + "android.arch.lifecycle:livedata", + "android.arch.lifecycle:livedata-core", + "android.arch.lifecycle:runtime", + "android.arch.lifecycle:viewmodel", + "com.android.databinding:baseLibrary", + "com.android.databinding:library", + "com.android.support.test.espresso:espresso-core", + "com.android.support.test.espresso:espresso-idling-resource", + "com.android.support.test:monitor", + "com.android.support.test:runner", + "com.android.support:animated-vector-drawable", + "com.android.support:appcompat-v7", + "com.android.support:cardview-v7", + "com.android.support:collections", + "com.android.support:cursoradapter", + "com.android.support:customview", + "com.android.support:drawerlayout", + "com.android.support:interpolator", + "com.android.support:loader", + "com.android.support:support-annotations", + "com.android.support:support-compat", + "com.android.support:support-core-ui", + "com.android.support:support-core-utils", + "com.android.support:support-fragment", + "com.android.support:support-vector-drawable", + "com.android.support:versionedparcelable", + "com.android.support:viewpager", + "com.google.ar.sceneform.ux:sceneform-ux", + ], + maven_install_json = "//:maven_install.json", + override_targets = { + "androidx.annotation:annotation": "@maven//:androidx_annotation_annotation_jvm", + }, + repositories = [ + "https://dl.google.com/dl/android/maven2/", + "https://repo.maven.apache.org/maven2/", + ] + DAGGER_REPOSITORIES, + resolve_timeout = 1000, + version_conflict_policy = "pinned", ) -load("@maven//:defs.bzl", maven_pinned_maven_install = "pinned_maven_install") +load("@maven//:defs.bzl", maven_pinned_maven_install = "pinned_maven_install") maven_pinned_maven_install() + android_sdk_repository( - name = "androidsdk", - api_level = 34, - build_tools_version = "33.0.1" + name = "androidsdk", + api_level = 34, + build_tools_version = "33.0.1", ) android_ndk_repository( - name = "androidndk", - api_level = 30 + name = "androidndk", + api_level = 30, ) git_repository( - name = "tools_android", - commit = "7224f55d7fafe12a72066eb1a2ad1e1526a854c4", - remote = "https://github.com/bazelbuild/tools_android.git" + name = "tools_android", + commit = "7224f55d7fafe12a72066eb1a2ad1e1526a854c4", + remote = "https://github.com/bazelbuild/tools_android.git", ) -load("@tools_android//tools/googleservices:defs.bzl", "google_services_workspace_dependencies") +load("@tools_android//tools/googleservices:defs.bzl", "google_services_workspace_dependencies") google_services_workspace_dependencies() From 5f035f115d3946bdd840bf34eccb95d824910697 Mon Sep 17 00:00:00 2001 From: "edwin.rahman" Date: Wed, 25 Feb 2026 18:51:07 +0700 Subject: [PATCH 3/6] Use existing template for HttpArcive --- .../grab/grazel/bazel/rules/CommonRules.kt | 28 ++++++----------- .../grazel/bazel/rules/RepositoryRules.kt | 30 ++++++++++++++++--- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt index 9bd82b69..e9ab723c 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt @@ -101,24 +101,14 @@ fun StatementsBuilder.bazelCommonInitialize( fun StatementsBuilder.preBazelCommonArchives(archives: List) { archives.forEach { archive -> - function("http_archive") { - "name" `=` archive.name.quote - if (archive.urls.isNotEmpty()) { - "urls" `=` array(archive.urls.quote) - } else if (archive.url.isNotEmpty()) { - "url" `=` archive.url.quote - } - "sha256" `=` archive.sha256.quote - val stripPrefix = archive.stripPrefix - if (stripPrefix != null) { - "strip_prefix" `=` stripPrefix.quote - } - if (archive.patches.isNotEmpty()) { - "patches" `=` array(archive.patches.quote) - } - if (archive.patchArgs.isNotEmpty()) { - "patch_args" `=` array(archive.patchArgs.quote) - } - } + add(HttpArchiveRule( + name = archive.name, + url = archive.url, + urls = archive.urls, + sha256 = archive.sha256, + stripPrefix = archive.stripPrefix, + patches = archive.patches, + patchArgs = archive.patchArgs + )) } } diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/RepositoryRules.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/RepositoryRules.kt index 1f27bbff..bce6cadb 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/RepositoryRules.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/RepositoryRules.kt @@ -17,6 +17,7 @@ package com.grab.grazel.bazel.rules import com.grab.grazel.bazel.starlark.StatementsBuilder +import com.grab.grazel.bazel.starlark.array import com.grab.grazel.bazel.starlark.load import com.grab.grazel.bazel.starlark.quote @@ -68,18 +69,32 @@ fun StatementsBuilder.httpArchive( url: String, sha256: String? = null, type: String? = null, - stripPrefix: String? = null + stripPrefix: String? = null, + urls: List = emptyList(), + patches: List = emptyList(), + patchArgs: List = emptyList() ) { load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") rule("http_archive") { "name" `=` name.quote stripPrefix?.let { "strip_prefix" `=` stripPrefix } sha256?.let { "sha256" `=` sha256 } - "url" `=` url + if (urls.isNotEmpty()) { + "urls" `=` array(urls.quote) + } else if (url.isNotEmpty()) { + "url" `=` url + } type?.let { "type" `=` type } + if (patches.isNotEmpty()) { + "patches" `=` array(patches.quote) + } + if (patchArgs.isNotEmpty()) { + "patch_args" `=` array(patchArgs.quote) + } } } + /** * Data structure denoting `http_archive` * @@ -90,16 +105,23 @@ data class HttpArchiveRule( var url: String, var sha256: String? = null, var type: String? = null, - var stripPrefix: String? = null + var stripPrefix: String? = null, + var urls: List = emptyList(), + var patches: List = emptyList(), + var patchArgs: List = emptyList() ) : BazelRepositoryRule { override fun StatementsBuilder.statements() { httpArchive( name = name.quote, url = url.quote, + urls = urls, sha256 = sha256?.quote, type = type?.quote, - stripPrefix = stripPrefix?.quote + stripPrefix = stripPrefix?.quote, + patches = patches, + patchArgs = patchArgs ) } } + From 9c187eef4e037488008874f3b94850a206905ea1 Mon Sep 17 00:00:00 2001 From: "edwin.rahman" Date: Wed, 25 Feb 2026 18:57:44 +0700 Subject: [PATCH 4/6] Make additionalCoursierOptions to empty by default --- .../main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt | 4 ++-- .../kotlin/com/grab/grazel/extension/BazelCommonExtension.kt | 2 +- .../kotlin/com/grab/grazel/extension/MavenInstallExtension.kt | 2 +- .../com/grab/grazel/migrate/internal/WorkspaceBuilder.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt index e9ab723c..f8bd5d53 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/CommonRules.kt @@ -52,7 +52,7 @@ fun StatementsBuilder.bazelCommonRepository( repositoryRule: GitRepositoryRule, buildifierVersion: String, pinnedMavenInstall: Boolean = true, - additionalCoursierOptions: List = listOf("--parallel", "12"), + additionalCoursierOptions: List = emptyList(), ) { add(repositoryRule) val bazelCommonRepoName = repositoryRule.name @@ -86,7 +86,7 @@ fun StatementsBuilder.bazelCommonInitialize( bazelCommonRepoName: String, buildifierVersion: String, pinnedMavenInstall: Boolean = true, - additionalCoursierOptions: List = listOf("--parallel", "12"), + additionalCoursierOptions: List = emptyList(), ) { load("@${bazelCommonRepoName}//rules:setup.bzl", "bazel_common_setup") function("bazel_common_setup") { diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/BazelCommonExtension.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/BazelCommonExtension.kt index 1a174a86..4ed4251e 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/BazelCommonExtension.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/BazelCommonExtension.kt @@ -47,7 +47,7 @@ class BazelCommonExtension( ) { var pinnedMavenInstall: Property? = objects?.property()?.convention(true) var additionalCoursierOptions: ListProperty? = objects?.listProperty()?.convention( - listOf("--parallel", "12") + emptyList() ) var preBazelCommonArchives: List diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/MavenInstallExtension.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/MavenInstallExtension.kt index 59dc1410..89f208e3 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/MavenInstallExtension.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/extension/MavenInstallExtension.kt @@ -74,7 +74,7 @@ data class MavenInstallExtension( var versionConflictPolicy: String? = null, var includeCredentials: Boolean = true, var additionalCoursierOptions: ListProperty = objects.listProperty().convention( - listOf("--parallel", "12") + emptyList() ), ) { // TODO GitRepositoryRule diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/internal/WorkspaceBuilder.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/internal/WorkspaceBuilder.kt index eebce47a..5b528bf6 100644 --- a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/internal/WorkspaceBuilder.kt +++ b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/internal/WorkspaceBuilder.kt @@ -162,7 +162,7 @@ internal class WorkspaceBuilder( bazelCommonRepo, buildifier.releaseVersion, bazelCommon.pinnedMavenInstall?.get() ?: true, - bazelCommon.additionalCoursierOptions?.get() ?: listOf("--parallel", "12"), + bazelCommon.additionalCoursierOptions?.get() ?: emptyList(), ) } From e08014c55f5e8b73e33273ad89493961756a52c5 Mon Sep 17 00:00:00 2001 From: "edwin.rahman" Date: Wed, 25 Feb 2026 19:12:59 +0700 Subject: [PATCH 5/6] Fix build --- WORKSPACE | 32 ++++++++------------------------ build.gradle | 11 +++++++++++ 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index edb89858..64316000 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -35,6 +35,14 @@ kotlin_repositories( register_toolchains("//:kotlin_toolchain") +http_archive( + name = "rules_java", + sha256 = "f8ae9ed3887df02f40de9f4f7ac3873e6dd7a471f9cddf63952538b94b59aeb3", + urls = [ + "https://github.com/bazelbuild/rules_java/releases/download/7.6.1/rules_java-7.6.1.tar.gz", + ], +) + load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") git_repository( @@ -54,10 +62,6 @@ bazel_common_deps_init() load("@grab_bazel_common//rules:setup.bzl", "bazel_common_setup") bazel_common_setup( - additional_coursier_options = [ - "--parallel", - "12", - ], buildifier_version = "6.3.3", patched_android_tools = True, pinned_maven_install = True, @@ -101,10 +105,6 @@ load("@rules_jvm_external//:specs.bzl", "maven") maven_install( name = "android_test_maven", - additional_coursier_options = [ - "--parallel", - "12", - ], artifacts = [ "androidx.annotation:annotation-experimental:1.1.0", "androidx.annotation:annotation:1.2.0", @@ -143,10 +143,6 @@ android_test_maven_pinned_maven_install() maven_install( name = "debug_maven", - additional_coursier_options = [ - "--parallel", - "12", - ], artifacts = [ "androidx.annotation:annotation:1.1.0", "androidx.arch.core:core-common:2.1.0", @@ -242,10 +238,6 @@ debug_maven_pinned_maven_install() maven_install( name = "ksp_maven", - additional_coursier_options = [ - "--parallel", - "12", - ], artifacts = [ "com.squareup.moshi:moshi-kotlin-codegen:1.15.0", ], @@ -266,10 +258,6 @@ ksp_maven_pinned_maven_install() maven_install( name = "lint_maven", - additional_coursier_options = [ - "--parallel", - "12", - ], artifacts = [ "com.google.auto.service:auto-service-annotations:1.1.1", "com.slack.lint:slack-lint-checks:0.2.3", @@ -302,10 +290,6 @@ lint_maven_pinned_maven_install() maven_install( name = "maven", - additional_coursier_options = [ - "--parallel", - "12", - ], artifacts = DAGGER_ARTIFACTS + GRAB_BAZEL_COMMON_ARTIFACTS + [ "androidx.activity:activity-compose:1.7.2", "androidx.activity:activity-ktx:1.7.2", diff --git a/build.gradle b/build.gradle index cab551cb..e2fbb48f 100644 --- a/build.gradle +++ b/build.gradle @@ -80,6 +80,17 @@ grazel { supportedArch = ["amd64", "arm64"] } } + preBazelCommonArchives = [ + [ + name: "rules_java", + sha256: "f8ae9ed3887df02f40de9f4f7ac3873e6dd7a471f9cddf63952538b94b59aeb3", + url: "", + urls: ["https://github.com/bazelbuild/rules_java/releases/download/7.6.1/rules_java-7.6.1.tar.gz"], + stripPrefix: null, + patches: [], + patchArgs: [], + ] as com.grab.grazel.extension.PreBazelCommonArchive, + ] } googleServices { crashlytics { From 55d15ad3b0425ad6f75e2bf4beb5f60d55a292d2 Mon Sep 17 00:00:00 2001 From: "edwin.rahman" Date: Wed, 25 Feb 2026 19:26:09 +0700 Subject: [PATCH 6/6] Fix lint --- keystore/BUILD.bazel | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/keystore/BUILD.bazel b/keystore/BUILD.bazel index a44148b1..bb11ee34 100644 --- a/keystore/BUILD.bazel +++ b/keystore/BUILD.bazel @@ -1,10 +1,9 @@ filegroup( - name = "debug-keystore", - srcs = [ - "debug.keystore", - ], - visibility = [ - "//visibility:public", - ] + name = "debug-keystore", + srcs = [ + "debug.keystore", + ], + visibility = [ + "//visibility:public", + ], ) -