diff --git a/build.gradle b/build.gradle index 85cb88f5854..b5f8ce15d3b 100644 --- a/build.gradle +++ b/build.gradle @@ -76,6 +76,22 @@ subprojects { } project.configurations.all { + // Dependencies can't depend on a different major version of Glean than A-C itself. + resolutionStrategy.eachDependency { details -> + if (details.requested.group == 'org.mozilla.telemetry' + && details.requested.name.contains('glean') ) { + def requested = details.requested.version.tokenize(".") + def defined = Versions.mozilla_glean.tokenize(".") + // Check the major version + if (requested[0] != defined[0]) { + throw new AssertionError("Cannot resolve to a single Glean version. Requested: ${details.requested.version}, A-C uses: ${Versions.mozilla_glean}") + } else { + // Enforce that all (transitive) dependencies are using the defined Glean version + details.useVersion Versions.mozilla_glean + } + } + } + // Enforce that all (transitive) dependencies are using the same support library version as we do. resolutionStrategy.eachDependency { details -> if (details.requested.group == 'com.android.support' diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index fbf08e00f63..e9563ce08c2 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -30,9 +30,12 @@ object Versions { const val disklrucache = "2.0.2" const val leakcanary = "2.8.1" - const val mozilla_appservices = "93.8.0" + // When upgrading mozilla_appservices, also upgrade the version in the + // `getApplicationServiceVersion()` method in NimbusGradlePlugin.groovy. + const val mozilla_appservices = "94.0.1" - const val mozilla_glean = "51.0.1" + // DO NOT MODIFY MANUALLY. This is auto-updated along with GeckoView. + const val mozilla_glean = "51.1.0" const val material = "1.2.1" diff --git a/buildSrc/src/main/java/Gecko.kt b/buildSrc/src/main/java/Gecko.kt index 4088cddd257..8d1bbde813a 100644 --- a/buildSrc/src/main/java/Gecko.kt +++ b/buildSrc/src/main/java/Gecko.kt @@ -9,7 +9,7 @@ object Gecko { /** * GeckoView Version. */ - const val version = "105.0.20220808092108" + const val version = "105.0.20220810094530" /** * GeckoView channel diff --git a/components/browser/errorpages/src/main/res/values-co/strings.xml b/components/browser/errorpages/src/main/res/values-co/strings.xml index b935dfe52c1..cca31434e74 100644 --- a/components/browser/errorpages/src/main/res/values-co/strings.xml +++ b/components/browser/errorpages/src/main/res/values-co/strings.xml @@ -1,5 +1,5 @@ - + Ripruvà @@ -42,6 +42,32 @@ Accettà u risicu è cuntinuà + + Stu situ web richiede una cunnessione sicura. + + + +
  • A pagina chì vò circate à fighjà ùn pò micca esse affissata perchè u situ web richiede una cunnessione sicura.
  • +
  • Sicuramente, stu prublema hè cagiunatu da u situ web, è ùn pudete fà nunda per què.
  • +
  • Ma pudete cuntattà l’amministratore di stu situ web per infurmallu di stu prublema.
  • + + ]]>
    + + + Espertu… + + + %1$s impiega una strategia di sicurità chjamata HTTP Strict Transport Security (HSTS), vole si dì chì %2$s pò solu ci cunnettesi di manera assicurizata. Ùn pudete micca aghjunghje un’eccezzione per visità stu situ. + ]]> + + %1$s impiega una strategia di sicurità chjamata HTTP Strict Transport Security (HSTS), vole si dì chì %2$s pò solu ci cunnettesi di manera assicurizata. Ùn pudete micca aghjunghje un’eccezzione per visità stu situ. + ]]> + + Ritornu + A cunnessione hè stata interrotta diff --git a/components/feature/addons/src/main/java/mozilla/components/feature/addons/Addon.kt b/components/feature/addons/src/main/java/mozilla/components/feature/addons/Addon.kt index ab67f0d7613..07d985bd172 100644 --- a/components/feature/addons/src/main/java/mozilla/components/feature/addons/Addon.kt +++ b/components/feature/addons/src/main/java/mozilla/components/feature/addons/Addon.kt @@ -185,6 +185,7 @@ data class Addon( "browsingData" to R.string.mozac_feature_addons_permissions_browser_data_description, "clipboardRead" to R.string.mozac_feature_addons_permissions_clipboard_read_description, "clipboardWrite" to R.string.mozac_feature_addons_permissions_clipboard_write_description, + "declarativeNetRequest" to R.string.mozac_feature_addons_permissions_declarative_net_request_description, "downloads" to R.string.mozac_feature_addons_permissions_downloads_description, "downloads.open" to R.string.mozac_feature_addons_permissions_downloads_open_description, "find" to R.string.mozac_feature_addons_permissions_find_description, diff --git a/components/feature/addons/src/main/res/values-es-rMX/strings.xml b/components/feature/addons/src/main/res/values-es-rMX/strings.xml index 7e8922fee20..bdb4d0a25f2 100644 --- a/components/feature/addons/src/main/res/values-es-rMX/strings.xml +++ b/components/feature/addons/src/main/res/values-es-rMX/strings.xml @@ -38,6 +38,8 @@ Obtener datos del portapapeles Ingresar datos en el portapapeles + + Bloquear contenido en cualquier página Descargar archivos y leer y modificar el historial de descargas del navegador diff --git a/components/feature/addons/src/main/res/values-ia/strings.xml b/components/feature/addons/src/main/res/values-ia/strings.xml index 90b387c3f3d..201332ae96f 100644 --- a/components/feature/addons/src/main/res/values-ia/strings.xml +++ b/components/feature/addons/src/main/res/values-ia/strings.xml @@ -38,6 +38,8 @@ Obtener datos ab le area de transferentia Inserer le datos in le area de transferentia + + Bloca contento sur ulle pagina Discargar files e leger e modificar le chronologia de discargamentos del navigator diff --git a/components/feature/addons/src/main/res/values-ko/strings.xml b/components/feature/addons/src/main/res/values-ko/strings.xml index df42cdb0470..287e24fbb65 100644 --- a/components/feature/addons/src/main/res/values-ko/strings.xml +++ b/components/feature/addons/src/main/res/values-ko/strings.xml @@ -38,6 +38,8 @@ 클립보드의 데이터 가져오기 클립보드에 데이터 넣기 + + 모든 페이지에서 콘텐츠 차단 파일을 다운로드하고 브라우저의 다운로드 기록을 읽고 수정 diff --git a/components/feature/addons/src/main/res/values/strings.xml b/components/feature/addons/src/main/res/values/strings.xml index 3e28070be8a..86e58ddfb97 100644 --- a/components/feature/addons/src/main/res/values/strings.xml +++ b/components/feature/addons/src/main/res/values/strings.xml @@ -41,6 +41,8 @@ Get data from the clipboard Input data to the clipboard + + Block content on any page Download files and read and modify the browser’s download history diff --git a/components/feature/addons/src/test/java/AddonTest.kt b/components/feature/addons/src/test/java/AddonTest.kt index 4f4cc14b2e9..f4050f8b149 100644 --- a/components/feature/addons/src/test/java/AddonTest.kt +++ b/components/feature/addons/src/test/java/AddonTest.kt @@ -29,6 +29,7 @@ class AddonTest { "browsingData", "clipboardRead", "clipboardWrite", + "declarativeNetRequest", "downloads", "downloads.open", "find", @@ -59,6 +60,7 @@ class AddonTest { R.string.mozac_feature_addons_permissions_browser_data_description, R.string.mozac_feature_addons_permissions_clipboard_read_description, R.string.mozac_feature_addons_permissions_clipboard_write_description, + R.string.mozac_feature_addons_permissions_declarative_net_request_description, R.string.mozac_feature_addons_permissions_downloads_description, R.string.mozac_feature_addons_permissions_downloads_open_description, R.string.mozac_feature_addons_permissions_find_description, diff --git a/components/feature/prompts/src/main/res/values-co/strings.xml b/components/feature/prompts/src/main/res/values-co/strings.xml index 8cdd3637e36..691fffe314d 100644 --- a/components/feature/prompts/src/main/res/values-co/strings.xml +++ b/components/feature/prompts/src/main/res/values-co/strings.xml @@ -1,5 +1,5 @@ - + Vai @@ -84,11 +84,11 @@ Urganizà l’identificazioni di cunnessione - Spiegà l’identificazioni di cunnessione sugerite + Spiegà l’identificazioni di cunnessione suggerite - Ripiegà l’identificazioni di cunnessione sugerite + Ripiegà l’identificazioni di cunnessione suggerite - Identificazioni di cunnessione sugerite + Identificazioni di cunnessione suggerite Rimandà i dati à stu situ ? @@ -102,9 +102,9 @@ Selezziunà una carta bancaria - Spiegà e carte bancarie sugerite + Spiegà e carte bancarie suggerite - Ripiegà e carte bancarie sugerite + Ripiegà e carte bancarie suggerite Urganizà e carte bancarie @@ -113,4 +113,16 @@ Mudificà a data di scadenza di a carta ? U numeru di a carta serà cifratu. U codice di sicurità ùn serà micca arregistratu. + + + + Selezzione d’indirizzi + + Selezziunà un indirizzu + + Spiegà l’indirizzi suggeriti + + Ripiegà l’indirizzi suggeriti + + Urganizà l’indirizzi diff --git a/components/feature/sitepermissions/src/main/res/values-co/strings.xml b/components/feature/sitepermissions/src/main/res/values-co/strings.xml index f2cf05dc62e..2810bb03c94 100644 --- a/components/feature/sitepermissions/src/main/res/values-co/strings.xml +++ b/components/feature/sitepermissions/src/main/res/values-co/strings.xml @@ -41,6 +41,8 @@ Forse preferite bluccà l’accessu s’ellu ùn hè micca chjaru perchè %s abbia bisognu di sti dati. + + Bluccà Sapene di più diff --git a/components/lib/crash/src/main/res/values-co/strings.xml b/components/lib/crash/src/main/res/values-co/strings.xml index 53dc2abed45..1f2b3fa1042 100644 --- a/components/lib/crash/src/main/res/values-co/strings.xml +++ b/components/lib/crash/src/main/res/values-co/strings.xml @@ -24,6 +24,12 @@ Inviu di u raportu d’accidente à %1$s + + Culletta di i dati di l’accidente + + + Culletta di i dati di telemetria di l’accidente + Raporti d’accidente diff --git a/components/lib/crash/src/main/res/values-gn/strings.xml b/components/lib/crash/src/main/res/values-gn/strings.xml index f7aab2615ac..d1e7c70dc6c 100644 --- a/components/lib/crash/src/main/res/values-gn/strings.xml +++ b/components/lib/crash/src/main/res/values-gn/strings.xml @@ -24,6 +24,9 @@ Emomarandu jejavygua %1$s-pe + + Ombyatyhína mba’ekuaarã javypyre + Telemetría marandu ñembyaty rehegua diff --git a/components/lib/crash/src/main/res/values-hy-rAM/strings.xml b/components/lib/crash/src/main/res/values-hy-rAM/strings.xml index be6443788f8..f7bf99c723b 100644 --- a/components/lib/crash/src/main/res/values-hy-rAM/strings.xml +++ b/components/lib/crash/src/main/res/values-hy-rAM/strings.xml @@ -24,6 +24,9 @@ Ուղարկել վթարի զեկույցը %1$s-ին + + Վթարի տվյալների հավաքում + Վթարի հեռաչափության տվյալների հավաքում diff --git a/components/tooling/nimbus-gradle-plugin/src/main/groovy/mozilla/components/tooling/nimbus/NimbusGradlePlugin.groovy b/components/tooling/nimbus-gradle-plugin/src/main/groovy/mozilla/components/tooling/nimbus/NimbusGradlePlugin.groovy index d43002e7ad3..9d44d97ef75 100644 --- a/components/tooling/nimbus-gradle-plugin/src/main/groovy/mozilla/components/tooling/nimbus/NimbusGradlePlugin.groovy +++ b/components/tooling/nimbus-gradle-plugin/src/main/groovy/mozilla/components/tooling/nimbus/NimbusGradlePlugin.groovy @@ -171,7 +171,7 @@ class NimbusPlugin implements Plugin { // a) this plugin is going to live in the AS repo (eventually) // See https://github.com/mozilla-mobile/android-components/issues/11422 for tying this // to a version that is specified in buildSrc/src/main/java/Dependencies.kt - return "93.6.0" + return "94.0.1" } // Try one or more hosts to download the given file. diff --git a/docs/Gemfile b/docs/Gemfile index e776ef6363c..12646aa4d16 100644 --- a/docs/Gemfile +++ b/docs/Gemfile @@ -8,19 +8,19 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.9.0" +gem "jekyll", "~> 3.9.2" # This is the default theme for new Jekyll sites. You may change this to anything you like. gem "minima", "~> 2.5.1" # Update kramdown -gem "kramdown", ">= 2.3.0" +gem "kramdown", ">= 2.3.2" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. -gem "github-pages", 207, group: :jekyll_plugins +gem "github-pages", 227, group: :jekyll_plugins # If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-feed", "~> 0.13.0" + gem "jekyll-feed" end diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 4ae380cf2ca..9e6877e72e9 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.2) + activesupport (6.0.5.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -14,80 +14,82 @@ GEM execjs coffee-script-source (1.11.1) colorator (1.1.0) - commonmarker (0.17.13) - ruby-enum (~> 0.5) - concurrent-ruby (1.1.7) - dnsruby (1.61.4) + commonmarker (0.23.5) + concurrent-ruby (1.1.10) + dnsruby (1.61.9) simpleidn (~> 0.1) - em-websocket (0.5.1) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.12.0) - ffi (>= 1.3.0) + http_parser.rb (~> 0) + ethon (0.15.0) + ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.7.0) - faraday (1.0.1) - multipart-post (>= 1.2, < 3) - ffi (1.13.1) + execjs (2.8.1) + faraday (2.5.1) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.0) + ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (207) - github-pages-health-check (= 1.16.1) - jekyll (= 3.9.0) + github-pages (227) + github-pages-health-check (= 1.17.9) + jekyll (= 3.9.2) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.1.6) + jekyll-commonmark-ghpages (= 0.2.0) jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.13.0) + jekyll-feed (= 0.15.1) jekyll-gist (= 1.5.0) jekyll-github-metadata (= 2.13.0) - jekyll-mentions (= 1.5.1) + jekyll-include-cache (= 0.2.1) + jekyll-mentions (= 1.6.0) jekyll-optional-front-matter (= 0.3.2) jekyll-paginate (= 1.1.0) jekyll-readme-index (= 0.3.0) - jekyll-redirect-from (= 0.15.0) + jekyll-redirect-from (= 0.16.0) jekyll-relative-links (= 0.6.1) - jekyll-remote-theme (= 0.4.1) + jekyll-remote-theme (= 0.4.3) jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.6.1) + jekyll-seo-tag (= 2.8.0) jekyll-sitemap (= 1.4.0) jekyll-swiss (= 1.0.0) - jekyll-theme-architect (= 0.1.1) - jekyll-theme-cayman (= 0.1.1) - jekyll-theme-dinky (= 0.1.1) - jekyll-theme-hacker (= 0.1.1) - jekyll-theme-leap-day (= 0.1.1) - jekyll-theme-merlot (= 0.1.1) - jekyll-theme-midnight (= 0.1.1) - jekyll-theme-minimal (= 0.1.1) - jekyll-theme-modernist (= 0.1.1) - jekyll-theme-primer (= 0.5.4) - jekyll-theme-slate (= 0.1.1) - jekyll-theme-tactile (= 0.1.1) - jekyll-theme-time-machine (= 0.1.1) + jekyll-theme-architect (= 0.2.0) + jekyll-theme-cayman (= 0.2.0) + jekyll-theme-dinky (= 0.2.0) + jekyll-theme-hacker (= 0.2.0) + jekyll-theme-leap-day (= 0.2.0) + jekyll-theme-merlot (= 0.2.0) + jekyll-theme-midnight (= 0.2.0) + jekyll-theme-minimal (= 0.2.0) + jekyll-theme-modernist (= 0.2.0) + jekyll-theme-primer (= 0.6.0) + jekyll-theme-slate (= 0.2.0) + jekyll-theme-tactile (= 0.2.0) + jekyll-theme-time-machine (= 0.2.0) jekyll-titles-from-headings (= 0.5.3) - jemoji (= 0.11.1) - kramdown (= 2.3.0) + jemoji (= 0.12.0) + kramdown (= 2.3.2) kramdown-parser-gfm (= 1.1.0) liquid (= 4.0.3) mercenary (~> 0.3) minima (= 2.5.1) - nokogiri (>= 1.10.4, < 2.0) - rouge (= 3.19.0) + nokogiri (>= 1.13.6, < 2.0) + rouge (= 3.26.0) terminal-table (~> 1.4) - github-pages-health-check (1.16.1) + github-pages-health-check (1.17.9) addressable (~> 2.3) dnsruby (~> 1.60) octokit (~> 4.0) - public_suffix (~> 3.0) + public_suffix (>= 3.0, < 5.0) typhoeus (~> 1.3) - html-pipeline (2.14.0) + html-pipeline (2.14.2) activesupport (>= 2) nokogiri (>= 1.4) - http_parser.rb (0.6.0) + http_parser.rb (0.8.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.9.0) + jekyll (3.9.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -105,23 +107,25 @@ GEM jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.3.1) - commonmarker (~> 0.14) - jekyll (>= 3.7, < 5.0) - jekyll-commonmark-ghpages (0.1.6) - commonmarker (~> 0.17.6) - jekyll-commonmark (~> 1.2) + jekyll-commonmark (1.4.0) + commonmarker (~> 0.22) + jekyll-commonmark-ghpages (0.2.0) + commonmarker (~> 0.23.4) + jekyll (~> 3.9.0) + jekyll-commonmark (~> 1.4.0) rouge (>= 2.0, < 4.0) jekyll-default-layout (0.1.4) jekyll (~> 3.0) - jekyll-feed (0.13.0) + jekyll-feed (0.15.1) jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) jekyll-github-metadata (2.13.0) jekyll (>= 3.4, < 5.0) octokit (~> 4.0, != 4.4.0) - jekyll-mentions (1.5.1) + jekyll-include-cache (0.2.1) + jekyll (>= 3.7, < 5.0) + jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-optional-front-matter (0.3.2) @@ -129,113 +133,110 @@ GEM jekyll-paginate (1.1.0) jekyll-readme-index (0.3.0) jekyll (>= 3.0, < 5.0) - jekyll-redirect-from (0.15.0) + jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) jekyll-relative-links (0.6.1) jekyll (>= 3.3, < 5.0) - jekyll-remote-theme (0.4.1) + jekyll-remote-theme (0.4.3) addressable (~> 2.0) jekyll (>= 3.5, < 5.0) - rubyzip (>= 1.3.0) + jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0) + rubyzip (>= 1.3.0, < 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.6.1) - jekyll (>= 3.3, < 5.0) + jekyll-seo-tag (2.8.0) + jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-swiss (1.0.0) - jekyll-theme-architect (0.1.1) - jekyll (~> 3.5) + jekyll-theme-architect (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.1.1) - jekyll (~> 3.5) + jekyll-theme-cayman (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.1.1) - jekyll (~> 3.5) + jekyll-theme-dinky (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.1) - jekyll (~> 3.5) + jekyll-theme-hacker (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.1.1) - jekyll (~> 3.5) + jekyll-theme-leap-day (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.1.1) - jekyll (~> 3.5) + jekyll-theme-merlot (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.1.1) - jekyll (~> 3.5) + jekyll-theme-midnight (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.1.1) - jekyll (~> 3.5) + jekyll-theme-minimal (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.1.1) - jekyll (~> 3.5) + jekyll-theme-modernist (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.5.4) + jekyll-theme-primer (0.6.0) jekyll (> 3.5, < 5.0) jekyll-github-metadata (~> 2.9) jekyll-seo-tag (~> 2.0) - jekyll-theme-slate (0.1.1) - jekyll (~> 3.5) + jekyll-theme-slate (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.1.1) - jekyll (~> 3.5) + jekyll-theme-tactile (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.1.1) - jekyll (~> 3.5) + jekyll-theme-time-machine (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) jekyll-titles-from-headings (0.5.3) jekyll (>= 3.3, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.11.1) + jemoji (0.12.0) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.3.0) + kramdown (2.3.2) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.2.1) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.8.0) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.14.1) - multipart-post (2.1.1) - nokogiri (1.13.6) - mini_portile2 (~> 2.8.0) + minitest (5.16.2) + nokogiri (1.13.8-x86_64-linux) racc (~> 1.4) - octokit (4.18.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.1.1) + public_suffix (4.0.7) racc (1.6.0) - rb-fsevent (0.10.4) + rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) - rouge (3.19.0) - ruby-enum (0.8.0) - i18n - rubyzip (2.3.0) + rouge (3.26.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - simpleidn (0.1.1) + faraday (>= 0.17.3, < 3) + simpleidn (0.2.1) unf (~> 0.1.4) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) @@ -246,19 +247,19 @@ GEM thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) - zeitwerk (2.4.0) + unf_ext (0.0.8.2) + unicode-display_width (1.8.0) + zeitwerk (2.6.0) PLATFORMS - ruby + x86_64-linux DEPENDENCIES - github-pages (= 207) - jekyll (~> 3.9.0) - jekyll-feed (~> 0.13.0) - kramdown (>= 2.3.0) + github-pages (= 227) + jekyll (~> 3.9.2) + jekyll-feed + kramdown (>= 2.3.2) minima (~> 2.5.1) BUNDLED WITH - 2.1.4 + 2.3.5