Move to VirtusLab bintray org

VirtusLab · Sep 10, 2020 · 4fffcc6 · 4fffcc6
1 parent 58db7ca
commit 4fffcc6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -58,16 +58,17 @@ tasks.whenTaskAdded {
     }
 }
 
+val bintrayUser: String? by project
 val bintrayKey: String? by project
 
 bintray {
-    user = "kromanowski"
+    user = project.findProperty("bintray_user") as String? ?: bintrayUser
     key = project.findProperty("bintray_api_key") as String? ?: bintrayKey
     setPublications("MavenJava")
     publish = true
     pkg(delegateClosureOf<com.jfrog.bintray.gradle.BintrayExtension.PackageConfig> {
-        repo = "releases"
-        userOrg = "romanowski"
+        repo = "dokka"
+        userOrg = "virtuslab"
         name = project.name
         setLicenses("Apache-2.0")
         vcsUrl = "https://github.com/VirtusLab/dokka-site.git"
@@ -84,5 +85,5 @@ publishing {
 
 // Configure dokka
 tasks.dokkaHtml {
-    pluginsConfiguration.put("ExternalDocsTooKey",  "documentation")
+    pluginsConfiguration.put("ExternalDocsTooKey", "documentation")
 }
diff --git a/documentation/docs/static-page/links.md b/documentation/docs/static-page/links.md
@@ -5,7 +5,7 @@ title: Links
 
 ## Links
 
-Our side supports stadnard markdown links:
+Our side supports standard markdown links:
  - TODO Using standard [urls](https://pl.wikipedia.org/wiki/Uniform_Resource_Locator)
  - TODO To [other pages](/docs/static-page/random.html) (or [md base file](/docs/static-page/tables.md)) in our documentation that using paths relative to root od documentation e.g. `/docs/static-page/random.html` for this project
  - TODO To [other pages](/docs/static-page/samples/random.html) (or [md base file](samples/tables.md)) in our documentation that using paths relative to this file e.g. using `random.html` (or `tables.md`)

diff --git a/src/main/kotlin/com/virtuslab/dokka/site/parser.kt b/src/main/kotlin/com/virtuslab/dokka/site/parser.kt
@@ -21,9 +21,9 @@ import java.net.URL
 
 
 // TODO (#24): This is a code taken from dokka, will be removed after PR with fixes is merged into dokka
-// The dokka logic was pulled to `externalDir` callback and `linksHandler` was simplyfied
+// The dokka logic was pulled to `externalDir` callback and `linksHandler` was simplified
 // Bug in imagesHandler was fixed (NullPointer)
-open class ExtendableMarkdownParser(private val text: String, private val externalDir: (String) -> DRI?) {
+open class ExtendableMarkdownParser(private val text: String, private val externalDri: (String) -> DRI?) {
 
     fun parse(): DocTag {
         val flavourDescriptor = GFMFlavourDescriptor()
@@ -117,7 +117,7 @@ open class ExtendableMarkdownParser(private val text: String, private val extern
                     URL(link)
                     null
                 } catch (e: MalformedURLException) {
-                    externalDir(link)
+                    externalDri(link)
                 }
             }
 

diff --git a/src/test/kotlin/parserTests.kt b/src/test/kotlin/parserTests.kt
@@ -7,18 +7,18 @@ import org.junit.Test
 
 
 class ParserTest {
-    private fun runtest(md: String, expected: DocTag) {
+    private fun runTest(md: String, expected: DocTag) {
         val parser = ExtendableMarkdownParser(md) { null }
         val compiled = parser.parse()
         assertEquals(expected, compiled)
     }
 
 
     @Test
-    fun simpleTest() = runtest("ala", P(listOf(Text("ala"))))
+    fun simpleTest() = runTest("ala", P(listOf(Text("ala"))))
 
     @Test
-    fun code() = runtest(
+    fun code() = runTest(
         """
             ```scala
             def ala() = 123
@@ -28,15 +28,15 @@ class ParserTest {
     )
 
     @Test
-    fun relativeLink() = runtest(
+    fun relativeLink() = runTest(
         """
             [link](ala/maKota.md)
         """.trimIndent(),
         P(listOf(A(listOf(Text("link")), mapOf("href" to "ala/maKota.md"))))
     )
 
     @Test
-    fun listTest() = runtest(
+    fun listTest() = runTest(
         """
         List: