Skip to content

Commit

Permalink
Flip deprecated_generated_xcode_project default to false.
Browse files Browse the repository at this point in the history
This should be safe as it has already been set to false in the rc files for
Blaze and Exoblaze.

--
PiperOrigin-RevId: 150436179
MOS_MIGRATED_REVID=150436179
  • Loading branch information
aragos authored and hermione521 committed Mar 20, 2017
1 parent c09b83c commit f4bf522
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public class ObjcCommandLineOptions extends FragmentOptions {

@Option(
name = "deprecated_generate_xcode_project",
defaultValue = "true",
defaultValue = "false",
category = "flags",
help =
"If set, will generate xcode project for targets that support this. Will be removed soon."
Expand Down
5 changes: 0 additions & 5 deletions src/test/shell/bazel/apple/bazel_objc_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ function test_build_app() {

bazel build --verbose_failures --ios_sdk_version=$IOS_SDK_VERSION \
//ios:app >$TEST_log 2>&1 || fail "should pass"
ls bazel-bin/ios/app.xcodeproj || fail "should generate app.xcodeproj"
ls bazel-bin/ios/app.ipa || fail "should generate app.ipa"
}

Expand All @@ -117,8 +116,6 @@ function test_ios_test() {

bazel build --test_output=all --ios_sdk_version=$IOS_SDK_VERSION \
//ios:PassingXcTest >$TEST_log 2>&1 || fail "should pass"
ls bazel-bin/ios/PassingXcTest.xcodeproj \
|| fail "should generate PassingXcTest.xcodeproj"
ls bazel-bin/ios/PassingXcTest.ipa \
|| fail "should generate PassingXcTest.ipa"
}
Expand All @@ -129,7 +126,6 @@ function test_valid_ios_sdk_version() {

bazel build --verbose_failures --ios_sdk_version=$IOS_SDK_VERSION \
//ios:app >$TEST_log 2>&1 || fail "should pass"
ls bazel-bin/ios/app.xcodeproj || fail "should generate app.xcodeproj"
ls bazel-bin/ios/app.ipa || fail "should generate app.ipa"
}

Expand All @@ -145,7 +141,6 @@ function test_xcrun_cache() {
ls bazel-out/__xcruncache || fail "xcrun cache should be present"
bazel build --verbose_failures --ios_sdk_version=$IOS_SDK_VERSION \
//ios:app >$TEST_log 2>&1 || fail "should pass"
ls bazel-bin/ios/app.xcodeproj || fail "should generate app.xcodeproj"
ls bazel-bin/ios/app.ipa || fail "should generate app.ipa"
ls bazel-out/__xcruncache || fail "xcrun cache should be present"

Expand Down

0 comments on commit f4bf522

Please sign in to comment.