Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #55

Merged
merged 4 commits into from
Dec 30, 2023
Merged

Develop #55

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
283b1c1
Update dependencies
jaguililla Nov 23, 2023
e592c60
Update dependencies
jaguililla Nov 29, 2023
7cab7c4
Decouple dokka_json from Hexagon modules for compatibility
jaguililla Dec 8, 2023
57a1017
Update dependencies
jaguililla Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Decouple dokka_json from Hexagon modules for compatibility
  • Loading branch information
@jaguililla
jaguililla committed Dec 8, 2023
commit 7cab7c405a0e86377ce74494f95d7fa7d62953b3
3 changes: 2 additions & 1 deletion dokka_json/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ description = "."
dependencies {
val dokkaVersion = properties["dokkaVersion"]

"api"("com.hexagonkt:serialization_jackson_json:$version")
"api"("com.hexagonkt:core:$version")
"api"("com.fasterxml.jackson.core:jackson-databind:2.15.3")
"api"("org.jetbrains.dokka:dokka-base:$dokkaVersion")
"compileOnly"("org.jetbrains.dokka:dokka-core:$dokkaVersion")

Expand Down
7 changes: 4 additions & 3 deletions dokka_json/src/main/kotlin/com/hexagonkt/dokka/json/JsonPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.hexagonkt.dokka.json

import com.fasterxml.jackson.databind.ObjectMapper
import com.hexagonkt.core.filterNotEmptyRecursive
import com.hexagonkt.serialization.jackson.json.Json
import com.hexagonkt.serialization.serialize
import org.jetbrains.dokka.CoreExtensions
import org.jetbrains.dokka.model.*
import org.jetbrains.dokka.model.doc.*
Expand All @@ -26,6 +25,8 @@ class JsonPlugin : DokkaPlugin() {
}
}

private val mapper: ObjectMapper = ObjectMapper()

private fun processModule(module: DModule, context: DokkaContext): DModule =
module.apply {
val name = module.name
Expand All @@ -47,7 +48,7 @@ class JsonPlugin : DokkaPlugin() {
"packages" to packages
)

file.writeText(map.filterNotEmptyRecursive().serialize(Json))
mapper.writeValue(file.writer(), map.filterNotEmptyRecursive())
}

private fun processPackage(pack: DPackage): Map<String, *> {
Expand Down
8 changes: 3 additions & 5 deletions dokka_json/src/test/kotlin/com/hexagonkt/dokka/json/JsonPluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.hexagonkt.dokka.json

import com.fasterxml.jackson.databind.ObjectMapper
import com.hexagonkt.core.requirePath
import com.hexagonkt.serialization.SerializationManager
import com.hexagonkt.serialization.jackson.json.Json
import com.hexagonkt.serialization.parseMap
import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest
import kotlin.test.Test
import org.junit.jupiter.api.condition.EnabledOnOs
Expand Down Expand Up @@ -69,8 +67,8 @@ class JsonPluginTest : BaseAbstractTest() {
}
}

SerializationManager.defaultFormat = Json
val json = File("build/dokka").resolve("module_mod.json").parseMap()
val mapper = ObjectMapper()
val json = mapper.readValue(File("build/dokka").resolve("module_mod.json"), Map::class.java)
assertEquals("mod", json.requirePath("name"))
}
}
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ org.gradle.console=plain

# Gradle
# Version synchronized with Hexagon release (master)
version=3.4.4
version=3.4.5
group=com.hexagonkt.extra
description=The atoms of your platform

Expand Down