diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 17e8e3ae..2db47bdd 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -14,16 +14,6 @@ tasks: test_targets: - "--" - "//..." - android_ubuntu2204: - name: Android Tests - platform: ubuntu2204 - test_flags: - # TODO(https://github.com/bazelbuild/rules_jvm_external/issues/978): - # These tests are not compatible with Android platforms, so use the legacy mode - - "--noincompatible_enable_android_toolchain_resolution" - test_targets: - - "--" - - "//tests/integration/override_targets:override_targets" ubuntu2204_6_4_0: platform: ubuntu2204 bazel: 6.4.0 diff --git a/WORKSPACE b/WORKSPACE index 543b0e6d..4d1bc562 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -2,8 +2,6 @@ workspace(name = "rules_jvm_external") android_sdk_repository(name = "androidsdk") -android_ndk_repository(name = "androidndk") - load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file") load( "//private:versions.bzl", @@ -232,8 +230,6 @@ maven_install( "org.openjfx:javafx-base:11.0.1", # https://github.com/bazelbuild/rules_jvm_external/issues/178 "io.kubernetes:client-java:4.0.0-beta1", - # https://github.com/bazelbuild/rules_jvm_external/issues/199 - "com.google.ar.sceneform.ux:sceneform-ux:1.10.0", # https://github.com/bazelbuild/rules_jvm_external/issues/119#issuecomment-504704752 "com.github.oshi:oshi-parent:3.4.0", "com.github.spinalhdl:spinalhdl-core_2.11:1.3.6", @@ -284,9 +280,6 @@ maven_install( fail_if_repin_required = True, generate_compat_repositories = True, maven_install_json = "//tests/custom_maven_install:regression_testing_coursier_install.json", - override_targets = { - "com.google.ar.sceneform:rendering": "@//tests/integration/override_targets:sceneform_rendering", - }, repositories = [ "https://repo1.maven.org/maven2", "https://maven.google.com", @@ -313,6 +306,7 @@ maven_install( # https://github.com/bazelbuild/rules_jvm_external/issues/1144 "org.codehaus.plexus:plexus:1.0.4", "org.hamcrest:hamcrest-core:1.3", + # https://github.com/bazelbuild/rules_jvm_external/issues/199 # https://github.com/bazelbuild/rules_jvm_external/issues/1162 "io.opentelemetry:opentelemetry-sdk", maven.artifact( @@ -855,6 +849,7 @@ maven_install( ], maven_install_json = "@rules_jvm_external//tests/custom_maven_install:override_target_in_deps_install.json", override_targets = { + # https://github.com/bazelbuild/rules_jvm_external/issues/199 # This is a transitive dep of `opentelemetry-sdk` "io.opentelemetry:opentelemetry-api": "@//tests/integration/override_targets:additional_deps", }, diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod index 5065547c..f9d6955f 100644 --- a/WORKSPACE.bzlmod +++ b/WORKSPACE.bzlmod @@ -2,4 +2,3 @@ workspace(name = "rules_jvm_external") # Use this until we can use some pure-bzlmod approach android_sdk_repository(name = "androidsdk") -android_ndk_repository(name = "androidndk") diff --git a/tests/integration/override_targets/BUILD b/tests/integration/override_targets/BUILD index 64096f5c..05376a33 100644 --- a/tests/integration/override_targets/BUILD +++ b/tests/integration/override_targets/BUILD @@ -1,43 +1,6 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") -load("@rules_android//android:rules.bzl", "aar_import", "android_binary") load("@rules_java//java:defs.bzl", "java_library") -build_test( - name = "override_targets", - tags = ["manual"], # https://github.com/bazelbuild/rules_jvm_external/issues/978 - targets = [":app"], -) - -android_binary( - name = "app", - custom_package = "not.used", - manifest = "AndroidManifest.xml", - tags = ["manual"], # https://github.com/bazelbuild/rules_jvm_external/issues/978 - deps = [ - "@regression_testing_coursier//:com_google_ar_sceneform_ux_sceneform_ux", - ], -) - -# rendering-1.10.0.aar is known to have an incomplete list of dependencies in -# its POM file. We manually replace the generated target here to work around -# this issue. See https://github.com/bazelbuild/rules_jvm_external/issues/199 -# for more information. -aar_import( - name = "sceneform_rendering", - aar = "@com.google.ar.sceneform_rendering//file", - tags = [ - "manual", - "maven_coordinates=com.google.ar.sceneform:rendering:aar:1.10.0", - ], - visibility = ["@regression_testing_coursier//:__subpackages__"], - deps = [ - # Add the missing dependencies - "@regression_testing_coursier//:com_google_ar_core", - "@regression_testing_coursier//:com_google_ar_sceneform_sceneform_base", - "@regression_testing_coursier//:com_google_ar_sceneform_filament_android", - ], -) - java_library( name = "additional_deps", visibility = ["//visibility:public"],