Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.0.0] Flip --incompatible_disable_objc_library_transition #20082

Merged
merged 3 commits into from
Nov 10, 2023
Merged

[7.0.0] Flip --incompatible_disable_objc_library_transition #20082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e20276
[7.0.0] Flip --incompatible_disable_objc_library_transition
comius Oct 21, 2023
3988b6a
Merge branch 'release-7.0.0' into ks/7.0.0-flip-incompatible_disable_…
keertk Nov 8, 2023
0af310a
Merge branch 'release-7.0.0' into ks/7.0.0-flip-incompatible_disable_…
keertk Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ public final class BuildLanguageOptions extends OptionsBase {

@Option(
name = "incompatible_disable_objc_library_transition",
defaultValue = "false",
defaultValue = "true",
documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
Expand Down Expand Up @@ -879,7 +879,7 @@ public StarlarkSemantics toStarlarkSemantics() {
public static final String INCOMPATIBLE_OBJC_PROVIDER_REMOVE_LINKING_INFO =
"-incompatible_objc_provider_remove_linking_info";
public static final String INCOMPATIBLE_DISABLE_OBJC_LIBRARY_TRANSITION =
"-incompatible_disable_objc_library_transition";
"+incompatible_disable_objc_library_transition";
public static final String INCOMPATIBLE_FAIL_ON_UNKNOWN_ATTRIBUTES =
"+incompatible_fail_on_unknown_attributes";
public static final String INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION =
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
import java.util.Map;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
import org.junit.Before;

/**
* Superclass for all Obj-C rule tests.
Expand All @@ -89,6 +90,11 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {

protected static final String OUTPUTDIR = TestConstants.PRODUCT_NAME + "-out//bin";

@Before
public void setUp() throws Exception {
setBuildLanguageOptions("--noincompatible_disable_objc_library_transition");
}

/** Specification of code coverage behavior. */
public enum CodeCoverageMode {
// No code coverage information.
Expand Down
Loading