From b51d8cd76de2e39d55870bb5c0a2779d9f7febb0 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 8 Feb 2018 23:09:44 +0100 Subject: [PATCH] Common GWT module: Exclude testing package for super dev mode The testing package has its own bazel package (it has BUILD file) and this is not part of the final artifact built with common:client rule. However, because of wild card inclusion in Common.gwt.xml, the whole tree is included in GWT module, when used from Eclipse in super dev mode debug sessions. To avoid needing to add @GwtIncompatible to all files in this package, exclude this package from GWT module source path in the GWT module definition. Change-Id: Ib36348084d59cc5e10f8dc5c7c627fc4e3323609 --- java/com/google/gerrit/common/Common.gwt.xml | 1 + .../gerrit/common/data/testing/GroupReferenceSubject.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/java/com/google/gerrit/common/Common.gwt.xml b/java/com/google/gerrit/common/Common.gwt.xml index fede66517b..56bbb84d23 100644 --- a/java/com/google/gerrit/common/Common.gwt.xml +++ b/java/com/google/gerrit/common/Common.gwt.xml @@ -18,6 +18,7 @@ + diff --git a/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java b/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java index b689254b9e..1988d66603 100644 --- a/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java +++ b/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java @@ -16,7 +16,6 @@ package com.google.gerrit.common.data.testing; import static com.google.common.truth.Truth.assertAbout; -import com.google.common.annotations.GwtIncompatible; import com.google.common.truth.ComparableSubject; import com.google.common.truth.FailureMetadata; import com.google.common.truth.StringSubject; @@ -25,7 +24,6 @@ import com.google.common.truth.Truth; import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.reviewdb.client.AccountGroup; -@GwtIncompatible("Unemulated com.google.gerrit.common.data.testing.GroupReferenceSubject") public class GroupReferenceSubject extends Subject { public static GroupReferenceSubject assertThat(GroupReference group) {