diff options
| author |  Googler <noreply@google.com> | 2015-08-18 03:19:31 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-08-18 10:40:30 +0000 |
| commit | 8fdb5d0db4170bd41ef2a91c9eed4801dca84de1 (patch) | |
| tree | b91849a4f1cba22dc86cb351b69d1dc580ccf94b /src/main | |
| parent | cbe26343e56e18fd5021d4354cb76b11830e9d97 (diff) | |
Change Objective-C defaults to match current versions.
RELNOTES: Change Objective-C defaults to sdk 8.4 and ios_cpu=x86_64 (64-bit simulator).
--
MOS_MIGRATED_REVID=100890740
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java index 7ac2e616db..91e747978e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java @@ -40,11 +40,12 @@ public class ObjcCommandLineOptions extends FragmentOptions { ) public String iosSdkVersion; - @VisibleForTesting static final String DEFAULT_SDK_VERSION = "8.1"; + @VisibleForTesting static final String DEFAULT_SDK_VERSION = "8.4"; @Option(name = "ios_simulator_version", - defaultValue = "7.1", + defaultValue = "8.4", category = "run", + deprecationWarning = "Use target_device instead to drive the simulator to use.", help = "The version of iOS to run on the simulator when running or testing. This is ignored " + "for ios_test rules if a target device is specified in the rule.") public String iosSimulatorVersion; @@ -166,7 +167,7 @@ public class ObjcCommandLineOptions extends FragmentOptions { public ConfigurationDistinguisher configurationDistinguisher; @VisibleForTesting static final String DEFAULT_MINIMUM_IOS = "7.0"; - @VisibleForTesting static final String DEFAULT_IOS_CPU = "i386"; + @VisibleForTesting static final String DEFAULT_IOS_CPU = "x86_64"; @Override public void addAllLabels(Multimap<String, Label> labelMap) { |