diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee index 0981b9a3..81e1e5b7 100644 --- a/assets/javascripts/templates/pages/about_tmpl.coffee +++ b/assets/javascripts/templates/pages/about_tmpl.coffee @@ -637,6 +637,12 @@ credits = [ 'MIT', 'https://raw.githubusercontent.com/sass/sass/stable/MIT-LICENSE' ], [ + 'Scala', + '2002-2019 EPFL, with contributions from Lightbend', + 'Apache', + 'https://raw.githubusercontent.com/scala/scala-lang/master/license.md' + ], + [ 'scikit-image', '2011 the scikit-image team', 'BSD', diff --git a/lib/docs/filters/scala/entries.rb b/lib/docs/filters/scala/entries.rb index 98eb9781..5eff47fb 100644 --- a/lib/docs/filters/scala/entries.rb +++ b/lib/docs/filters/scala/entries.rb @@ -17,14 +17,12 @@ module Docs # Some objects have inner objects, show ParentObject$.ChildObject$ instead of ParentObject$$ChildObject$ name = name.gsub('$$', '$.') - # If a dollar sign is used as separator between two characters, replace it with a dot - name = name.gsub(/([^$.])\$([^$.])/, '\1.\2') - REPLACEMENTS.each do |key, value| name = name.gsub(key, value) end - name + # If a dollar sign is used as separator between two characters, replace it with a dot + name.gsub(/([^$.])\$([^$.])/, '\1.\2') end end diff --git a/lib/docs/scrapers/scala.rb b/lib/docs/scrapers/scala.rb index e831fa84..dc268960 100644 --- a/lib/docs/scrapers/scala.rb +++ b/lib/docs/scrapers/scala.rb @@ -9,7 +9,8 @@ module Docs options[:container] = '#content-container' options[:attribution] = <<-HTML - © 2002-2019 EPFL, with contributions from Lightbend. + © 2002-2019 EPFL, with contributions from Lightbend.
+ Licensed under the Apache License, Version 2.0. HTML # https://downloads.lightbend.com/scala/2.13.0/scala-docs-2.13.0.zip @@ -32,21 +33,21 @@ module Docs html_filters.push 'scala/entries', 'scala/clean_html' end - # https://downloads.lightbend.com/scala/2.12.6/scala-docs-2.12.6.zip + # https://downloads.lightbend.com/scala/2.12.9/scala-docs-2.12.9.zip # Extract api/scala-library into docs/scala~2.12_library version '2.12 Library' do - self.release = '2.12.6' - self.base_url = 'https://www.scala-lang.org/api/2.12.6/' + self.release = '2.12.9' + self.base_url = 'https://www.scala-lang.org/api/2.12.9/' self.root_path = 'index.html' html_filters.push 'scala/entries', 'scala/clean_html' end - # https://downloads.lightbend.com/scala/2.12.6/scala-docs-2.12.6.zip + # https://downloads.lightbend.com/scala/2.12.9/scala-docs-2.12.9.zip # Extract api/scala-reflect into docs/scala~2.12_reflection version '2.12 Reflection' do - self.release = '2.12.6' - self.base_url = 'https://www.scala-lang.org/api/2.12.6/scala-reflect/' + self.release = '2.12.9' + self.base_url = 'https://www.scala-lang.org/api/2.12.9/scala-reflect/' self.root_path = 'index.html' html_filters.push 'scala/entries', 'scala/clean_html'