From da11ab8ce3a12c5a72cefe3602a03978ba847c66 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Wed, 5 Jun 2019 20:04:04 +0300 Subject: [PATCH] Got rid of delegation in library impl hierarchy --- .../konan/library/impl/KonanLibraryLayoutImpl.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt index e147a003cd9..d4bd070322e 100644 --- a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt +++ b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt @@ -47,15 +47,15 @@ private class FromZipBitcodeLibraryImpl(zipped: BitcodeLibraryLayoutImpl, zipFil FromZipTargetedLibraryImpl(zipped, zipFileSystem), BitcodeKotlinLibraryLayout open class ExtractingTargetedLibraryImpl(zipped: TargetedLibraryLayoutImpl) : - KotlinLibraryExtractor(zipped), - TargetedKotlinLibraryLayout by zipped { + ExtractingKotlinLibraryLayout(zipped), + TargetedKotlinLibraryLayout { - override val includedDir: File by lazy { extractDir(zipped.includedDir) } + override val includedDir: File by lazy { zipped.extractDir(zipped.includedDir) } } class ExtractingBitcodeLibraryImpl(zipped: BitcodeLibraryLayoutImpl) : ExtractingTargetedLibraryImpl(zipped), BitcodeKotlinLibraryLayout { - override val kotlinDir: File by lazy { extractDir(zipped.kotlinDir) } - override val nativeDir: File by lazy { extractDir(zipped.nativeDir) } + override val kotlinDir: File by lazy { zipped.extractDir(zipped.kotlinDir) } + override val nativeDir: File by lazy { zipped.extractDir(zipped.nativeDir) } }