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.

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

Enforce JDK8 when running `publish-docs.sh` #973

Merged
merged 2 commits into from Mar 20, 2020

Conversation

@idelpivnitskiy
Copy link
Member

idelpivnitskiy commented Mar 18, 2020

Motivation:

Different JDK versions produce different website style for
javadoc.

Modifications:

  • Make sure the current Java version is 1.8 before running
    publish-docs.sh;

Result:

Javadoc website always published with the consistent format
and style.

Motivation:

Different JDK versions produce different website style for
javadoc.

Modifications:

- Make sure the current Java version is 1.8 before running
`publish-docs.sh`;

Result:

Javadoc website always published with the consistent format
and style.
@idelpivnitskiy idelpivnitskiy requested review from NiteshKant and Scottmitch Mar 18, 2020
@@ -48,6 +48,13 @@ function clean_up_gh_pages() {
rm -rf gh-pages
}

# Enforce JDK8 to keep javadoc format consistent for all versions:
java_version=$(java -version 2>&1 | grep 'version' 2>&1 | awk -F\" '{ split($2,a,"."); print a[1]"."a[2]}')

This comment has been minimized.

Copy link
@NiteshKant

NiteshKant Mar 19, 2020

Member

As we use gradle to create javadocs, should we be considering if org.gradle.java.home is set?

This comment has been minimized.

Copy link
@idelpivnitskiy

idelpivnitskiy Mar 19, 2020

Author Member

You are right, we need to extract the version of JVM that gradlew sees. I've updated the script to use ./gradlew -version.

@idelpivnitskiy idelpivnitskiy merged commit 666a16b into apple:master Mar 20, 2020
3 checks passed
3 checks passed
pull request validation (jdk11) Build finished.
Details
pull request validation (jdk8) Build finished.
Details
pull request validation (quality) Build finished.
Details
@idelpivnitskiy idelpivnitskiy deleted the idelpivnitskiy:publish-docs-java-version branch Mar 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.