Add redirect from api/latest to the Javadoc of the latest release.

Also: - Added badges for the latest and snapshot versions of Javadocs. - Fixed the whitespaces in the generated HTML files. - Fixed the config so that the website works on local development servers. - Removed some unused files. - Added a basic 404 page.
google · Jan 17, 2025 · 2041486 · 2041486
1 parent b16624c
commit 2041486
Show file tree

Hide file tree

Showing 15 changed files with 129 additions and 139 deletions.
diff --git a/404.md b/404.md
@@ -0,0 +1,8 @@
+---
+layout: default
+title: Page Not Found
+---
+
+# 404
+
+The requested URL does not exist.
diff --git a/_config.yml b/_config.yml
@@ -2,7 +2,6 @@
 title: Guava
 subtitle: Google core libraries for Java
 description: Google core libraries for Java
-baseurl: /
 url: https://guava.dev
 
 themeColor: red

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,4 +1,4 @@
-{% comment %}
+{%- comment -%}
 Copyright (C) 2018 Google LLC.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,8 +11,8 @@
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.foobar2
-{% endcomment %}
+limitations under the License.
+{%- endcomment -%}
 
 <footer class="c-footer">
   <div class="u-container c-footer__container">

diff --git a/_includes/head.html b/_includes/head.html
@@ -1,4 +1,4 @@
-{% comment %}
+{%- comment -%}
 Copyright (C) 2018 Google LLC.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,8 +11,8 @@
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.foobar2
-{% endcomment %}
+limitations under the License.
+{%- endcomment -%}
 
 <head>
   <meta charset="utf-8">
@@ -22,12 +22,11 @@
   <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
   <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-  <link href='https://fonts.googleapis.com/css?family=Roboto:400,400italic,700|Roboto+Mono:400,500' rel='stylesheet' type='text/css'>
+  <link href="https://fonts.googleapis.com/css?family=Roboto:400,400italic,700|Roboto+Mono:400,500" rel="stylesheet" type="text/css">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-  <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
-  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
-  {% if site.googleAnalyticsId %}
+  <link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
+  <link rel="canonical" href="{{ site.url }}{{ site.baseurl }}{{ page.url | replace: 'index.html', '' }}">
+  {%- if site.googleAnalyticsId %}
   <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -37,5 +36,5 @@
     ga('create', '{{ site.googleAnalyticsId }}', 'auto');
     ga('send', 'pageview');
   </script>
-  {% endif %}
+  {%- endif %}
 </head>
diff --git a/_includes/navigation.html b/_includes/navigation.html
@@ -1,4 +1,4 @@
-{% comment %}
+{%- comment -%}
 Copyright (C) 2018 Google LLC.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,16 +11,16 @@
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.foobar2
-{% endcomment %}
+limitations under the License.
+{%- endcomment -%}
 
 <nav class="c-navigation {% if site.fixedNav == 'true' %}is-fixed{% endif %}">
   <div class="c-navigation__container u-container">
 
-    {% for i in site.nav %}
-    {% assign url = i.item.url %}
+    {%- for i in site.nav %}
+    {%- assign url = i.item.url %}
     <a class="c-navigation__item {% if page.url == url %}is-active{% endif %}" href="{{ url | prepend: site.baseurl }}">{{i.item.name}}</a>
-    {% endfor %}
+    {%- endfor %}
 
   </div>
 </nav>
diff --git a/_includes/social.html b/_includes/social.html
diff --git a/_layouts/base.html b/_layouts/base.html
@@ -1,4 +1,4 @@
-{% comment %}
+{%- comment -%}
 Copyright (C) 2018 Google LLC.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,16 +12,14 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-{% endcomment %}
+{%- endcomment -%}
 
 <!DOCTYPE html>
 <html class="t-{{ site.themeColor }}">
-  {% include head.html %}
-  <body>
-    {% include navigation.html %}
-
-    {{ content }}
-
-    {% include footer.html %}
-  </body>
+{% include head.html %}
+<body>
+{% include navigation.html %}
+{{ content }}
+{% include footer.html %}
+</body>
 </html>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -15,6 +15,7 @@
 
 layout: base
 ---
+
 <article class="c-article">
   <header class="c-header c-article__header">
     <div class="u-container">
@@ -23,6 +24,6 @@ <h1 class="c-header__title">{{ page.title }}</h1>
   </header>
 
   <div class="c-article__main">
-    {{ content }}
+{{ content }}
   </div>
 </article>
diff --git a/_layouts/post.html b/_layouts/post.html
diff --git a/_layouts/redirect.html b/_layouts/redirect.html
@@ -1,3 +1,7 @@
+{%- comment -%}
+Template from https://github.com/jekyll/jekyll-redirect-from/blob/master/lib/jekyll-redirect-from/redirect.html
+{%- endcomment -%}
+
 <!DOCTYPE html>
 <html lang="en-US">
   <meta charset="utf-8">

diff --git a/api/badge.svg b/api/badge.svg
diff --git a/api/latest/badge.svg b/api/latest/badge.svg
diff --git a/api/latest/index.html b/api/latest/index.html
@@ -0,0 +1,18 @@
+---
+# Template from https://github.com/jekyll/jekyll-redirect-from/blob/master/lib/jekyll-redirect-from/redirect.html
+---
+{%- capture redirect_to -%}
+  {{ site.baseurl }}/releases/{{ site.latest_release }}-jre/api/docs/
+{%- endcapture -%}
+
+<!DOCTYPE html>
+<html lang="en-US">
+  <meta charset="utf-8">
+  <title>Redirecting&hellip;</title>
+  <link rel="canonical" href="{{ redirect_to }}">
+  <script>location="{{ redirect_to }}"+location.hash</script>
+  <meta http-equiv="refresh" content="0; url={{ redirect_to }}">
+  <meta name="robots" content="noindex">
+  <h1>Redirecting&hellip;</h1>
+  <a href="{{ redirect_to }}">Click here if you are not redirected.</a>
+</html>
diff --git a/elements/GitHub-Mark-Light-32px.png b/elements/GitHub-Mark-Light-32px.png
diff --git a/elements/github-fab.html b/elements/github-fab.html