Skip to content

Commit efd3c51

Browse files
authored
Revert Dokka v2 (#631)
Reason: #627
1 parent 5b57e61 commit efd3c51

File tree

7 files changed

+9
-28
lines changed

7 files changed

+9
-28
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,19 +136,19 @@ jobs:
136136
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
137137
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
138138

139-
- run: ./gradlew :docs:dokkaGenerate
139+
- run: ./gradlew dokkaHtmlMultiModule
140140

141141
- uses: actions/upload-artifact@v4
142142
with:
143143
name: html-docs
144-
path: docs/build/dokka/html/
144+
path: build/dokka/htmlMultiModule/
145145
if-no-files-found: error
146146

147147
- uses: JamesIves/github-pages-deploy-action@releases/v3
148148
if: ${{ github.ref == 'refs/heads/trunk' && github.repository == 'JakeWharton/mosaic' }}
149149
with:
150150
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
151151
BRANCH: site
152-
FOLDER: docs/build/dokka/html/
152+
FOLDER: build/dokka/htmlMultiModule/
153153
TARGET_FOLDER: docs/latest/
154154
CLEAN: true

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ jobs:
3838
body: ${{ steps.release_notes.outputs.release_notes }}
3939
discussionCategory: Announcements
4040

41-
- run: ./gradlew :docs:dokkaGenerate
41+
- run: ./gradlew dokkaHtmlMultiModule
4242

4343
- name: Deploy docs to website
4444
uses: JamesIves/github-pages-deploy-action@releases/v3
4545
with:
4646
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4747
BRANCH: site
48-
FOLDER: docs/build/dokka/html/
48+
FOLDER: build/dokka/htmlMultiModule/
4949
TARGET_FOLDER: docs/0.x/
5050
CLEAN: true

build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
4+
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
35
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
46

57
buildscript {
@@ -21,6 +23,8 @@ buildscript {
2123
}
2224
}
2325

26+
apply plugin: 'org.jetbrains.dokka'
27+
2428
allprojects {
2529
group = GROUP
2630
version = VERSION_NAME

docs/build.gradle

Lines changed: 0 additions & 8 deletions
This file was deleted.

gradle.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,3 @@ org.gradle.parallel=true
3535
com.jakewharton.mosaic.internal=true
3636

3737
kotlin.native.ignoreDisabledTargets=true
38-
39-
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
40-
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

publish.gradle

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,3 @@ apiValidation {
1515
"com.jakewharton.mosaic.animation.InternalAnimationApi"
1616
]
1717
}
18-
19-
dokka {
20-
dokkaSourceSets.named('commonMain').configure {
21-
sourceLink {
22-
def ref = "$version".endsWith('-SNAPSHOT') ? 'trunk' : version
23-
def dir = rootDir.relativePath(projectDir)
24-
remoteUrl("https://github.com/JakeWharton/mosaic/tree/$ref/$dir")
25-
}
26-
}
27-
}

settings.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ include ':mosaic-runtime'
2121
include ':mosaic-terminal'
2222
include ':mosaic-testing'
2323

24-
include ':docs'
25-
2624
include ':samples:counter'
2725
include ':samples:demo'
2826
include ':samples:jest'

0 commit comments

Comments
 (0)