Skip to content
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

Fix DGP/KMP integration, so Dokka can 'see' code from shared source sets in target source sets #3814

Merged
merged 96 commits into from
Nov 26, 2024
Merged

Fix DGP/KMP integration, so Dokka can 'see' code from shared source sets in target source sets #3814

Show file tree
Hide file tree
Changes from 85 commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
ecc43a5
Fix common source sets not propogated
adam-enko Sep 19, 2024
fc6319b
Add some kdoc
adam-enko Sep 23, 2024
1482ecf
refine test
adam-enko Sep 23, 2024
1522d04
Fix fetching platform sources
adam-enko Oct 16, 2024
e45e4d9
Merge branch 'master' into adam/feat/KT-70336/pass-common-src-to-depe…
adam-enko Oct 16, 2024
c41a249
Merge branch 'master' into adam/feat/KT-70336/pass-common-src-to-depe…
adam-enko Oct 17, 2024
a639d51
wip
adam-enko Oct 17, 2024
148f821
Merge branch 'master' into adam/feat/KT-70336/pass-common-src-to-depe…
adam-enko Oct 22, 2024
b39e793
Fix issues in KotlinAdapter
adam-enko Oct 22, 2024
ad6a532
Sort DokkaSourceSets (helps with debugging)
adam-enko Oct 22, 2024
169a859
Fix convention for `DokkaSourceSetSpec.suppress`
adam-enko Oct 22, 2024
0c8605d
Fix convention for `DokkaSourceSetSpec.suppress`
adam-enko Oct 22, 2024
586d603
Add 'Dokka' to warn message
adam-enko Oct 22, 2024
f80f5b4
remove analysis platform convention, otherwise it overrides the conve…
adam-enko Oct 22, 2024
ead23da
Deprecate unused `KotlinPlatform.DEFAULT`
adam-enko Oct 22, 2024
a3919ed
IT Android with DGPv2
adam-enko Oct 24, 2024
22cd3d5
test Android Compose project
adam-enko Oct 24, 2024
e895ca1
Tidy DokkaGradlePluginTestExtension, split up file into separate clas…
adam-enko Oct 30, 2024
651cdf8
Tidy GradleTestProjectInitializer
adam-enko Oct 30, 2024
91ee7d0
run tests with Java 17
adam-enko Oct 30, 2024
cb7e331
Merge branch 'master' into adam/feat/KT-70336/pass-common-src-to-depe…
adam-enko Nov 4, 2024
7fe86c9
tidy after merge
adam-enko Nov 4, 2024
c65a390
add project path to log message
adam-enko Nov 4, 2024
718cc3a
remove unused code... (maybe use it again in the future?)
adam-enko Nov 4, 2024
2a4239a
fix after merge: remove duplicated `devMavenPublish.configureTask(this)`
adam-enko Nov 4, 2024
b87bab1
update `WithGradleProperties` to be a repeatable annotation (easier t…
adam-enko Nov 4, 2024
51ecce5
undo deprecation of KotlinPlatform.DEFAULT
adam-enko Nov 5, 2024
ee91c75
DGPv2 Android integration tests
adam-enko Nov 5, 2024
6109ba0
updated expected data
adam-enko Nov 5, 2024
4cced1f
IJ exclude dokka-integration-tests/.kotlin
adam-enko Nov 5, 2024
cec0a7a
Add more kdoc
adam-enko Nov 5, 2024
8221b9f
update assertions, use `loadConfigurationCacheReportData` util to avo…
adam-enko Nov 5, 2024
cdbe9b0
Skip testing AGP8 until KT-70855 is fixed
adam-enko Nov 5, 2024
1959c37
improve loadConfigurationCacheReportData, tidy assertions
adam-enko Nov 5, 2024
92fb66c
rm commented out code
adam-enko Nov 5, 2024
5cc2de2
fix `updateProjectLocalMavenDir()`
adam-enko Nov 5, 2024
fd6297a
Improve directory-contents assertion to provide much more detailed fa…
adam-enko Nov 5, 2024
51c18a4
tidy `shouldBeDirectoryWithSameContentAs` assertion
adam-enko Nov 5, 2024
f6c3d38
fix gradle task dependency
adam-enko Nov 5, 2024
f8ffcb8
Improve directory comparison assertion
adam-enko Nov 5, 2024
958e662
Merge branch 'adam/feat/improve-directory-compare-assertion' into ada…
adam-enko Nov 5, 2024
492a055
comparing fix binary data
adam-enko Nov 5, 2024
de2834c
Merge branch 'adam/feat/improve-directory-compare-assertion' into ada…
adam-enko Nov 5, 2024
f9ccd37
replace non-printable characters with the codepoint
adam-enko Nov 5, 2024
9c7a32a
tidy replaceNonPrintableWithCodepoint
adam-enko Nov 5, 2024
66726d0
Merge branch 'adam/feat/improve-directory-compare-assertion' into ada…
adam-enko Nov 5, 2024
05f2c46
Merge branch 'master' into adam/feat/KT-70336/android-integration-tests
adam-enko Nov 7, 2024
76e30c1
try re-building to prevent CC miss on TeamCity
adam-enko Nov 11, 2024
13ef2d5
clear CC reports
adam-enko Nov 11, 2024
01d1674
clear CC reports
adam-enko Nov 11, 2024
9a4e2e7
formatting
adam-enko Nov 11, 2024
28ebc6c
Merge branch 'master' into adam/feat/KT-70336/pass-common-src-to-depe…
adam-enko Nov 11, 2024
bec6a6b
Merge branch 'adam/feat/KT-70336/android-integration-tests' into adam…
adam-enko Nov 11, 2024
b2712ef
remove unused class
adam-enko Nov 11, 2024
7cf355c
fix stacktrace values
adam-enko Nov 11, 2024
be8cf89
fix `newInstance<KotlinSourceSetDetails>`
adam-enko Nov 11, 2024
bd05d04
update expected HTML
adam-enko Nov 11, 2024
6666505
revert suppress being optional
adam-enko Nov 11, 2024
10348dc
formatting
adam-enko Nov 11, 2024
4f64d41
fix import
adam-enko Nov 12, 2024
383f029
update expected data
adam-enko Nov 12, 2024
5053890
fix import
adam-enko Nov 12, 2024
fc38971
Merge branch 'adam/feat/KT-70336/android-integration-tests' into adam…
adam-enko Nov 12, 2024
16344f7
Merge branch 'master' into adam/feat/KT-70336/pass-common-src-to-depe…
adam-enko Nov 13, 2024
4e789df
update clue message
adam-enko Nov 13, 2024
71cdc0c
Merge branch 'master' into adam/feat/KT-70336/pass-common-src-to-depe…
adam-enko Nov 20, 2024
82cfac1
reduce diff output for `shouldBeADirectoryWithSameContentAs` failure
adam-enko Nov 20, 2024
f944fd4
un-ignore AndroidProject HTML test for AGP 8
adam-enko Nov 20, 2024
c1b3520
update expected HTML for Android projects
adam-enko Nov 20, 2024
80b7a26
fix test rootProject name
adam-enko Nov 20, 2024
4faf753
reduce output of `shouldBeADirectoryWithSameContentAs` assertion
adam-enko Nov 20, 2024
4f20f11
update expected data for Android projects
adam-enko Nov 20, 2024
5c34de3
revert truncation of diff lines
adam-enko Nov 20, 2024
a1a5fce
try building project first...
adam-enko Nov 20, 2024
71e12e3
tidy kdoc
adam-enko Nov 21, 2024
d5d394f
Add kdoc to `dokkaSourceSetSpecFactory`
adam-enko Nov 21, 2024
35f960e
Improve KmpCommonSourceSharedWithDependentsTest
adam-enko Nov 21, 2024
6f299d5
Update KotlinAdapter:
adam-enko Nov 21, 2024
31d521c
copy old comment for DSS.suppress
adam-enko Nov 21, 2024
e62424b
revert adding arg name
adam-enko Nov 21, 2024
36eb7d7
extract KotlinPlatform computation to a function
adam-enko Nov 21, 2024
aca1c58
revert depending on all transitive source sets
adam-enko Nov 21, 2024
c1d803c
disable KmpCommonSourceSharedWithDependentsTest, because of https://g…
adam-enko Nov 21, 2024
15c0bcb
Merge branch 'refs/heads/master' into adam/feat/KT-70336/pass-common-…
adam-enko Nov 25, 2024
f0bbb1b
convert KmpCommonSourceSharedWithDependentsTest from functional test …
adam-enko Nov 25, 2024
b8b5f8b
Add test for DokkaSourceSetSpec conventions
adam-enko Nov 25, 2024
3c52f0b
update assertion
adam-enko Nov 25, 2024
82774ae
update dokkaGenerateModuleHtml assertion
adam-enko Nov 25, 2024
fe97896
log dokka config
adam-enko Nov 26, 2024
f582d0d
log dokka config
adam-enko Nov 26, 2024
b58d42f
log dokka config
adam-enko Nov 26, 2024
e163110
Merge branch 'master' into adam/feat/KT-70336/pass-common-src-to-depe…
adam-enko Nov 26, 2024
d38aece
add more targets to workaround issue where Dokka gets confused with s…
adam-enko Nov 26, 2024
a04eae9
improve logging dokka config
adam-enko Nov 26, 2024
302ae58
disable KMP IT HTML comparison test
adam-enko Nov 26, 2024
bb77c17
grammar fix
adam-enko Nov 26, 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
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ idea {
"dokka-integration-tests/gradle/src/testExampleProjects/expectedData",
"dokka-integration-tests/gradle/projects/it-android/expectedData",
"dokka-integration-tests/gradle/projects/it-android-compose/expectedData",
"dokka-integration-tests/gradle/projects/it-kotlin-multiplatform/expectedData",
)
)
}
Expand Down
10 changes: 5 additions & 5 deletions dokka-integration-tests/gradle/projects/it-android-compose/expectedData/html/core/index.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions ...tegration-tests/gradle/projects/it-android-compose/expectedData/html/core/navigation.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...d-compose/expectedData/html/core/org.dokka.it.android.kmp.core/-menu-item/-menu-item.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...compose/expectedData/html/core/org.dokka.it.android.kmp.core/-menu-item/image-vector.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading