History

Merge pull request #1330 from simon04/kotlin-1.4

Simon Legner committed 5 years ago

Commit a23035d2 parents 74bf81f 90031b53 files · +10 −6Browse files

Unified · Split

3 files
  1. assets/javascripts/templates/pages/about_tmpl.coffee +1 −1
  2. lib/docs/filters/kotlin/clean_html.rb +7 −3
  3. lib/docs/scrapers/kotlin.rb +2 −2
assets/javascripts/templates/pages/about_tmpl.coffee+1−1
@@ -423,7 +423,7 @@ credits = [ · 422 unmodified lines
423 'https://raw.githubusercontent.com/koajs/koa/master/LICENSE'423 'https://raw.githubusercontent.com/koajs/koa/master/LICENSE'
424 ], [424 ], [
425 'Kotlin',425 'Kotlin',
426 '2010-2019 JetBrains s.r.o.',426 '2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors',
427 'Apache',427 'Apache',
428 'https://raw.githubusercontent.com/JetBrains/kotlin/master/license/LICENSE.txt'428 'https://raw.githubusercontent.com/JetBrains/kotlin/master/license/LICENSE.txt'
429 ], [429 ], [
lib/docs/filters/kotlin/clean_html.rb+7−3
@@ -15,10 +15,14 @@ module Docs · 14 unmodified lines
15 end15 end
16 16
17 css('pre').each do |node|17 css('pre').each do |node|
18 node['data-language'] = 'kotlin' if node.at_css('code[data-lang="text/x-kotlin"]')18 node['data-language'] = 'kotlin' if node.at_css('code.language-kotlin')
19 node['data-language'] = 'xml' if node.at_css('code[data-lang="application/xml"]')19 node['data-language'] = 'groovy' if node.at_css('code.language-groovy')
20 node['data-language'] = 'javascript' if node.at_css('code[data-lang="text/javascript"]')20 node['data-language'] = 'javascript' if node.at_css('code.language-javascript')
21 node['data-language'] = 'xml' if node.at_css('code.language-xml')
21 node.content = node.content22 node.content = node.content
23 node.parent.remove_attribute('data-highlight-only')
24 node.parent.remove_attribute('data-lang')
25 node.parent.remove_attribute('theme')
22 end26 end
23 end27 end
24 28
lib/docs/scrapers/kotlin.rb+2−2
@@ -1,7 +1,7 @@
1module Docs1module Docs
2 class Kotlin < UrlScraper2 class Kotlin < UrlScraper
3 self.type = 'kotlin'3 self.type = 'kotlin'
4 self.release = '1.3.41'4 self.release = '1.4.10'
5 self.base_url = 'https://kotlinlang.org/'5 self.base_url = 'https://kotlinlang.org/'
6 self.root_path = 'api/latest/jvm/stdlib/index.html'6 self.root_path = 'api/latest/jvm/stdlib/index.html'
7 self.links = {7 self.links = {
@@ -33,7 +33,7 @@ module Docs · 25 unmodified lines
33 }33 }
34 34
35 options[:attribution] = <<-HTML35 options[:attribution] = <<-HTML
36 &copy; 2010&ndash;2019 JetBrains s.r.o.<br>36 &copy; 2010&ndash;2020 JetBrains s.r.o. and Kotlin Programming Language contributors<br>
37 Licensed under the Apache License, Version 2.0.37 Licensed under the Apache License, Version 2.0.
38 HTML38 HTML
39 39