Skip to content

Commit

Permalink
Merge branch 'main' into fw/fix-deprecated-logging
Browse files Browse the repository at this point in the history
  • Loading branch information
fwendland authored Mar 7, 2024
2 parents cab4e3d + f04dcc3 commit 61e703c
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 15 deletions.
26 changes: 14 additions & 12 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,26 @@ jobs:
contents: write
steps:
- uses: actions/checkout@v4
# Ensure Java installation to run Gradle
- uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 17
- name: 'Setup Gradle'
uses: gradle/actions/setup-gradle@v3
- name: 'Build API pages'
run: |
./gradlew dokkaHtmlMultiModule \
-Dorg.gradle.internal.repository.max.tentatives=5 \
-Dorg.gradle.internal.repository.initial.backoff=10000
- uses: actions/setup-python@v5
with:
python-version: '3.x'
- uses: actions/cache@v4
with:
key: ${{ github.ref }}
path: .cache
cache: 'pip'
cache-dependency-path: './docs/mkdocs-material-plugins.txt'
- name: 'Install mkdocs-material and plugins'
run: |
python -m pip install mkdocs-material
python -m pip install -r ./docs/mkdocs-material-plugins.txt
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
- name: 'Build API pages'
run: |
./gradlew
dokkaHtmlMultiModule
-Dorg.gradle.internal.repository.max.tentatives=5
-Dorg.gradle.internal.repository.initial.backoff=10000
- name: 'Build & deploy docs'
run: mkdocs gh-deploy --force
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ val projectProps by tasks.registering(WriteProperties::class) {
description = "Write project properties in a file."

// Set output file to build/project.properties
outputFile = file("$buildDir/codyze.properties")
destinationFile = layout.buildDirectory.file("codyze.properties")
// Default encoding is ISO-8559-1, here we change it.
encoding = "UTF-8"
// Optionally we can specify the header comment.
Expand All @@ -62,7 +62,7 @@ val projectProps by tasks.registering(WriteProperties::class) {
}
}

// configure detekt to combine the results of all submodules into a single sarif file -> for github code scanning
// configure detekt to combine the results of all submodules into a single sarif file -> for GitHub code scanning
val detektReportMergeSarif by tasks.registering(ReportMergeTask::class) {
output.set(rootProject.layout.buildDirectory.file("reports/detekt/detekt.sarif"))
}
Expand Down
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ dependencies {
// Unit tests
testImplementation(kotlin("test"))
testImplementation(libs.junit.params)
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ koin = "3.5.3"
koin-test = "3.5.3"
detekt = "1.23.5"
spotless = "6.25.0"
dokka = "1.9.10"
dokka = "1.9.20"


[libraries]
Expand Down

0 comments on commit 61e703c

Please sign in to comment.