diff options
| author | Esteban de la Canal <estebandlc@google.com> | 2020-07-11 15:52:28 -0700 |
|---|---|---|
| committer | Esteban de la Canal <estebandlc@google.com> | 2020-07-11 16:14:08 -0700 |
| commit | 0b0bd0f1aecf7fb964b17704fe23fa8c28118881 (patch) | |
| tree | 57869d3a77293206bd218415ce56ee550a4d6191 | |
| parent | d6ce57a499d5d7688257aa712d18e21f00f76e1d (diff) | |
| download | swing-testing-0b0bd0f1aecf7fb964b17704fe23fa8c28118881.tar.gz | |
Use new library scheme for unb. rules
Test: existing
Bug: 156497102
Change-Id: Idd54c5c70405045e7d9ccd66ecb3a592bfbcc32d
| -rw-r--r-- | fest-swing/BUILD | 8 | ||||
| -rw-r--r-- | fest-swing/lib/BUILD | 29 |
2 files changed, 8 insertions, 29 deletions
diff --git a/fest-swing/BUILD b/fest-swing/BUILD index a4bb7817..0317a8d6 100644 --- a/fest-swing/BUILD +++ b/fest-swing/BUILD @@ -31,9 +31,7 @@ iml_module( srcs = ["src/main/java"], bundled_deps = [ "//tools/swing-testing/fest-swing/lib:unb.fest-reflect-2.0-SNAPSHOT", - "//tools/swing-testing/fest-swing/lib:unb.annotations-13.0", - "//tools/swing-testing/fest-swing/lib:unb.fest-assert-1.5.0-SNAPSHOT", - "//tools/swing-testing/fest-swing/lib:unb.fest-util-1.3.0-SNAPSHOT", + "//tools/swing-testing/fest-swing/lib:unb.fest", "//tools/swing-testing/fest-swing/lib:unb.jcip-annotations-1.0-1", ], iml_files = ["fest-swing.iml"], @@ -51,9 +49,7 @@ iml_module( deps = [ "//prebuilts/studio/intellij-sdk:studio-sdk", "//tools/swing-testing/fest-swing/lib:unb.fest-reflect-2.0-SNAPSHOT", - "//tools/swing-testing/fest-swing/lib:unb.annotations-13.0", - "//tools/swing-testing/fest-swing/lib:unb.fest-assert-1.5.0-SNAPSHOT", - "//tools/swing-testing/fest-swing/lib:unb.fest-util-1.3.0-SNAPSHOT", + "//tools/swing-testing/fest-swing/lib:unb.fest", "//tools/adt/idea/.idea/libraries:unb.mockito[test]", "//tools/swing-testing/fest-swing/lib:unb.MultithreadedTC-1.01[test]", "//tools/swing-testing/fest-swing/lib:unb.jcip-annotations-1.0-1", diff --git a/fest-swing/lib/BUILD b/fest-swing/lib/BUILD index 4cd5a4bc..bc04f82c 100644 --- a/fest-swing/lib/BUILD +++ b/fest-swing/lib/BUILD @@ -53,30 +53,13 @@ java_import( # managed by go/iml_to_build [unb] java_import( - name = "unb.annotations-13.0", - jars = ["annotations-13.0.jar"], - tags = [ - "manual", - "unb", - ], - visibility = ["//visibility:public"], -) - -# managed by go/iml_to_build [unb] -java_import( - name = "unb.fest-assert-1.5.0-SNAPSHOT", - jars = ["fest-assert-1.5.0-SNAPSHOT.jar"], - tags = [ - "manual", - "unb", + name = "unb.fest", + # do not sort: must match IML order + jars = [ + "annotations-13.0.jar", + "fest-assert-1.5.0-SNAPSHOT.jar", + "fest-util-1.3.0-SNAPSHOT.jar", ], - visibility = ["//visibility:public"], -) - -# managed by go/iml_to_build [unb] -java_import( - name = "unb.fest-util-1.3.0-SNAPSHOT", - jars = ["fest-util-1.3.0-SNAPSHOT.jar"], tags = [ "manual", "unb", |