Skip to content

Commit 8220c3b

Browse files
BanzaiManplaindocs
authored andcommitted
Rephrase OS X image and JDK versions (travis-ci#2105)
Mac builds _can_ take advantage of `jdk` keys. The older images come with `jdk_switcher`, which is effective for JDKs up to 8; the new ones will use `install_jdk.sh`, which can effective for JDKs 10 and later.
1 parent 24fb1f9 commit 8220c3b

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

user/reference/osx.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,11 @@ directory alphabetically.
7373

7474
## JDK and OS X
7575

76-
The JDK available in the OS X environment is tied to the Xcode version selected for your build, it is not set independently. To use a particular JDK for your build, be sure to select an [OS X image](#OS-X-Version) which includes the version of Java that you need.
76+
Note the pre-installed JDK version (OracleJDK) for each image in the table below.
77+
While Mac jobs can test against multiple JDK versions using the [`jdk` key](/user/languages/java/#testing-against-multiple-jdks),
78+
OS X images up to `xcode9.3` can only switch up to Java 8, and images `xcode9.4` and later can switch to Java 10 (if pre-installed) and later.
79+
In practical terms, if your Mac build requires Java 8 and below, use `xcode9.3` (or below); if your build requires Java 10
80+
and later, use `xcode9.4` (or later).
7781

7882
<table>
7983

0 commit comments

Comments
 (0)