Merge branch 'donbeave-master'

gradle.properties

@@ -3,5 +3,6 @@ title=Micronaut Build Plugins
 projectDesc=Micronaut internal Gradle plugins. Not intended to be used in user's projects
 projectUrl=https://micronaut.io
 githubSlug=micronaut-projects/micronaut-build
-groovyVersion=3.0.9
+# must match the Gradle version for functional tests to pass
+groovyVersion=3.0.10
 org.gradle.java.installations.fromEnv=JAVA_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/functionalTest/gradle-projects/multi-project-bom/settings.gradle

@@ -1,3 +1,7 @@
+plugins {
+    id("io.micronaut.build.shared.settings")
+}
+
 rootProject.name = "freedom"
 
 include "freedom-bom"

src/main/template/css/custom.css

@@ -259,7 +259,7 @@ Changes to make individual pages render properly
     display: none;
 }
 
-/* 
+/*
 
 Dark theme overrides
 
@@ -298,18 +298,18 @@ html .dark-mode, body.dark-mode, .dark-mode #main, .dark-mode .docs-content {
     color: #f0bcb4
 }
 
-.dark-mode a, .dark-mode a:hover, .dark-mode a:focus, .dark-mode a:active, .dark-mode a:hover, 
-.dark-mode #table-of-content a:hover strong, .dark-mode #table-of-content a strong, .dark-mode .menu a:hover, 
+.dark-mode a, .dark-mode a:hover, .dark-mode a:focus, .dark-mode a:active, .dark-mode a:hover,
+.dark-mode #table-of-content a:hover strong, .dark-mode #table-of-content a strong, .dark-mode .menu a:hover,
 .dark-mode .local .local-title .toggle a {
     color: #77aeff !important;
 }
 
-.dark-mode .subheader, .dark-mode .admonitionblock td.content > .title, .dark-mode .audioblock > .title, 
-.dark-mode .exampleblock > .title, .dark-mode .imageblock > .title, .dark-mode .listingblock > .title, 
-.dark-mode .literalblock > .title, .dark-mode .stemblock > .title, .dark-mode .openblock > .title, 
-.dark-mode .paragraph > .title, .dark-mode .quoteblock > .title, .dark-mode table.tableblock > .title, 
-.dark-mode .verseblock > .title, .dark-mode .videoblock > .title, .dark-mode .dlist > .title, 
-.dark-mode .olist > .title, .dark-mode .ulist > .title, .dark-mode .qlist > .title, .dark-mode .hdlist > .title, 
+.dark-mode .subheader, .dark-mode .admonitionblock td.content > .title, .dark-mode .audioblock > .title,
+.dark-mode .exampleblock > .title, .dark-mode .imageblock > .title, .dark-mode .listingblock > .title,
+.dark-mode .literalblock > .title, .dark-mode .stemblock > .title, .dark-mode .openblock > .title,
+.dark-mode .paragraph > .title, .dark-mode .quoteblock > .title, .dark-mode table.tableblock > .title,
+.dark-mode .verseblock > .title, .dark-mode .videoblock > .title, .dark-mode .dlist > .title,
+.dark-mode .olist > .title, .dark-mode .ulist > .title, .dark-mode .qlist > .title, .dark-mode .hdlist > .title,
 .dark-mode .quoteblock blockquote::before {
     color: #ff9686;
 }
@@ -356,7 +356,7 @@ html .dark-mode, body.dark-mode, .dark-mode #main, .dark-mode .docs-content {
     border-left: 0px none;
 }
 
-.dark-mode .admonitionblock td.icon .icon-note::before, .dark-mode .admonitionblock td.icon [class^="fa icon-"], 
+.dark-mode .admonitionblock td.icon .icon-note::before, .dark-mode .admonitionblock td.icon [class^="fa icon-"],
 .dark-mode .admonitionblock td.icon .icon-tip::before {
     text-shadow: none;
     color: rgba(255, 255, 255, 0.8);
@@ -373,8 +373,8 @@ html .dark-mode, body.dark-mode, .dark-mode #main, .dark-mode .docs-content {
     color: #aaaaaa;
 }
 
-.dark-mode .literalblock pre, .dark-mode .listingblock pre:not(.highlight), 
-.dark-mode .listingblock pre[class="highlight"], .dark-mode .listingblock pre[class^="highlight "], 
+.dark-mode .literalblock pre, .dark-mode .listingblock pre:not(.highlight),
+.dark-mode .listingblock pre[class="highlight"], .dark-mode .listingblock pre[class^="highlight "],
 .dark-mode .listingblock pre.CodeRay, .dark-mode .listingblock pre.prettyprint {
     background-color: #222222;
 }
@@ -427,3 +427,58 @@ html .dark-mode, body.dark-mode, .dark-mode #main, .dark-mode .docs-content {
     scrollbar-color: #555 rgba(0, 0, 0, 0.3);
     scrollbar-width: thin;
 }
+
+/* For mobile phones: */
+@media only screen and (max-width: 428px) and (orientation: portrait), only screen and (max-width: 926px) and (orientation: landscape) {
+    #main {
+        border: 0;
+        padding: 0 !important;
+    }
+
+    #navigation ul li {
+        padding: 7px 0;
+    }
+
+    #table-of-content {
+        margin-top: 50px;
+    }
+
+    .toc-content {
+        padding-left: 20px;
+    }
+
+    table {
+        display: block;
+        overflow-x: auto;
+        white-space: nowrap;
+    }
+
+    code {
+        word-break: break-word;
+    }
+
+    .contribute-btn {
+        bottom: auto;
+        float: none;
+        right: auto;
+        position: unset;
+        margin-bottom: 7px;
+    }
+
+    .contribute-btn .btn {
+        font-size: 11px;
+        padding: 4px 9px;
+    }
+
+    .note {
+        width: auto;
+    }
+
+    h1 {
+        margin-bottom: 0.1em;
+    }
+
+    .listingblock > div {
+        overflow: hidden;
+    }
+}

src/main/template/style/layout.html

@@ -3,6 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
     <title>${title.encodeAsHtml()}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <link rel="stylesheet" href="${resourcesPath}/css/main.css" type="text/css" media="screen, print" title="Style" charset="utf-8" />
     <link rel="stylesheet" href="${resourcesPath}/css/custom.css" type="text/css" media="screen, print" title="Style" charset="utf-8" />
@@ -125,4 +126,4 @@ <h1>${title.encodeAsHtml()}</h1>
 
 </script>
 </body>
-</html>
+</html>