From c519a69d4d953c1dd81052ab7bd64fd5d739a61c Mon Sep 17 00:00:00 2001 From: Konstantin Date: Wed, 29 May 2024 17:55:45 +0200 Subject: [PATCH] [resources] Delete Thread.currentThread().contextClassLoader on JVM targets (#4895) The class loader retrieval method has been modified in both `ResourceReader.android.kt` and `ResourceReader.desktop.kt` files. The return statement has been changed to prioritize java class classLoader and provides a clearer error message when it can't be found. Fixes https://github.com/JetBrains/compose-multiplatform/issues/4887 Fixes https://github.com/JetBrains/compose-multiplatform/issues/4742 ## Release Notes ### Fixes - Resources - Delete contextClassLoader usage on JVM targets --- .../org/jetbrains/compose/resources/ResourceReader.android.kt | 2 +- .../org/jetbrains/compose/resources/ResourceReader.desktop.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/ResourceReader.android.kt b/components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/ResourceReader.android.kt index 5ec66d7f02..7c1ce6fdbf 100644 --- a/components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/ResourceReader.android.kt +++ b/components/resources/library/src/androidMain/kotlin/org/jetbrains/compose/resources/ResourceReader.android.kt @@ -46,6 +46,6 @@ internal actual fun getPlatformResourceReader(): ResourceReader = object : Resou } private fun getClassLoader(): ClassLoader { - return Thread.currentThread().contextClassLoader ?: this.javaClass.classLoader!! + return this.javaClass.classLoader ?: error("Cannot find class loader") } } \ No newline at end of file diff --git a/components/resources/library/src/desktopMain/kotlin/org/jetbrains/compose/resources/ResourceReader.desktop.kt b/components/resources/library/src/desktopMain/kotlin/org/jetbrains/compose/resources/ResourceReader.desktop.kt index 25d4ef44c1..3f9097e520 100644 --- a/components/resources/library/src/desktopMain/kotlin/org/jetbrains/compose/resources/ResourceReader.desktop.kt +++ b/components/resources/library/src/desktopMain/kotlin/org/jetbrains/compose/resources/ResourceReader.desktop.kt @@ -30,6 +30,6 @@ internal actual fun getPlatformResourceReader(): ResourceReader = object : Resou } private fun getClassLoader(): ClassLoader { - return Thread.currentThread().contextClassLoader ?: this.javaClass.classLoader!! + return this.javaClass.classLoader ?: error("Cannot find class loader") } } \ No newline at end of file