diff options
| author | Kamil Doległo <kamilok1965@interia.pl> | 2019-07-01 12:50:22 +0200 |
|---|---|---|
| committer | Kamil Doległo <kamilok1965@interia.pl> | 2019-07-01 12:50:22 +0200 |
| commit | f55d000ac5f7609a6cc8472e315ae45d4cbcc77b (patch) | |
| tree | 69748545fd1a2ed2ddfcc9b4ea87a60d7355ef39 /core/src | |
| parent | 04df5c458239fb1966768af85de4d105a3c43233 (diff) | |
| download | dokka-f55d000ac5f7609a6cc8472e315ae45d4cbcc77b.tar.gz dokka-f55d000ac5f7609a6cc8472e315ae45d4cbcc77b.tar.bz2 dokka-f55d000ac5f7609a6cc8472e315ae45d4cbcc77b.zip | |
Fix bug with nonexistent file on native
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/main/kotlin/Analysis/DokkaAnalyzerFacades.kt | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/core/src/main/kotlin/Analysis/DokkaAnalyzerFacades.kt b/core/src/main/kotlin/Analysis/DokkaAnalyzerFacades.kt index 082d3968..874341dd 100644 --- a/core/src/main/kotlin/Analysis/DokkaAnalyzerFacades.kt +++ b/core/src/main/kotlin/Analysis/DokkaAnalyzerFacades.kt @@ -88,7 +88,7 @@ object DokkaJsAnalyzerFacade : ResolverForModuleFactory() { .filter { it.version.isCompatible() } .map { metadata -> val (header, packageFragmentProtos) = - KotlinJavascriptSerializationUtil.readModuleAsProto(metadata.body, metadata.version) + KotlinJavascriptSerializationUtil.readModuleAsProto(metadata.body, metadata.version) createKotlinJavascriptPackageFragmentProvider( moduleContext.storageManager, moduleDescriptor, header, packageFragmentProtos, metadata.version, container.get(), LookupTracker.DO_NOTHING @@ -147,14 +147,15 @@ object DokkaNativeAnalyzerFacade : ResolverForModuleFactory() { if (moduleInfo is LibraryModuleInfo) { moduleInfo.getLibraryRoots() - .map { createKonanLibrary(File(it), KOTLIN_NATIVE_CURRENT_ABI_VERSION) } - .mapTo(fragmentProviders) { - it.createPackageFragmentProvider( - moduleContext.storageManager, - languageVersionSettings, - moduleDescriptor - ) - } + .filter { File(it).extension != "jar" } + .map { createKonanLibrary(File(it), KOTLIN_NATIVE_CURRENT_ABI_VERSION) } + .mapTo(fragmentProviders) { + it.createPackageFragmentProvider( + moduleContext.storageManager, + languageVersionSettings, + moduleDescriptor + ) + } } |