Skip to content

Update Dokka #1

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

Open
adam-enko wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update Dokka #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51dbce6
Move to Dokka 2
serras Oct 1, 2024
dc10c5c
Fix dokka
adam-enko Oct 1, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/githubpages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/arrow-2' }}

- name: assemble
run: ./gradlew -Pversion=${{ github.event.release.tag_name }} dokkaHtmlMultiModule -Pgithubpages=true
run: ./gradlew -Pversion=${{ github.event.release.tag_name }} :assembleDocs -Pgithubpages=true

- name: Deploy to gh-pages
uses: peaceiris/actions-gh-pages@v4
Expand Down
19 changes: 9 additions & 10 deletions arrow-libs/core/arrow-annotations/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion


plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand All @@ -28,17 +27,17 @@ kotlin {
}
}

jvm {
tasks.jvmJar {
manifest {
attributes["Automatic-Module-Name"] = "arrow.annotations"
}
}
}
jvm()

@OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions {
(project.rootProject.properties["kotlin_language_version"] as? String)?.also { languageVersion = KotlinVersion.fromVersion(it) }
(project.rootProject.properties["kotlin_api_version"] as? String)?.also { apiVersion = KotlinVersion.fromVersion(it) }
}
}

tasks.jvmJar {
manifest {
attributes["Automatic-Module-Name"] = "arrow.annotations"
}
}
5 changes: 2 additions & 3 deletions arrow-libs/core/arrow-atomic/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.kotlinx.kover)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand Down
5 changes: 2 additions & 3 deletions arrow-libs/core/arrow-autoclose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile


plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand Down
6 changes: 2 additions & 4 deletions arrow-libs/core/arrow-cache4k/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion


plugins {
// `java-library`
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.publish)
alias(libs.plugins.spotless)
`dokka-convention`
}

apply(from = property("ANIMALSNIFFER_MPP"))
Expand Down
5 changes: 2 additions & 3 deletions arrow-libs/core/arrow-core-high-arity/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.kotlinx.kover)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand Down
3 changes: 1 addition & 2 deletions arrow-libs/core/arrow-core-retrofit/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion

Expand All @@ -11,6 +9,7 @@ plugins {
alias(libs.plugins.kotlinx.serialization) // Needed for testing only
alias(libs.plugins.kotlinx.kover)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand Down
6 changes: 2 additions & 4 deletions arrow-libs/core/arrow-core-serialization/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion


plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)

alias(libs.plugins.kotlinx.kover)
alias(libs.plugins.spotless)
`dokka-convention`
id(libs.plugins.kotlinx.serialization.get().pluginId)
}

Expand Down
5 changes: 2 additions & 3 deletions arrow-libs/core/arrow-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.time.Duration

plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.kotlinx.kover)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand Down
6 changes: 2 additions & 4 deletions arrow-libs/core/arrow-eval/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion


plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.kotlinx.kover)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand Down
6 changes: 2 additions & 4 deletions arrow-libs/core/arrow-functions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion


plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.kotlinx.kover)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand Down
5 changes: 2 additions & 3 deletions arrow-libs/fx/arrow-collectors/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import java.time.Duration

plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.spotless)
alias(libs.plugins.kotlinx.kover)
`dokka-convention`
}

apply(from = property("ANIMALSNIFFER_MPP"))
Expand Down
5 changes: 2 additions & 3 deletions arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import java.time.Duration


plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.kotlinx.kover)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand Down
5 changes: 2 additions & 3 deletions arrow-libs/fx/arrow-fx-stm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion


plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.kotlinx.kover)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand Down
17 changes: 8 additions & 9 deletions arrow-libs/optics/arrow-optics-compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl


repositories {
google()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
}
//repositories {
// google()
// mavenCentral()
// maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
//}

plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
// alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.spotless)
alias(libs.plugins.compose.jetbrains)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.android.library)
`dokka-convention`
}

apply(from = property("ANIMALSNIFFER_MPP"))
Expand Down
2 changes: 0 additions & 2 deletions arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion

Expand Down
3 changes: 1 addition & 2 deletions arrow-libs/optics/arrow-optics-reflect/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion

Expand All @@ -10,6 +8,7 @@ plugins {
alias(libs.plugins.publish)
alias(libs.plugins.kotlinx.kover)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand Down
5 changes: 2 additions & 3 deletions arrow-libs/optics/arrow-optics/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion


plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.kotlinx.kover)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand Down
5 changes: 2 additions & 3 deletions arrow-libs/resilience/arrow-resilience/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion


plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.publish)
alias(libs.plugins.kotlinx.kover)
alias(libs.plugins.spotless)
`dokka-convention`
}

spotless {
Expand Down
4 changes: 1 addition & 3 deletions arrow-libs/stack/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
@file:Suppress("DSL_SCOPE_VIOLATION")

plugins {
`java-platform`
alias(libs.plugins.publish)

}

group = property("projects.group").toString()
Expand Down
Loading