From a280b8005404b44e82b6629a33218c27244947d2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 08:28:09 +0100 Subject: [PATCH 1/3] Update dokka to v1.9.20 (#826) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 60a9e3f5e..718bdd711 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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] From 5c727c2678d0caa6b85e47d248c99c06a9fb3230 Mon Sep 17 00:00:00 2001 From: Florian Wendland Date: Wed, 6 Mar 2024 13:47:38 +0100 Subject: [PATCH 2/3] Fix run command for docs workflow (#820) --- .github/workflows/docs.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 21e2016bd..bf2f96fbc 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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 From f04dcc3bd1d0b87b068bdf232e479a69a349c916 Mon Sep 17 00:00:00 2001 From: Florian Wendland Date: Wed, 6 Mar 2024 15:25:08 +0100 Subject: [PATCH 3/3] Fix deprecated Gradle features (#825) --- build.gradle.kts | 4 ++-- buildSrc/src/main/kotlin/module.gradle.kts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6e23712e4..1151e976d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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. @@ -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")) } diff --git a/buildSrc/src/main/kotlin/module.gradle.kts b/buildSrc/src/main/kotlin/module.gradle.kts index db8c34f0e..f2d3cd753 100644 --- a/buildSrc/src/main/kotlin/module.gradle.kts +++ b/buildSrc/src/main/kotlin/module.gradle.kts @@ -17,6 +17,7 @@ dependencies { // Unit tests testImplementation(kotlin("test")) testImplementation(libs.junit.params) + testRuntimeOnly("org.junit.platform:junit-platform-launcher") } repositories {