diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index dd8b71e..e8ee693 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -72,11 +72,11 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - name: Build - run: ./gradlew dokkaHtmlMultiModule + run: ./gradlew dokkaGenerate - name: Upload Pages Artifact uses: actions/upload-pages-artifact@v3 with: - path: "build/dokka/htmlMultiModule/" + path: "build/dokka/html/" deploy-pages: runs-on: ubuntu-latest diff --git a/build.gradle.kts b/build.gradle.kts index 4ec55b4..2414842 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,3 +10,8 @@ plugins { alias(libs.plugins.dokka) } + +dependencies { + dokka(projects.core) + dokka(projects.material3) +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 310af32..05aff75 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,5 +13,5 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled org.jetbrains.dokka.experimental.tryK2=true # Below here is all packaging details, not build configuration. -version=1.1.1 +version=1.1.2 group=io.github.boswelja.markdown diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8af3aa4..9f2505e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -android-gradle-plugin = "8.7.3" +android-gradle-plugin = "8.8.0" detekt = "1.23.7" kotlin = "2.1.10" dokka = "2.0.0" compose = "1.7.3" -coil = "3.0.4" +coil = "3.1.0" ktor = "3.0.3" intellij-markdown = "0.7.3" @@ -17,7 +17,6 @@ kotlinx-benchmark = "0.4.13" coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" } coil-gif = { module = "io.coil-kt.coil3:coil-gif", version.ref = "coil" } coil-svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coil" } -coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" } coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" } ktor-engine-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" } ktor-engine-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 73fbaea..f87743b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,5 @@ +import org.gradle.api.internal.FeaturePreviews + pluginManagement { repositories { gradlePluginPortal() @@ -26,10 +28,12 @@ dependencyResolutionManagement { } plugins { - id("com.android.settings") version("8.7.3") + id("com.android.settings") version("8.8.0") } -rootProject.name = "Compose Markdown" +rootProject.name = "compose-markdown" + +enableFeaturePreview(FeaturePreviews.Feature.TYPESAFE_PROJECT_ACCESSORS.name) include( ":core",