From b418a2b197da38a699f1aaeb92ba350650efe7c5 Mon Sep 17 00:00:00 2001 From: Juan Valencia Calvellido Date: Thu, 20 Feb 2020 15:48:41 +0100 Subject: [PATCH 1/2] Add doctype declaration as a string when the TypedTag render method run --- src/main/scala/microsites/util/MicrositeHelper.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/microsites/util/MicrositeHelper.scala b/src/main/scala/microsites/util/MicrositeHelper.scala index d7398e28..70fc14ba 100644 --- a/src/main/scala/microsites/util/MicrositeHelper.scala +++ b/src/main/scala/microsites/util/MicrositeHelper.scala @@ -199,7 +199,7 @@ class MicrositeHelper(config: MicrositeSettings) { val targetPath = s"$targetDir$jekyllDir/_layouts/$layoutName.html" createFile(targetPath) - writeContentToFile(layout.render.toString(), targetPath) + writeContentToFile("" + layout.render.toString(), targetPath) targetPath.toFile } } From 19c32bab1bcc3e5cb925a21a8f692555ceeb8003 Mon Sep 17 00:00:00 2001 From: Juan Valencia Calvellido Date: Thu, 20 Feb 2020 16:49:59 +0100 Subject: [PATCH 2/2] Update copyright notice --- .../scala/microsites/DocsLayoutTest.scala | 2 +- .../scala/microsites/HomeLayoutTest.scala | 2 +- src/test/scala/microsites/LayoutTest.scala | 2 +- .../microsites/MenuPartialLayoutTest.scala | 2 +- .../scala/microsites/PageLayoutTest.scala | 2 +- .../scala/microsites/util/Arbitraries.scala | 115 +++++++++--------- 6 files changed, 64 insertions(+), 61 deletions(-) diff --git a/src/test/scala/microsites/DocsLayoutTest.scala b/src/test/scala/microsites/DocsLayoutTest.scala index 564e9a82..6b017eec 100644 --- a/src/test/scala/microsites/DocsLayoutTest.scala +++ b/src/test/scala/microsites/DocsLayoutTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 47 Degrees, LLC. + * Copyright 2016-2020 47 Degrees, LLC. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/microsites/HomeLayoutTest.scala b/src/test/scala/microsites/HomeLayoutTest.scala index 1b49f9d8..284d62ff 100644 --- a/src/test/scala/microsites/HomeLayoutTest.scala +++ b/src/test/scala/microsites/HomeLayoutTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 47 Degrees, LLC. + * Copyright 2016-2020 47 Degrees, LLC. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/microsites/LayoutTest.scala b/src/test/scala/microsites/LayoutTest.scala index 56c2bf89..c8d6c49a 100644 --- a/src/test/scala/microsites/LayoutTest.scala +++ b/src/test/scala/microsites/LayoutTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 47 Degrees, LLC. + * Copyright 2016-2020 47 Degrees, LLC. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/microsites/MenuPartialLayoutTest.scala b/src/test/scala/microsites/MenuPartialLayoutTest.scala index 31e75179..2a7ec458 100644 --- a/src/test/scala/microsites/MenuPartialLayoutTest.scala +++ b/src/test/scala/microsites/MenuPartialLayoutTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 47 Degrees, LLC. + * Copyright 2016-2020 47 Degrees, LLC. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/microsites/PageLayoutTest.scala b/src/test/scala/microsites/PageLayoutTest.scala index f6be0a03..0bfbe39d 100644 --- a/src/test/scala/microsites/PageLayoutTest.scala +++ b/src/test/scala/microsites/PageLayoutTest.scala @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 47 Degrees, LLC. + * Copyright 2016-2020 47 Degrees, LLC. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/scala/microsites/util/Arbitraries.scala b/src/test/scala/microsites/util/Arbitraries.scala index 129ae35b..d0b3df7a 100644 --- a/src/test/scala/microsites/util/Arbitraries.scala +++ b/src/test/scala/microsites/util/Arbitraries.scala @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 47 Degrees, LLC. + * Copyright 2016-2020 47 Degrees, LLC. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -132,61 +132,64 @@ trait Arbitraries { micrositeFooterText ← Arbitrary.arbitrary[Option[String]] micrositeEditButton ← micrositeEditButtonArbitrary.arbitrary micrositeVersionList ← Arbitrary.arbitrary[Seq[String]] - } yield - MicrositeSettings( - MicrositeIdentitySettings( - name, - description, - author, - homepage, - organizationHomepage, - twitter, - twitterCreator, - analytics), - MicrositeVisualSettings( - highlightTheme, - highlightLanguages, - palette, - favicon, - shareOnSocial, - theme), - MicrositeTemplateTexts( - micrositeFooterText - ), - micrositeConfigYaml, - MicrositeFileLocations( - micrositeImgDirectory, - micrositeCssDirectory, - micrositeSassDirectory, - micrositeJsDirectory, - micrositeCDNDirectives, - micrositeExternalLayoutsDirectory, - micrositeExternalIncludesDirectory, - micrositeDataDirectory, - micrositeStaticDirectory, - micrositeExtraMdFiles, - micrositeExtraMdFilesOutput, - micrositePluginsDirectory - ), - MicrositeUrlSettings( - micrositeUrl, - micrositeBaseUrl, - micrositeDocumentationUrl, - micrositeDocumentationLabelDescription), - MicrositeGitSettings( - githubOwner, - githubRepo, - githubLinks, - gitHostingService, - gitHostingUrl, - gitSidecarChat, - gitSidecarChatUrl), - MicrositeEditButtonSettings( - micrositeEditButton - ), - MicrositeMultiversionSettings( - micrositeVersionList - ) + } yield MicrositeSettings( + MicrositeIdentitySettings( + name, + description, + author, + homepage, + organizationHomepage, + twitter, + twitterCreator, + analytics + ), + MicrositeVisualSettings( + highlightTheme, + highlightLanguages, + palette, + favicon, + shareOnSocial, + theme + ), + MicrositeTemplateTexts( + micrositeFooterText + ), + micrositeConfigYaml, + MicrositeFileLocations( + micrositeImgDirectory, + micrositeCssDirectory, + micrositeSassDirectory, + micrositeJsDirectory, + micrositeCDNDirectives, + micrositeExternalLayoutsDirectory, + micrositeExternalIncludesDirectory, + micrositeDataDirectory, + micrositeStaticDirectory, + micrositeExtraMdFiles, + micrositeExtraMdFilesOutput, + micrositePluginsDirectory + ), + MicrositeUrlSettings( + micrositeUrl, + micrositeBaseUrl, + micrositeDocumentationUrl, + micrositeDocumentationLabelDescription + ), + MicrositeGitSettings( + githubOwner, + githubRepo, + githubLinks, + gitHostingService, + gitHostingUrl, + gitSidecarChat, + gitSidecarChatUrl + ), + MicrositeEditButtonSettings( + micrositeEditButton + ), + MicrositeMultiversionSettings( + micrositeVersionList ) + ) } }