Miroirs/devdocs
1
0
Fork 0
mirror of https://github.com/freeCodeCamp/devdocs synced 2024-11-16 19:48:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

scala: fix license and update entries filter

Browse source
This commit is contained in:
Jasper van Merle 2019-08-11 21:26:41 +02:00
parent 728c16c398
commit e566036f54
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assets/javascripts/templates/pages/about_tmpl.coffee
View file

@ -637,6 +637,12 @@ credits = [
'MIT', 'MIT',
'https://raw.githubusercontent.com/sass/sass/stable/MIT-LICENSE' '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', 'scikit-image',
'2011 the scikit-image team', '2011 the scikit-image team',
'BSD', 'BSD',

6
lib/docs/filters/scala/entries.rb
View file

@ -17,14 +17,12 @@ module Docs
# Some objects have inner objects, show ParentObject$.ChildObject$ instead of ParentObject$$ChildObject$ # Some objects have inner objects, show ParentObject$.ChildObject$ instead of ParentObject$$ChildObject$
name = name.gsub('$$', '$.') 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| REPLACEMENTS.each do |key, value|
name = name.gsub(key, value) name = name.gsub(key, value)
end end
name # If a dollar sign is used as separator between two characters, replace it with a dot
name.gsub(/([^$.])\$([^$.])/, '\1.\2')
end end
end end

15
lib/docs/scrapers/scala.rb
View file

@ -9,7 +9,8 @@ module Docs
options[:container] = '#content-container' options[:container] = '#content-container'
options[:attribution] = <<-HTML options[:attribution] = <<-HTML
&copy; 2002-2019 EPFL, with contributions from Lightbend. &copy; 2002-2019 EPFL, with contributions from Lightbend.<br>
Licensed under the Apache License, Version 2.0.
HTML HTML
# https://downloads.lightbend.com/scala/2.13.0/scala-docs-2.13.0.zip # 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' html_filters.push 'scala/entries', 'scala/clean_html'
end 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 # Extract api/scala-library into docs/scala~2.12_library
version '2.12 Library' do version '2.12 Library' do
self.release = '2.12.6' self.release = '2.12.9'
self.base_url = 'https://www.scala-lang.org/api/2.12.6/' self.base_url = 'https://www.scala-lang.org/api/2.12.9/'
self.root_path = 'index.html' self.root_path = 'index.html'
html_filters.push 'scala/entries', 'scala/clean_html' html_filters.push 'scala/entries', 'scala/clean_html'
end 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 # Extract api/scala-reflect into docs/scala~2.12_reflection
version '2.12 Reflection' do version '2.12 Reflection' do
self.release = '2.12.6' self.release = '2.12.9'
self.base_url = 'https://www.scala-lang.org/api/2.12.6/scala-reflect/' self.base_url = 'https://www.scala-lang.org/api/2.12.9/scala-reflect/'
self.root_path = 'index.html' self.root_path = 'index.html'
html_filters.push 'scala/entries', 'scala/clean_html' html_filters.push 'scala/entries', 'scala/clean_html'