@@ -194,7 +194,7 @@ internal class KotlinMagicFinder(
194194 // TODO an entry with `META-INF/proguard/androidx-annotations.pro`
195195 val kotlinMagic = readClass(
196196 zipFile.getInputStream(entry).use { ClassReader (it.readBytes()) },
197- entry.toString()
197+ entry.name
198198 ) ? : return @mapNotNull null
199199
200200 entry to kotlinMagic
@@ -226,7 +226,7 @@ internal class KotlinMagicFinder(
226226 .mapNotNull { classFile ->
227227 val kotlinMagic = readClass(
228228 classFile.inputStream().use { ClassReader (it.readBytes()) },
229- classFile.toString( )
229+ Files .asPackagePath(classFile )
230230 ) ? : return @mapNotNull null
231231
232232 classFile to kotlinMagic
@@ -267,7 +267,7 @@ internal class KotlinMagicFinder(
267267 }
268268
269269 /* * Returned set is either null or non-empty. */
270- private fun readClass (classReader : ClassReader , classFile : String ): KotlinMagic ? {
270+ private fun readClass (classReader : ClassReader , packagePath : String ): KotlinMagic ? {
271271 val metadataVisitor = KotlinMetadataVisitor (logger)
272272 classReader.accept(metadataVisitor, 0 )
273273
@@ -283,8 +283,8 @@ internal class KotlinMagicFinder(
283283 val metadata = try {
284284 KotlinClassMetadata .readLenient(header.build())
285285 } catch (_: IllegalArgumentException ) {
286- logger.debug(" Can't read class file '$classFile '" )
287- errorsReport.appendText(" Can't read class file '$classFile '\n " )
286+ logger.debug(" Can't read class file '$packagePath '" )
287+ errorsReport.appendText(" Can't read class file '$packagePath '\n " )
288288 didWriteErrors = true
289289 return null
290290 }
@@ -305,9 +305,9 @@ internal class KotlinMagicFinder(
305305 typealiases = typealiases(metadata.kmPackage)
306306 }
307307
308- is KotlinClassMetadata .SyntheticClass -> logger.debug(" Ignoring SyntheticClass $classFile " )
309- is KotlinClassMetadata .MultiFileClassFacade -> logger.debug(" Ignoring MultiFileClassFacade $classFile " )
310- is KotlinClassMetadata .Unknown -> logger.debug(" Ignoring Unknown $classFile " )
308+ is KotlinClassMetadata .SyntheticClass -> logger.debug(" Ignoring SyntheticClass $packagePath " )
309+ is KotlinClassMetadata .MultiFileClassFacade -> logger.debug(" Ignoring MultiFileClassFacade $packagePath " )
310+ is KotlinClassMetadata .Unknown -> logger.debug(" Ignoring Unknown $packagePath " )
311311 }
312312 } ? : return null
313313
0 commit comments