diff --git a/404.md b/404.md
new file mode 100644
index 000000000000..2cac40dd6831
--- /dev/null
+++ 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
index a15ec6c4ead1..fbed776e1c80 100644
--- 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
index 0054ae10cd02..5c9912fcf627 100644
--- 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
index 6e2c92d477d8..ba2f81eadc16 100644
--- 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
index 63eab8325e7b..629e342b3c5d 100644
--- 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
deleted file mode 100644
index a8d17afd838a..000000000000
--- a/_includes/social.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% comment %}
-Copyright (C) 2018 Google LLC.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-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 %}
-
-<div class="c-social">
- <ul class="c-social__list">
- <li>
- <h3 class="c-social__title">Google+</h3>
- <p class="c-social__description">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ullam, consequatur!</p>
- </li>
-
- <li>
- <h3 class="c-social__title">Google+</h3>
- <p class="c-social__description">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Et, quo.</p>
- </li>
-
- <li>
- <h3 class="c-social__title">Google+</h3>
- <p class="c-social__description">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officia, voluptatem.</p>
- </li>
-
- <li>
- <h3 class="c-social__title">Google+</h3>
- <p class="c-social__description">Lorem ipsum dolor sit amet, consectetur adipisicing elit. At, rerum.</p>
- </li>
- </ul>
-</div>
diff --git a/_layouts/base.html b/_layouts/base.html
index b49752fbf8e4..2668800c3ca8 100644
--- 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
index 5e5f127f121c..660231f8af8b 100644
--- 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
deleted file mode 100644
index c2df0a121df5..000000000000
--- a/_layouts/post.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# Copyright (C) 2018 Google LLC.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# 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.
-
-layout: default
----
-{{ content }}
diff --git a/_layouts/redirect.html b/_layouts/redirect.html
index 99cf70f31fc8..6dd0f6159601 100644
--- 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
new file mode 100644
index 000000000000..a9031c627b7d
--- /dev/null
+++ b/api/badge.svg
@@ -0,0 +1,36 @@
+---
+# Generated from https://img.shields.io/badge/javadoc-HEAD--jre--SNAPSHOT-brightgreen.svg
+---
+{%- assign version = "HEAD-jre-SNAPSHOT" -%}
+
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="180" height="20" role="img" aria-label="javadoc: {{ version }}">
+ <title>javadoc: {{ version }}</title>
+ <linearGradient id="s" x2="0" y2="100%">
+ <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+ <stop offset="1" stop-opacity=".1"/>
+ </linearGradient>
+ <clipPath id="r">
+ <rect width="180" height="20" rx="3" fill="#fff"/>
+ </clipPath>
+ <g clip-path="url(#r)">
+ <rect width="53" height="20" fill="#555"/>
+ <rect x="53" width="127" height="20" fill="#4c1"/>
+ <rect width="180" height="20" fill="url(#s)"/>
+ </g>
+ <g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif"
+ text-rendering="geometricPrecision" font-size="110">
+ <text aria-hidden="true" x="275" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">
+ javadoc
+ </text>
+ <text x="275" y="140" transform="scale(.1)" fill="#fff" textLength="430">
+ javadoc
+ </text>
+ <text aria-hidden="true" x="1155" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1170">
+ {{ version }}
+ </text>
+ <text x="1155" y="140" transform="scale(.1)" fill="#fff" textLength="1170">
+ {{ version }}
+ </text>
+ </g>
+</svg>
diff --git a/api/latest/badge.svg b/api/latest/badge.svg
new file mode 100644
index 000000000000..de3a7e696b61
--- /dev/null
+++ b/api/latest/badge.svg
@@ -0,0 +1,36 @@
+---
+# Generated from https://javadoc.io/badge2/com.google.guava/guava/javadoc.svg
+---
+{%- assign version = site.latest_release | append: "-jre" -%}
+
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="118" height="20" role="img" aria-label="javadoc: {{ version }}">
+ <title>javadoc: {{ version }}</title>
+ <linearGradient id="s" x2="0" y2="100%">
+ <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+ <stop offset="1" stop-opacity=".1"/>
+ </linearGradient>
+ <clipPath id="r">
+ <rect width="118" height="20" rx="3" fill="#fff"/>
+ </clipPath>
+ <g clip-path="url(#r)">
+ <rect width="53" height="20" fill="#555"/>
+ <rect x="53" width="65" height="20" fill="#4c1"/>
+ <rect width="118" height="20" fill="url(#s)"/>
+ </g>
+ <g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif"
+ text-rendering="geometricPrecision" font-size="110">
+ <text aria-hidden="true" x="275" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">
+ javadoc
+ </text>
+ <text x="275" y="140" transform="scale(.1)" fill="#fff" textLength="430">
+ javadoc
+ </text>
+ <text aria-hidden="true" x="845" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="550">
+ {{ version }}
+ </text>
+ <text x="845" y="140" transform="scale(.1)" fill="#fff" textLength="550">
+ {{ version }}
+ </text>
+ </g>
+</svg>
diff --git a/api/latest/index.html b/api/latest/index.html
new file mode 100644
index 000000000000..4c68f05c045d
--- /dev/null
+++ 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…</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…</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
deleted file mode 100644
index 628da97c7089..000000000000
Binary files a/elements/GitHub-Mark-Light-32px.png and /dev/null differ
diff --git a/elements/github-fab.html b/elements/github-fab.html
deleted file mode 100644
index 510689933701..000000000000
--- a/elements/github-fab.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{% comment %}
-Copyright (C) 2018 Google LLC.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-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.
-{% endcomment %}
-
-<link rel="import" href="../bower_components/polymer/polymer.html">
-<link rel="import" href="../bower_components/paper-tooltip/paper-tooltip.html">
-<link rel="import" href="../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../bower_components/paper-fab/paper-fab.html">
-
-<polymer-element name="github-fab">
- <template>
- <style shim-shadowdom>
- paper-tooltip.fancy::shadow .paper-tooltip {
- opacity: 0;
- -webkit-transition: all 300ms cubic-bezier(0,1.92,.99,1.07);
- transition: all 300ms cubic-bezier(0,1.92,.99,1.07);
- -webkit-transform: translate3d(0, -10px, 0);
- transform: translate3d(0, -10px, 0);
- }
-
- paper-tooltip.fancy:hover::shadow .paper-tooltip,
- paper-tooltip.fancy:focus::shadow .paper-tooltip {
- opacity: 1;
- -webkit-transform: translate3d(0, 0, 0);
- transform: translate3d(0, 0, 0);
- }
- </style>
-
- <paper-tooltip id="fork-button" label="Fork me on github" class="fancy" position="left">
- <paper-fab src="GitHub-Mark-Light-32px.png" on-click="{{gogogo}}"></paper-fab>
- </paper-tooltip>
- </template>
- <script>
- Polymer({
- gogogo: function() {
- window.open("http://github.com/google/dagger");
- }
- });
- </script>
-</polymer-element>