From a33ca66c9f75265710cb7a42c48f5feb95ba3cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=83=D1=80=D0=B0=D0=BA=D1=83=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=90=D0=B4=D0=B8=D0=BB=D0=B5=D1=82?= Date: Tue, 9 Jun 2026 16:43:50 +0600 Subject: [PATCH 1/5] fix: detect Kotlin 2.4 FIR registration API --- .../compiler/adapter/KotlinAdapterLoader.kt | 39 ++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/koin-compiler-version-adapter/src/org/koin/compiler/adapter/KotlinAdapterLoader.kt b/koin-compiler-version-adapter/src/org/koin/compiler/adapter/KotlinAdapterLoader.kt index 872d1dd..395a75f 100644 --- a/koin-compiler-version-adapter/src/org/koin/compiler/adapter/KotlinAdapterLoader.kt +++ b/koin-compiler-version-adapter/src/org/koin/compiler/adapter/KotlinAdapterLoader.kt @@ -50,22 +50,23 @@ object KotlinAdapterLoader { val newest = registry.last() val warnings = mutableListOf() - val current = KotlinReleaseVersion.parseOrNull(compilerVersion) + val effectiveCompilerVersion = effectiveCompilerVersion(compilerVersion, warnings) + val current = KotlinReleaseVersion.parseOrNull(effectiveCompilerVersion) val entry = when { current == null -> { - warnings += "Koin compiler plugin: unrecognized Kotlin version '$compilerVersion' — using the adapter for Kotlin ${newest.first.raw} (newest available). Supported versions: ${supportedList(registry)}." + warnings += "Koin compiler plugin: unrecognized Kotlin version '$effectiveCompilerVersion' — using the adapter for Kotlin ${newest.first.raw} (newest available). Supported versions: ${supportedList(registry)}." newest } else -> registry.lastOrNull { current.lineAtLeast(it.first) } ?: return Selection( null, warnings, - "Koin compiler plugin: Kotlin $compilerVersion is older than the oldest supported version (${registry.first().first.raw}). " + + "Koin compiler plugin: Kotlin $effectiveCompilerVersion is older than the oldest supported version (${registry.first().first.raw}). " + "Upgrade Kotlin or use a koin-compiler-plugin release matching your Kotlin version. Supported versions: ${supportedList(registry)}.", ) } if (current != null && !newest.first.lineAtLeast(current)) { - warnings += "Koin compiler plugin: Kotlin $compilerVersion is newer than the newest tested version (${newest.first.raw}) — proceeding with the ${newest.first.raw} adapter. " + + warnings += "Koin compiler plugin: Kotlin $effectiveCompilerVersion is newer than the newest tested version (${newest.first.raw}) — proceeding with the ${newest.first.raw} adapter. " + "If compilation fails, check for a koin-compiler-plugin update. Supported versions: ${supportedList(registry)}." } @@ -76,10 +77,38 @@ object KotlinAdapterLoader { loaded = adapter Selection(adapter, warnings, null) } catch (e: Throwable) { - Selection(null, warnings, "Koin compiler plugin: failed to load Kotlin version adapter '${entry.second}' for Kotlin $compilerVersion: $e") + Selection(null, warnings, "Koin compiler plugin: failed to load Kotlin version adapter '${entry.second}' for Kotlin $effectiveCompilerVersion: $e") } } + /** + * Gradle's Build Tools API path can expose a compiler API newer than the + * `KotlinCompilerVersion.VERSION` constant visible to the plugin classloader. + * Kotlin 2.4.0 changed FIR extension registration from ProjectExtensionDescriptor + * to ExtensionPointDescriptor; if that shape is present, the 2.3 adapter is + * guaranteed to fail even when the reported version still looks like 2.3.x. + */ + private fun effectiveCompilerVersion(reportedVersion: String, warnings: MutableList): String { + if (!requiresKotlin240FirRegistrationApi()) return reportedVersion + + val reported = KotlinReleaseVersion.parseOrNull(reportedVersion) + val kotlin240 = KotlinReleaseVersion.parseOrNull("2.4.0") ?: return reportedVersion + if (reported != null && reported.lineAtLeast(kotlin240)) return reportedVersion + + warnings += "Koin compiler plugin: Kotlin reports '$reportedVersion' but exposes the Kotlin 2.4 FIR extension registration API — using the Kotlin 2.4.0 adapter." + return "2.4.0" + } + + private fun requiresKotlin240FirRegistrationApi(): Boolean = + try { + val registrarAdapter = Class.forName("org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter") + val companion = registrarAdapter.getField("Companion").get(null) + val projectExtensionDescriptor = Class.forName("org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor") + !projectExtensionDescriptor.isInstance(companion) + } catch (_: Throwable) { + false + } + /** Registry entries sorted by Kotlin version, oldest first. */ private fun readRegistry(): List> { val resource = KotlinAdapterLoader::class.java.classLoader.getResourceAsStream(REGISTRY_PATH) From 85dde4d8eba81b5d41ea49a6c3100b46f9eeecca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=83=D1=80=D0=B0=D0=BA=D1=83=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=90=D0=B4=D0=B8=D0=BB=D0=B5=D1=82?= Date: Tue, 9 Jun 2026 16:44:04 +0600 Subject: [PATCH 2/5] build: update compiler project to Kotlin 2.4 --- gradle/libs.versions.toml | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../template/runners/AbstractJvmBoxTest.kt | 2 + .../runners/AbstractJvmDiagnosticTest.kt | 2 + .../template/runners/JvmBoxTestGenerated.java | 188 +++++++++++------- .../runners/JvmDiagnosticTestGenerated.java | 50 ++--- .../runners/JvmErrorMessageTestGenerated.java | 50 ++--- .../box/annotations/factory_class.fir.ir.txt | 2 +- .../module_created_at_start.fir.ir.txt | 4 +- .../module_created_at_start.fir.txt | 4 +- .../annotations/singleton_class.fir.ir.txt | 2 +- .../auto_interface_binding.fir.ir.txt | 2 +- .../delegation_no_autobind.fir.ir.txt | 4 +- .../bindings/delegation_no_autobind.fir.txt | 2 +- .../provider_function_binds.fir.ir.txt | 4 +- .../bindings/provider_function_binds.fir.txt | 2 +- .../box/dsl/arrow_bind_non_koin.fir.ir.txt | 2 +- .../box/dsl/create_constructor.fir.ir.txt | 4 +- .../testData/box/dsl/factory_basic.fir.ir.txt | 2 +- .../hints_package_no_annotations.fir.ir.txt | 4 +- .../testData/box/dsl/scoped_basic.fir.ir.txt | 4 +- .../testData/box/dsl/single_basic.fir.ir.txt | 2 +- .../dsl/single_with_default_value.fir.ir.txt | 2 +- .../box/dsl/single_with_dependency.fir.ir.txt | 4 +- .../box/dsl/single_with_lazy.fir.ir.txt | 4 +- .../box/dsl/single_with_nullable.fir.ir.txt | 2 +- .../modules/component_scan_basic.fir.ir.txt | 4 +- .../box/modules/component_scan_basic.fir.txt | 2 +- .../box/modules/module_extension.fir.ir.txt | 2 +- .../modules/module_with_functions.fir.ir.txt | 4 +- .../box/params/injected_param.fir.ir.txt | 4 +- .../box/params/lazy_injection.fir.ir.txt | 4 +- .../box/params/property_basic.fir.ir.txt | 2 +- .../box/params/property_basic.fir.txt | 2 +- .../custom_qualifier_type.fir.ir.txt | 16 +- .../qualifiers/custom_qualifier_type.fir.txt | 4 +- .../box/qualifiers/named_on_class.fir.ir.txt | 4 +- .../box/qualifiers/named_on_class.fir.txt | 4 +- .../qualifiers/named_on_parameter.fir.ir.txt | 4 +- .../box/qualifiers/named_on_parameter.fir.txt | 4 +- .../box/qualifiers/qualifier_type.fir.ir.txt | 8 +- .../box/qualifiers/qualifier_type.fir.txt | 4 +- .../callsite_hint_module_prefix.fir.ir.txt | 2 +- .../box/safety/complete_graph.fir.ir.txt | 6 +- .../box/safety/configuration_group.fir.ir.txt | 8 +- .../box/safety/configuration_group.fir.txt | 4 +- .../box/safety/default_value_ok.fir.ir.txt | 2 +- .../box/safety/dsl_create_function.fir.ir.txt | 4 +- .../safety/dsl_injected_param_d006.fir.ir.txt | 4 +- .../box/safety/dsl_module_includes.fir.ir.txt | 4 +- .../box/safety/dsl_nested_includes.fir.ir.txt | 2 +- .../safety/dsl_transitive_includes.fir.ir.txt | 6 +- .../generic_dsl_type_no_crash.fir.ir.txt | 2 +- .../box/safety/injected_param_ok.fir.ir.txt | 4 +- ..._param_unit_qualifier_collision.fir.ir.txt | 6 +- ...ted_param_unit_qualifier_collision.fir.txt | 4 +- .../testData/box/safety/lazy_valid.fir.ir.txt | 4 +- .../testData/box/safety/list_ok.fir.ir.txt | 2 +- .../safety/module_includes_chain.fir.ir.txt | 10 +- .../box/safety/module_includes_chain.fir.txt | 4 +- .../safety/module_includes_visible.fir.ir.txt | 6 +- .../safety/module_includes_visible.fir.txt | 2 +- .../box/safety/nullable_ok.fir.ir.txt | 2 +- .../box/safety/property_value_ok.fir.ir.txt | 2 +- .../box/safety/property_value_ok.fir.txt | 4 +- .../safety/provided_param_dsl_ok.fir.ir.txt | 2 +- .../box/safety/provided_param_ok.fir.ir.txt | 2 +- .../box/safety/provided_type_ok.fir.ir.txt | 2 +- ...qualified_function_cross_module.fir.ir.txt | 12 +- .../qualified_function_cross_module.fir.txt | 10 +- .../safety/qualifier_cross_module.fir.ir.txt | 10 +- .../box/safety/qualifier_cross_module.fir.txt | 10 +- .../qualifier_cross_module_type.fir.ir.txt | 18 +- .../qualifier_cross_module_type.fir.txt | 10 +- .../safety/qualifier_dotted_name.fir.ir.txt | 10 +- .../box/safety/qualifier_dotted_name.fir.txt | 10 +- .../box/safety/qualifier_match.fir.ir.txt | 6 +- .../box/safety/qualifier_match.fir.txt | 6 +- .../box/safety/scope_id_ok.fir.ir.txt | 2 +- .../testData/box/safety/scope_id_ok.fir.txt | 2 +- .../box/safety/scope_param_dsl_ok.fir.ir.txt | 2 +- .../box/safety/scope_param_ok.fir.ir.txt | 2 +- .../box/safety/scoped_visibility.fir.ir.txt | 6 +- .../box/safety/scoped_visibility.fir.txt | 2 +- .../safety/startkoin_full_graph.fir.ir.txt | 6 +- .../box/safety/startkoin_full_graph.fir.txt | 6 +- .../safety/toplevel_function_ok.fir.ir.txt | 4 +- .../box/scopes/scope_class.fir.ir.txt | 4 +- .../testData/box/scopes/scope_class.fir.txt | 2 +- .../box/scopes/scope_id_param_name.fir.ir.txt | 6 +- .../box/scopes/scope_id_param_name.fir.txt | 4 +- .../testData/box/scopes/scope_name.fir.ir.txt | 6 +- .../testData/box/scopes/scope_name.fir.txt | 4 +- .../configuration_discovery.fir.ir.txt | 4 +- ..._modules_override_configuration.fir.ir.txt | 8 +- ...cit_modules_override_configuration.fir.txt | 2 +- .../box/startkoin/koin_application.fir.ir.txt | 2 +- .../box/startkoin/multiple_modules.fir.ir.txt | 8 +- .../box/startkoin/startkoin_basic.fir.ir.txt | 2 +- .../qualified_unit_singletons.fir.ir.txt | 8 +- .../qualified_unit_singletons.fir.txt | 6 +- .../toplevel/singleton_function.fir.ir.txt | 2 +- .../box/toplevel/singleton_function.fir.txt | 2 +- .../call_site_param_arity_mismatch.fir.txt | 2 +- .../call_site_param_missing_d006.fir.txt | 2 +- ...all_site_param_no_injected_no_d006.fir.txt | 2 +- .../call_site_param_nullable_ok.fir.txt | 2 +- .../diagnostics/call_site_param_ok.fir.txt | 2 +- .../call_site_param_type_mismatch.fir.txt | 2 +- ...circular_dependency_broken_by_lazy.fir.txt | 2 +- .../circular_dependency_direct.fir.txt | 2 +- .../circular_dependency_transitive.fir.txt | 2 +- .../configuration_label_mismatch.fir.txt | 4 +- .../missing_viewmodel_artifact.fir.txt | 2 +- .../missing_worker_artifact.fir.txt | 2 +- .../diagnostics/qualifier_mismatch.fir.txt | 4 +- .../diagnostics/scoped_cross_scope.fir.txt | 4 +- .../diagnostics/startkoin_missing.fir.txt | 4 +- 118 files changed, 416 insertions(+), 352 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 560da09..132420c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.3.20" +kotlin = "2.4.0" koin = "4.2.1" kotzilla-sdk = "1.4.2" build-config = "5.6.5" @@ -17,4 +17,4 @@ kotzilla-core = { module = "io.kotzilla:kotzilla-core-jvm", version.ref = "kotzi kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } build-config = { id = "com.github.gmazzo.buildconfig", version.ref = "build-config" } binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "bcv" } -nmcp = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" } \ No newline at end of file +nmcp = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da..5dd3c01 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/koin-compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmBoxTest.kt b/koin-compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmBoxTest.kt index f8c1b11..b0f45f5 100644 --- a/koin-compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmBoxTest.kt +++ b/koin-compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmBoxTest.kt @@ -3,6 +3,7 @@ package org.jetbrains.kotlin.compiler.plugin.template.runners import org.jetbrains.kotlin.compiler.plugin.template.services.configurePlugin import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder +import org.jetbrains.kotlin.test.backend.handlers.UpdateTestDataHandler import org.jetbrains.kotlin.test.directives.CodegenTestDirectives import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives @@ -36,6 +37,7 @@ open class AbstractJvmBoxTest : AbstractFirBlackBoxCodegenTestBase(FirParser.Lig +CodegenTestDirectives.IGNORE_DEXING // Avoids loading R8 from the classpath. } + useAfterAnalysisCheckers(::UpdateTestDataHandler) configurePlugin() } } diff --git a/koin-compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmDiagnosticTest.kt b/koin-compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmDiagnosticTest.kt index d487813..9e447a9 100644 --- a/koin-compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmDiagnosticTest.kt +++ b/koin-compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmDiagnosticTest.kt @@ -1,6 +1,7 @@ package org.jetbrains.kotlin.compiler.plugin.template.runners import org.jetbrains.kotlin.compiler.plugin.template.services.configurePlugin +import org.jetbrains.kotlin.test.backend.handlers.UpdateTestDataHandler import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.CodegenTestDirectives @@ -35,6 +36,7 @@ open class AbstractJvmDiagnosticTest : AbstractFirPhasedDiagnosticTest(FirParser +CodegenTestDirectives.IGNORE_DEXING // Avoids loading R8 from the classpath. } + useAfterAnalysisCheckers(::UpdateTestDataHandler) configurePlugin() } } diff --git a/koin-compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java b/koin-compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java index 23c882d..47a4580 100644 --- a/koin-compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java +++ b/koin-compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java @@ -16,6 +16,10 @@ @TestMetadata("koin-compiler-plugin/testData/box") @TestDataPath("$PROJECT_ROOT") public class JvmBoxTestGenerated extends AbstractJvmBoxTest { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/box/" + fileName); + } + @Test public void testAllFilesPresentInBox() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -25,6 +29,10 @@ public void testAllFilesPresentInBox() { @TestMetadata("koin-compiler-plugin/testData/box/annotations") @TestDataPath("$PROJECT_ROOT") public class Annotations { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/box/annotations/" + fileName); + } + @Test public void testAllFilesPresentInAnnotations() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/box/annotations"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -33,19 +41,19 @@ public void testAllFilesPresentInAnnotations() { @Test @TestMetadata("factory_class.kt") public void testFactory_class() { - runTest("koin-compiler-plugin/testData/box/annotations/factory_class.kt"); + run("factory_class.kt"); } @Test @TestMetadata("module_created_at_start.kt") public void testModule_created_at_start() { - runTest("koin-compiler-plugin/testData/box/annotations/module_created_at_start.kt"); + run("module_created_at_start.kt"); } @Test @TestMetadata("singleton_class.kt") public void testSingleton_class() { - runTest("koin-compiler-plugin/testData/box/annotations/singleton_class.kt"); + run("singleton_class.kt"); } } @@ -53,6 +61,10 @@ public void testSingleton_class() { @TestMetadata("koin-compiler-plugin/testData/box/bindings") @TestDataPath("$PROJECT_ROOT") public class Bindings { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/box/bindings/" + fileName); + } + @Test public void testAllFilesPresentInBindings() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/box/bindings"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -61,19 +73,19 @@ public void testAllFilesPresentInBindings() { @Test @TestMetadata("auto_interface_binding.kt") public void testAuto_interface_binding() { - runTest("koin-compiler-plugin/testData/box/bindings/auto_interface_binding.kt"); + run("auto_interface_binding.kt"); } @Test @TestMetadata("delegation_no_autobind.kt") public void testDelegation_no_autobind() { - runTest("koin-compiler-plugin/testData/box/bindings/delegation_no_autobind.kt"); + run("delegation_no_autobind.kt"); } @Test @TestMetadata("provider_function_binds.kt") public void testProvider_function_binds() { - runTest("koin-compiler-plugin/testData/box/bindings/provider_function_binds.kt"); + run("provider_function_binds.kt"); } } @@ -81,6 +93,10 @@ public void testProvider_function_binds() { @TestMetadata("koin-compiler-plugin/testData/box/dsl") @TestDataPath("$PROJECT_ROOT") public class Dsl { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/box/dsl/" + fileName); + } + @Test public void testAllFilesPresentInDsl() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/box/dsl"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -89,61 +105,61 @@ public void testAllFilesPresentInDsl() { @Test @TestMetadata("arrow_bind_non_koin.kt") public void testArrow_bind_non_koin() { - runTest("koin-compiler-plugin/testData/box/dsl/arrow_bind_non_koin.kt"); + run("arrow_bind_non_koin.kt"); } @Test @TestMetadata("create_constructor.kt") public void testCreate_constructor() { - runTest("koin-compiler-plugin/testData/box/dsl/create_constructor.kt"); + run("create_constructor.kt"); } @Test @TestMetadata("factory_basic.kt") public void testFactory_basic() { - runTest("koin-compiler-plugin/testData/box/dsl/factory_basic.kt"); + run("factory_basic.kt"); } @Test @TestMetadata("hints_package_no_annotations.kt") public void testHints_package_no_annotations() { - runTest("koin-compiler-plugin/testData/box/dsl/hints_package_no_annotations.kt"); + run("hints_package_no_annotations.kt"); } @Test @TestMetadata("scoped_basic.kt") public void testScoped_basic() { - runTest("koin-compiler-plugin/testData/box/dsl/scoped_basic.kt"); + run("scoped_basic.kt"); } @Test @TestMetadata("single_basic.kt") public void testSingle_basic() { - runTest("koin-compiler-plugin/testData/box/dsl/single_basic.kt"); + run("single_basic.kt"); } @Test @TestMetadata("single_with_default_value.kt") public void testSingle_with_default_value() { - runTest("koin-compiler-plugin/testData/box/dsl/single_with_default_value.kt"); + run("single_with_default_value.kt"); } @Test @TestMetadata("single_with_dependency.kt") public void testSingle_with_dependency() { - runTest("koin-compiler-plugin/testData/box/dsl/single_with_dependency.kt"); + run("single_with_dependency.kt"); } @Test @TestMetadata("single_with_lazy.kt") public void testSingle_with_lazy() { - runTest("koin-compiler-plugin/testData/box/dsl/single_with_lazy.kt"); + run("single_with_lazy.kt"); } @Test @TestMetadata("single_with_nullable.kt") public void testSingle_with_nullable() { - runTest("koin-compiler-plugin/testData/box/dsl/single_with_nullable.kt"); + run("single_with_nullable.kt"); } } @@ -151,6 +167,10 @@ public void testSingle_with_nullable() { @TestMetadata("koin-compiler-plugin/testData/box/modules") @TestDataPath("$PROJECT_ROOT") public class Modules { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/box/modules/" + fileName); + } + @Test public void testAllFilesPresentInModules() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/box/modules"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -159,19 +179,19 @@ public void testAllFilesPresentInModules() { @Test @TestMetadata("component_scan_basic.kt") public void testComponent_scan_basic() { - runTest("koin-compiler-plugin/testData/box/modules/component_scan_basic.kt"); + run("component_scan_basic.kt"); } @Test @TestMetadata("module_extension.kt") public void testModule_extension() { - runTest("koin-compiler-plugin/testData/box/modules/module_extension.kt"); + run("module_extension.kt"); } @Test @TestMetadata("module_with_functions.kt") public void testModule_with_functions() { - runTest("koin-compiler-plugin/testData/box/modules/module_with_functions.kt"); + run("module_with_functions.kt"); } } @@ -179,6 +199,10 @@ public void testModule_with_functions() { @TestMetadata("koin-compiler-plugin/testData/box/monitor") @TestDataPath("$PROJECT_ROOT") public class Monitor { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/box/monitor/" + fileName); + } + @Test public void testAllFilesPresentInMonitor() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/box/monitor"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -187,13 +211,13 @@ public void testAllFilesPresentInMonitor() { @Test @TestMetadata("monitor_class.kt") public void testMonitor_class() { - runTest("koin-compiler-plugin/testData/box/monitor/monitor_class.kt"); + run("monitor_class.kt"); } @Test @TestMetadata("monitor_function.kt") public void testMonitor_function() { - runTest("koin-compiler-plugin/testData/box/monitor/monitor_function.kt"); + run("monitor_function.kt"); } } @@ -201,6 +225,10 @@ public void testMonitor_function() { @TestMetadata("koin-compiler-plugin/testData/box/params") @TestDataPath("$PROJECT_ROOT") public class Params { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/box/params/" + fileName); + } + @Test public void testAllFilesPresentInParams() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/box/params"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -209,19 +237,19 @@ public void testAllFilesPresentInParams() { @Test @TestMetadata("injected_param.kt") public void testInjected_param() { - runTest("koin-compiler-plugin/testData/box/params/injected_param.kt"); + run("injected_param.kt"); } @Test @TestMetadata("lazy_injection.kt") public void testLazy_injection() { - runTest("koin-compiler-plugin/testData/box/params/lazy_injection.kt"); + run("lazy_injection.kt"); } @Test @TestMetadata("property_basic.kt") public void testProperty_basic() { - runTest("koin-compiler-plugin/testData/box/params/property_basic.kt"); + run("property_basic.kt"); } } @@ -229,6 +257,10 @@ public void testProperty_basic() { @TestMetadata("koin-compiler-plugin/testData/box/qualifiers") @TestDataPath("$PROJECT_ROOT") public class Qualifiers { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/box/qualifiers/" + fileName); + } + @Test public void testAllFilesPresentInQualifiers() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/box/qualifiers"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -237,25 +269,25 @@ public void testAllFilesPresentInQualifiers() { @Test @TestMetadata("custom_qualifier_type.kt") public void testCustom_qualifier_type() { - runTest("koin-compiler-plugin/testData/box/qualifiers/custom_qualifier_type.kt"); + run("custom_qualifier_type.kt"); } @Test @TestMetadata("named_on_class.kt") public void testNamed_on_class() { - runTest("koin-compiler-plugin/testData/box/qualifiers/named_on_class.kt"); + run("named_on_class.kt"); } @Test @TestMetadata("named_on_parameter.kt") public void testNamed_on_parameter() { - runTest("koin-compiler-plugin/testData/box/qualifiers/named_on_parameter.kt"); + run("named_on_parameter.kt"); } @Test @TestMetadata("qualifier_type.kt") public void testQualifier_type() { - runTest("koin-compiler-plugin/testData/box/qualifiers/qualifier_type.kt"); + run("qualifier_type.kt"); } } @@ -263,6 +295,10 @@ public void testQualifier_type() { @TestMetadata("koin-compiler-plugin/testData/box/safety") @TestDataPath("$PROJECT_ROOT") public class Safety { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/box/safety/" + fileName); + } + @Test public void testAllFilesPresentInSafety() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/box/safety"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -271,193 +307,193 @@ public void testAllFilesPresentInSafety() { @Test @TestMetadata("callsite_hint_module_prefix.kt") public void testCallsite_hint_module_prefix() { - runTest("koin-compiler-plugin/testData/box/safety/callsite_hint_module_prefix.kt"); + run("callsite_hint_module_prefix.kt"); } @Test @TestMetadata("complete_graph.kt") public void testComplete_graph() { - runTest("koin-compiler-plugin/testData/box/safety/complete_graph.kt"); + run("complete_graph.kt"); } @Test @TestMetadata("configuration_group.kt") public void testConfiguration_group() { - runTest("koin-compiler-plugin/testData/box/safety/configuration_group.kt"); + run("configuration_group.kt"); } @Test @TestMetadata("default_value_ok.kt") public void testDefault_value_ok() { - runTest("koin-compiler-plugin/testData/box/safety/default_value_ok.kt"); + run("default_value_ok.kt"); } @Test @TestMetadata("dsl_create_function.kt") public void testDsl_create_function() { - runTest("koin-compiler-plugin/testData/box/safety/dsl_create_function.kt"); + run("dsl_create_function.kt"); } @Test @TestMetadata("dsl_injected_param_d006.kt") public void testDsl_injected_param_d006() { - runTest("koin-compiler-plugin/testData/box/safety/dsl_injected_param_d006.kt"); + run("dsl_injected_param_d006.kt"); } @Test @TestMetadata("dsl_module_includes.kt") public void testDsl_module_includes() { - runTest("koin-compiler-plugin/testData/box/safety/dsl_module_includes.kt"); + run("dsl_module_includes.kt"); } @Test @TestMetadata("dsl_nested_includes.kt") public void testDsl_nested_includes() { - runTest("koin-compiler-plugin/testData/box/safety/dsl_nested_includes.kt"); + run("dsl_nested_includes.kt"); } @Test @TestMetadata("dsl_transitive_includes.kt") public void testDsl_transitive_includes() { - runTest("koin-compiler-plugin/testData/box/safety/dsl_transitive_includes.kt"); + run("dsl_transitive_includes.kt"); } @Test @TestMetadata("generic_dsl_type_no_crash.kt") public void testGeneric_dsl_type_no_crash() { - runTest("koin-compiler-plugin/testData/box/safety/generic_dsl_type_no_crash.kt"); + run("generic_dsl_type_no_crash.kt"); } @Test @TestMetadata("injected_param_ok.kt") public void testInjected_param_ok() { - runTest("koin-compiler-plugin/testData/box/safety/injected_param_ok.kt"); + run("injected_param_ok.kt"); } @Test @TestMetadata("injected_param_unit_qualifier_collision.kt") public void testInjected_param_unit_qualifier_collision() { - runTest("koin-compiler-plugin/testData/box/safety/injected_param_unit_qualifier_collision.kt"); + run("injected_param_unit_qualifier_collision.kt"); } @Test @TestMetadata("lazy_valid.kt") public void testLazy_valid() { - runTest("koin-compiler-plugin/testData/box/safety/lazy_valid.kt"); + run("lazy_valid.kt"); } @Test @TestMetadata("list_ok.kt") public void testList_ok() { - runTest("koin-compiler-plugin/testData/box/safety/list_ok.kt"); + run("list_ok.kt"); } @Test @TestMetadata("module_includes_chain.kt") public void testModule_includes_chain() { - runTest("koin-compiler-plugin/testData/box/safety/module_includes_chain.kt"); + run("module_includes_chain.kt"); } @Test @TestMetadata("module_includes_visible.kt") public void testModule_includes_visible() { - runTest("koin-compiler-plugin/testData/box/safety/module_includes_visible.kt"); + run("module_includes_visible.kt"); } @Test @TestMetadata("nullable_ok.kt") public void testNullable_ok() { - runTest("koin-compiler-plugin/testData/box/safety/nullable_ok.kt"); + run("nullable_ok.kt"); } @Test @TestMetadata("property_value_ok.kt") public void testProperty_value_ok() { - runTest("koin-compiler-plugin/testData/box/safety/property_value_ok.kt"); + run("property_value_ok.kt"); } @Test @TestMetadata("provided_param_dsl_ok.kt") public void testProvided_param_dsl_ok() { - runTest("koin-compiler-plugin/testData/box/safety/provided_param_dsl_ok.kt"); + run("provided_param_dsl_ok.kt"); } @Test @TestMetadata("provided_param_ok.kt") public void testProvided_param_ok() { - runTest("koin-compiler-plugin/testData/box/safety/provided_param_ok.kt"); + run("provided_param_ok.kt"); } @Test @TestMetadata("provided_type_ok.kt") public void testProvided_type_ok() { - runTest("koin-compiler-plugin/testData/box/safety/provided_type_ok.kt"); + run("provided_type_ok.kt"); } @Test @TestMetadata("qualified_function_cross_module.kt") public void testQualified_function_cross_module() { - runTest("koin-compiler-plugin/testData/box/safety/qualified_function_cross_module.kt"); + run("qualified_function_cross_module.kt"); } @Test @TestMetadata("qualifier_cross_module.kt") public void testQualifier_cross_module() { - runTest("koin-compiler-plugin/testData/box/safety/qualifier_cross_module.kt"); + run("qualifier_cross_module.kt"); } @Test @TestMetadata("qualifier_cross_module_type.kt") public void testQualifier_cross_module_type() { - runTest("koin-compiler-plugin/testData/box/safety/qualifier_cross_module_type.kt"); + run("qualifier_cross_module_type.kt"); } @Test @TestMetadata("qualifier_dotted_name.kt") public void testQualifier_dotted_name() { - runTest("koin-compiler-plugin/testData/box/safety/qualifier_dotted_name.kt"); + run("qualifier_dotted_name.kt"); } @Test @TestMetadata("qualifier_match.kt") public void testQualifier_match() { - runTest("koin-compiler-plugin/testData/box/safety/qualifier_match.kt"); + run("qualifier_match.kt"); } @Test @TestMetadata("scope_id_ok.kt") public void testScope_id_ok() { - runTest("koin-compiler-plugin/testData/box/safety/scope_id_ok.kt"); + run("scope_id_ok.kt"); } @Test @TestMetadata("scope_param_dsl_ok.kt") public void testScope_param_dsl_ok() { - runTest("koin-compiler-plugin/testData/box/safety/scope_param_dsl_ok.kt"); + run("scope_param_dsl_ok.kt"); } @Test @TestMetadata("scope_param_ok.kt") public void testScope_param_ok() { - runTest("koin-compiler-plugin/testData/box/safety/scope_param_ok.kt"); + run("scope_param_ok.kt"); } @Test @TestMetadata("scoped_visibility.kt") public void testScoped_visibility() { - runTest("koin-compiler-plugin/testData/box/safety/scoped_visibility.kt"); + run("scoped_visibility.kt"); } @Test @TestMetadata("startkoin_full_graph.kt") public void testStartkoin_full_graph() { - runTest("koin-compiler-plugin/testData/box/safety/startkoin_full_graph.kt"); + run("startkoin_full_graph.kt"); } @Test @TestMetadata("toplevel_function_ok.kt") public void testToplevel_function_ok() { - runTest("koin-compiler-plugin/testData/box/safety/toplevel_function_ok.kt"); + run("toplevel_function_ok.kt"); } } @@ -465,6 +501,10 @@ public void testToplevel_function_ok() { @TestMetadata("koin-compiler-plugin/testData/box/scopes") @TestDataPath("$PROJECT_ROOT") public class Scopes { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/box/scopes/" + fileName); + } + @Test public void testAllFilesPresentInScopes() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/box/scopes"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -473,19 +513,19 @@ public void testAllFilesPresentInScopes() { @Test @TestMetadata("scope_class.kt") public void testScope_class() { - runTest("koin-compiler-plugin/testData/box/scopes/scope_class.kt"); + run("scope_class.kt"); } @Test @TestMetadata("scope_id_param_name.kt") public void testScope_id_param_name() { - runTest("koin-compiler-plugin/testData/box/scopes/scope_id_param_name.kt"); + run("scope_id_param_name.kt"); } @Test @TestMetadata("scope_name.kt") public void testScope_name() { - runTest("koin-compiler-plugin/testData/box/scopes/scope_name.kt"); + run("scope_name.kt"); } } @@ -493,6 +533,10 @@ public void testScope_name() { @TestMetadata("koin-compiler-plugin/testData/box/startkoin") @TestDataPath("$PROJECT_ROOT") public class Startkoin { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/box/startkoin/" + fileName); + } + @Test public void testAllFilesPresentInStartkoin() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/box/startkoin"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -501,31 +545,31 @@ public void testAllFilesPresentInStartkoin() { @Test @TestMetadata("configuration_discovery.kt") public void testConfiguration_discovery() { - runTest("koin-compiler-plugin/testData/box/startkoin/configuration_discovery.kt"); + run("configuration_discovery.kt"); } @Test @TestMetadata("explicit_modules_override_configuration.kt") public void testExplicit_modules_override_configuration() { - runTest("koin-compiler-plugin/testData/box/startkoin/explicit_modules_override_configuration.kt"); + run("explicit_modules_override_configuration.kt"); } @Test @TestMetadata("koin_application.kt") public void testKoin_application() { - runTest("koin-compiler-plugin/testData/box/startkoin/koin_application.kt"); + run("koin_application.kt"); } @Test @TestMetadata("multiple_modules.kt") public void testMultiple_modules() { - runTest("koin-compiler-plugin/testData/box/startkoin/multiple_modules.kt"); + run("multiple_modules.kt"); } @Test @TestMetadata("startkoin_basic.kt") public void testStartkoin_basic() { - runTest("koin-compiler-plugin/testData/box/startkoin/startkoin_basic.kt"); + run("startkoin_basic.kt"); } } @@ -533,6 +577,10 @@ public void testStartkoin_basic() { @TestMetadata("koin-compiler-plugin/testData/box/toplevel") @TestDataPath("$PROJECT_ROOT") public class Toplevel { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/box/toplevel/" + fileName); + } + @Test public void testAllFilesPresentInToplevel() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/box/toplevel"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -541,13 +589,13 @@ public void testAllFilesPresentInToplevel() { @Test @TestMetadata("qualified_unit_singletons.kt") public void testQualified_unit_singletons() { - runTest("koin-compiler-plugin/testData/box/toplevel/qualified_unit_singletons.kt"); + run("qualified_unit_singletons.kt"); } @Test @TestMetadata("singleton_function.kt") public void testSingleton_function() { - runTest("koin-compiler-plugin/testData/box/toplevel/singleton_function.kt"); + run("singleton_function.kt"); } } } diff --git a/koin-compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java b/koin-compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java index a5d3e8f..668e787 100644 --- a/koin-compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java +++ b/koin-compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java @@ -15,6 +15,10 @@ @TestMetadata("koin-compiler-plugin/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") public class JvmDiagnosticTestGenerated extends AbstractJvmDiagnosticTest { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/diagnostics/" + fileName); + } + @Test public void testAllFilesPresentInDiagnostics() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -23,138 +27,138 @@ public void testAllFilesPresentInDiagnostics() { @Test @TestMetadata("call_site_param_arity_mismatch.kt") public void testCall_site_param_arity_mismatch() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_arity_mismatch.kt"); + run("call_site_param_arity_mismatch.kt"); } @Test @TestMetadata("call_site_param_dsl_missing_d006.kt") public void testCall_site_param_dsl_missing_d006() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_dsl_missing_d006.kt"); + run("call_site_param_dsl_missing_d006.kt"); } @Test @TestMetadata("call_site_param_missing_d006.kt") public void testCall_site_param_missing_d006() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_missing_d006.kt"); + run("call_site_param_missing_d006.kt"); } @Test @TestMetadata("call_site_param_no_injected_no_d006.kt") public void testCall_site_param_no_injected_no_d006() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_no_injected_no_d006.kt"); + run("call_site_param_no_injected_no_d006.kt"); } @Test @TestMetadata("call_site_param_nullable_ok.kt") public void testCall_site_param_nullable_ok() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_nullable_ok.kt"); + run("call_site_param_nullable_ok.kt"); } @Test @TestMetadata("call_site_param_ok.kt") public void testCall_site_param_ok() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_ok.kt"); + run("call_site_param_ok.kt"); } @Test @TestMetadata("call_site_param_type_mismatch.kt") public void testCall_site_param_type_mismatch() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_type_mismatch.kt"); + run("call_site_param_type_mismatch.kt"); } @Test @TestMetadata("circular_dependency_broken_by_lazy.kt") public void testCircular_dependency_broken_by_lazy() { - runTest("koin-compiler-plugin/testData/diagnostics/circular_dependency_broken_by_lazy.kt"); + run("circular_dependency_broken_by_lazy.kt"); } @Test @TestMetadata("circular_dependency_direct.kt") public void testCircular_dependency_direct() { - runTest("koin-compiler-plugin/testData/diagnostics/circular_dependency_direct.kt"); + run("circular_dependency_direct.kt"); } @Test @TestMetadata("circular_dependency_transitive.kt") public void testCircular_dependency_transitive() { - runTest("koin-compiler-plugin/testData/diagnostics/circular_dependency_transitive.kt"); + run("circular_dependency_transitive.kt"); } @Test @TestMetadata("configuration_label_mismatch.kt") public void testConfiguration_label_mismatch() { - runTest("koin-compiler-plugin/testData/diagnostics/configuration_label_mismatch.kt"); + run("configuration_label_mismatch.kt"); } @Test @TestMetadata("dsl_module_not_loaded.kt") public void testDsl_module_not_loaded() { - runTest("koin-compiler-plugin/testData/diagnostics/dsl_module_not_loaded.kt"); + run("dsl_module_not_loaded.kt"); } @Test @TestMetadata("dsl_module_unreachable.kt") public void testDsl_module_unreachable() { - runTest("koin-compiler-plugin/testData/diagnostics/dsl_module_unreachable.kt"); + run("dsl_module_unreachable.kt"); } @Test @TestMetadata("factory_suspend_fun_interface_d007.kt") public void testFactory_suspend_fun_interface_d007() { - runTest("koin-compiler-plugin/testData/diagnostics/factory_suspend_fun_interface_d007.kt"); + run("factory_suspend_fun_interface_d007.kt"); } @Test @TestMetadata("koin_configuration_modules_a3.kt") public void testKoin_configuration_modules_a3() { - runTest("koin-compiler-plugin/testData/diagnostics/koin_configuration_modules_a3.kt"); + run("koin_configuration_modules_a3.kt"); } @Test @TestMetadata("lazy_missing.kt") public void testLazy_missing() { - runTest("koin-compiler-plugin/testData/diagnostics/lazy_missing.kt"); + run("lazy_missing.kt"); } @Test @TestMetadata("missing_dependency.kt") public void testMissing_dependency() { - runTest("koin-compiler-plugin/testData/diagnostics/missing_dependency.kt"); + run("missing_dependency.kt"); } @Test @TestMetadata("missing_viewmodel_artifact.kt") public void testMissing_viewmodel_artifact() { - runTest("koin-compiler-plugin/testData/diagnostics/missing_viewmodel_artifact.kt"); + run("missing_viewmodel_artifact.kt"); } @Test @TestMetadata("missing_worker_artifact.kt") public void testMissing_worker_artifact() { - runTest("koin-compiler-plugin/testData/diagnostics/missing_worker_artifact.kt"); + run("missing_worker_artifact.kt"); } @Test @TestMetadata("provided_missing.kt") public void testProvided_missing() { - runTest("koin-compiler-plugin/testData/diagnostics/provided_missing.kt"); + run("provided_missing.kt"); } @Test @TestMetadata("qualifier_mismatch.kt") public void testQualifier_mismatch() { - runTest("koin-compiler-plugin/testData/diagnostics/qualifier_mismatch.kt"); + run("qualifier_mismatch.kt"); } @Test @TestMetadata("scoped_cross_scope.kt") public void testScoped_cross_scope() { - runTest("koin-compiler-plugin/testData/diagnostics/scoped_cross_scope.kt"); + run("scoped_cross_scope.kt"); } @Test @TestMetadata("startkoin_missing.kt") public void testStartkoin_missing() { - runTest("koin-compiler-plugin/testData/diagnostics/startkoin_missing.kt"); + run("startkoin_missing.kt"); } } diff --git a/koin-compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmErrorMessageTestGenerated.java b/koin-compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmErrorMessageTestGenerated.java index d11cd89..1baaaa4 100644 --- a/koin-compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmErrorMessageTestGenerated.java +++ b/koin-compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmErrorMessageTestGenerated.java @@ -15,6 +15,10 @@ @TestMetadata("koin-compiler-plugin/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") public class JvmErrorMessageTestGenerated extends AbstractJvmErrorMessageTest { + private void run(String fileName) { + runTest("koin-compiler-plugin/testData/diagnostics/" + fileName); + } + @Test public void testAllFilesPresentInDiagnostics() { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("koin-compiler-plugin/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, true); @@ -23,138 +27,138 @@ public void testAllFilesPresentInDiagnostics() { @Test @TestMetadata("call_site_param_arity_mismatch.kt") public void testCall_site_param_arity_mismatch() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_arity_mismatch.kt"); + run("call_site_param_arity_mismatch.kt"); } @Test @TestMetadata("call_site_param_dsl_missing_d006.kt") public void testCall_site_param_dsl_missing_d006() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_dsl_missing_d006.kt"); + run("call_site_param_dsl_missing_d006.kt"); } @Test @TestMetadata("call_site_param_missing_d006.kt") public void testCall_site_param_missing_d006() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_missing_d006.kt"); + run("call_site_param_missing_d006.kt"); } @Test @TestMetadata("call_site_param_no_injected_no_d006.kt") public void testCall_site_param_no_injected_no_d006() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_no_injected_no_d006.kt"); + run("call_site_param_no_injected_no_d006.kt"); } @Test @TestMetadata("call_site_param_nullable_ok.kt") public void testCall_site_param_nullable_ok() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_nullable_ok.kt"); + run("call_site_param_nullable_ok.kt"); } @Test @TestMetadata("call_site_param_ok.kt") public void testCall_site_param_ok() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_ok.kt"); + run("call_site_param_ok.kt"); } @Test @TestMetadata("call_site_param_type_mismatch.kt") public void testCall_site_param_type_mismatch() { - runTest("koin-compiler-plugin/testData/diagnostics/call_site_param_type_mismatch.kt"); + run("call_site_param_type_mismatch.kt"); } @Test @TestMetadata("circular_dependency_broken_by_lazy.kt") public void testCircular_dependency_broken_by_lazy() { - runTest("koin-compiler-plugin/testData/diagnostics/circular_dependency_broken_by_lazy.kt"); + run("circular_dependency_broken_by_lazy.kt"); } @Test @TestMetadata("circular_dependency_direct.kt") public void testCircular_dependency_direct() { - runTest("koin-compiler-plugin/testData/diagnostics/circular_dependency_direct.kt"); + run("circular_dependency_direct.kt"); } @Test @TestMetadata("circular_dependency_transitive.kt") public void testCircular_dependency_transitive() { - runTest("koin-compiler-plugin/testData/diagnostics/circular_dependency_transitive.kt"); + run("circular_dependency_transitive.kt"); } @Test @TestMetadata("configuration_label_mismatch.kt") public void testConfiguration_label_mismatch() { - runTest("koin-compiler-plugin/testData/diagnostics/configuration_label_mismatch.kt"); + run("configuration_label_mismatch.kt"); } @Test @TestMetadata("dsl_module_not_loaded.kt") public void testDsl_module_not_loaded() { - runTest("koin-compiler-plugin/testData/diagnostics/dsl_module_not_loaded.kt"); + run("dsl_module_not_loaded.kt"); } @Test @TestMetadata("dsl_module_unreachable.kt") public void testDsl_module_unreachable() { - runTest("koin-compiler-plugin/testData/diagnostics/dsl_module_unreachable.kt"); + run("dsl_module_unreachable.kt"); } @Test @TestMetadata("factory_suspend_fun_interface_d007.kt") public void testFactory_suspend_fun_interface_d007() { - runTest("koin-compiler-plugin/testData/diagnostics/factory_suspend_fun_interface_d007.kt"); + run("factory_suspend_fun_interface_d007.kt"); } @Test @TestMetadata("koin_configuration_modules_a3.kt") public void testKoin_configuration_modules_a3() { - runTest("koin-compiler-plugin/testData/diagnostics/koin_configuration_modules_a3.kt"); + run("koin_configuration_modules_a3.kt"); } @Test @TestMetadata("lazy_missing.kt") public void testLazy_missing() { - runTest("koin-compiler-plugin/testData/diagnostics/lazy_missing.kt"); + run("lazy_missing.kt"); } @Test @TestMetadata("missing_dependency.kt") public void testMissing_dependency() { - runTest("koin-compiler-plugin/testData/diagnostics/missing_dependency.kt"); + run("missing_dependency.kt"); } @Test @TestMetadata("missing_viewmodel_artifact.kt") public void testMissing_viewmodel_artifact() { - runTest("koin-compiler-plugin/testData/diagnostics/missing_viewmodel_artifact.kt"); + run("missing_viewmodel_artifact.kt"); } @Test @TestMetadata("missing_worker_artifact.kt") public void testMissing_worker_artifact() { - runTest("koin-compiler-plugin/testData/diagnostics/missing_worker_artifact.kt"); + run("missing_worker_artifact.kt"); } @Test @TestMetadata("provided_missing.kt") public void testProvided_missing() { - runTest("koin-compiler-plugin/testData/diagnostics/provided_missing.kt"); + run("provided_missing.kt"); } @Test @TestMetadata("qualifier_mismatch.kt") public void testQualifier_mismatch() { - runTest("koin-compiler-plugin/testData/diagnostics/qualifier_mismatch.kt"); + run("qualifier_mismatch.kt"); } @Test @TestMetadata("scoped_cross_scope.kt") public void testScoped_cross_scope() { - runTest("koin-compiler-plugin/testData/diagnostics/scoped_cross_scope.kt"); + run("scoped_cross_scope.kt"); } @Test @TestMetadata("startkoin_missing.kt") public void testStartkoin_missing() { - runTest("koin-compiler-plugin/testData/diagnostics/startkoin_missing.kt"); + run("startkoin_missing.kt"); } } diff --git a/koin-compiler-plugin/testData/box/annotations/factory_class.fir.ir.txt b/koin-compiler-plugin/testData/box/annotations/factory_class.fir.ir.txt index 0601822..8a0094f 100644 --- a/koin-compiler-plugin/testData/box/annotations/factory_class.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/annotations/factory_class.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_factory visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.MyFactory annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:MyFactory modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/annotations/module_created_at_start.fir.ir.txt b/koin-compiler-plugin/testData/box/annotations/module_created_at_start.fir.ir.txt index daefbbb..a8c3ec2 100644 --- a/koin-compiler-plugin/testData/box/annotations/module_created_at_start.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/annotations/module_created_at_start.fir.ir.txt @@ -2,12 +2,12 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.EagerService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.LazyService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:EagerService modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/annotations/module_created_at_start.fir.txt b/koin-compiler-plugin/testData/box/annotations/module_created_at_start.fir.txt index 9c78e3f..76c7655 100644 --- a/koin-compiler-plugin/testData/box/annotations/module_created_at_start.fir.txt +++ b/koin-compiler-plugin/testData/box/annotations/module_created_at_start.fir.txt @@ -18,7 +18,7 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Singleton|(createdAtStart = Boolean(true)) public final class EagerService : R|kotlin/Any| { + @R|org/koin/core/annotation/Singleton|(createdAtStart = Boolean(true) [evaluated = Boolean(true)]) public final class EagerService : R|kotlin/Any| { public constructor(): R|EagerService| { super() } @@ -48,7 +48,7 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Module|(createdAtStart = Boolean(true)) @R|org/koin/core/annotation/ComponentScan|() public final class TestModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|(createdAtStart = Boolean(true) [evaluated = Boolean(true)]) @R|org/koin/core/annotation/ComponentScan|() public final class TestModule : R|kotlin/Any| { public constructor(): R|TestModule| { super() } diff --git a/koin-compiler-plugin/testData/box/annotations/singleton_class.fir.ir.txt b/koin-compiler-plugin/testData/box/annotations/singleton_class.fir.ir.txt index 05d6aad..025a3a6 100644 --- a/koin-compiler-plugin/testData/box/annotations/singleton_class.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/annotations/singleton_class.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.MySingleton annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:MySingleton modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/bindings/auto_interface_binding.fir.ir.txt b/koin-compiler-plugin/testData/box/bindings/auto_interface_binding.fir.ir.txt index 8141f83..0628ff6 100644 --- a/koin-compiler-plugin/testData/box/bindings/auto_interface_binding.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/bindings/auto_interface_binding.fir.ir.txt @@ -3,7 +3,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt VALUE_PARAMETER kind:Regular name:contributed index:0 type:.RepositoryImpl VALUE_PARAMETER kind:Regular name:binding0 index:1 type:.Repository annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:RepositoryImpl modality:FINAL visibility:public superTypes:[.Repository] diff --git a/koin-compiler-plugin/testData/box/bindings/delegation_no_autobind.fir.ir.txt b/koin-compiler-plugin/testData/box/bindings/delegation_no_autobind.fir.ir.txt index 8a727bd..fbbf6a6 100644 --- a/koin-compiler-plugin/testData/box/bindings/delegation_no_autobind.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/bindings/delegation_no_autobind.fir.ir.txt @@ -2,13 +2,13 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.DecoratedService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.RealService VALUE_PARAMETER kind:Regular name:binding0 index:1 type:.MyService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:DecoratedService modality:FINAL visibility:public superTypes:[.MyService] diff --git a/koin-compiler-plugin/testData/box/bindings/delegation_no_autobind.fir.txt b/koin-compiler-plugin/testData/box/bindings/delegation_no_autobind.fir.txt index 06ba88a..7ed64e9 100644 --- a/koin-compiler-plugin/testData/box/bindings/delegation_no_autobind.fir.txt +++ b/koin-compiler-plugin/testData/box/bindings/delegation_no_autobind.fir.txt @@ -13,7 +13,7 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Singleton|(binds = ()) public final class DecoratedService : R|MyService| { + @R|org/koin/core/annotation/Singleton|(binds = () [evaluated = ()]) public final class DecoratedService : R|MyService| { public constructor(delegate: R|MyService|): R|DecoratedService| { super() } diff --git a/koin-compiler-plugin/testData/box/bindings/provider_function_binds.fir.ir.txt b/koin-compiler-plugin/testData/box/bindings/provider_function_binds.fir.ir.txt index 876d137..030f7cb 100644 --- a/koin-compiler-plugin/testData/box/bindings/provider_function_binds.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/bindings/provider_function_binds.fir.ir.txt @@ -42,7 +42,7 @@ FILE fqName: fileName:/test.kt FUN name:provideRepository visibility:public modality:FINAL returnType:.RepositoryImpl VALUE_PARAMETER kind:DispatchReceiver name: index:0 type:.TestModule annotations: - Single(binds = [CLASS_REFERENCE 'CLASS INTERFACE name:Repository modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.Repository>] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>, createdAtStart = ) + Single(binds = [Repository::class] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>, createdAtStart = ) BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun provideRepository (): .RepositoryImpl declared in .TestModule' CONSTRUCTOR_CALL 'public constructor () declared in .RepositoryImpl' type=.RepositoryImpl origin=null @@ -135,7 +135,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/testModuleModul VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.RepositoryImpl VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:binding0 index:1 type:.Repository annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/bindings/provider_function_binds.fir.txt b/koin-compiler-plugin/testData/box/bindings/provider_function_binds.fir.txt index 9eff6f8..3cf6087 100644 --- a/koin-compiler-plugin/testData/box/bindings/provider_function_binds.fir.txt +++ b/koin-compiler-plugin/testData/box/bindings/provider_function_binds.fir.txt @@ -4,7 +4,7 @@ FILE: test.kt super() } - @R|org/koin/core/annotation/Single|(binds = ((Q|Repository|))) public final fun provideRepository(): R|RepositoryImpl| { + @R|org/koin/core/annotation/Single|(binds = ((Q|Repository|)) [evaluated = ((Q|Repository|))]) public final fun provideRepository(): R|RepositoryImpl| { ^provideRepository R|/RepositoryImpl.RepositoryImpl|() } diff --git a/koin-compiler-plugin/testData/box/dsl/arrow_bind_non_koin.fir.ir.txt b/koin-compiler-plugin/testData/box/dsl/arrow_bind_non_koin.fir.ir.txt index ccc0feb..4358e0f 100644 --- a/koin-compiler-plugin/testData/box/dsl/arrow_bind_non_koin.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/dsl/arrow_bind_non_koin.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/main__serviceDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Boxed modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/dsl/create_constructor.fir.ir.txt b/koin-compiler-plugin/testData/box/dsl/create_constructor.fir.ir.txt index 36b0c2b..9d34453 100644 --- a/koin-compiler-plugin/testData/box/dsl/create_constructor.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/dsl/create_constructor.fir.ir.txt @@ -2,13 +2,13 @@ FILE fqName:org.koin.plugin.hints fileName:/main__repositoryDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Repository annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/main__serviceDsl_scoped.kt FUN name:dsl_scoped visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Repository modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/dsl/factory_basic.fir.ir.txt b/koin-compiler-plugin/testData/box/dsl/factory_basic.fir.ir.txt index cf68ec6..b0b0c63 100644 --- a/koin-compiler-plugin/testData/box/dsl/factory_basic.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/dsl/factory_basic.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/main__myServiceDsl_factory.kt FUN name:dsl_factory visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.MyService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:MyService modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/dsl/hints_package_no_annotations.fir.ir.txt b/koin-compiler-plugin/testData/box/dsl/hints_package_no_annotations.fir.ir.txt index 9333c92..85a001b 100644 --- a/koin-compiler-plugin/testData/box/dsl/hints_package_no_annotations.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/dsl/hints_package_no_annotations.fir.ir.txt @@ -2,13 +2,13 @@ FILE fqName:org.koin.plugin.hints fileName:/main__repoDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Repo annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/main__serviceDsl_factory.kt FUN name:dsl_factory visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Repo modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/dsl/scoped_basic.fir.ir.txt b/koin-compiler-plugin/testData/box/dsl/scoped_basic.fir.ir.txt index 92d9a02..1a4ee5b 100644 --- a/koin-compiler-plugin/testData/box/dsl/scoped_basic.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/dsl/scoped_basic.fir.ir.txt @@ -2,13 +2,13 @@ FILE fqName:org.koin.plugin.hints fileName:/main__repositoryDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Repository annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/main__scopedServiceDsl_scoped.kt FUN name:dsl_scoped visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.ScopedService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Repository modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/dsl/single_basic.fir.ir.txt b/koin-compiler-plugin/testData/box/dsl/single_basic.fir.ir.txt index 9343b10..996a483 100644 --- a/koin-compiler-plugin/testData/box/dsl/single_basic.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/dsl/single_basic.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/main__myServiceDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.MyService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:MyService modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/dsl/single_with_default_value.fir.ir.txt b/koin-compiler-plugin/testData/box/dsl/single_with_default_value.fir.ir.txt index 0370d71..1f1c32d 100644 --- a/koin-compiler-plugin/testData/box/dsl/single_with_default_value.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/dsl/single_with_default_value.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/main__serviceWithDefaultDsl_single.k FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.ServiceWithDefault annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:ServiceWithDefault modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/dsl/single_with_dependency.fir.ir.txt b/koin-compiler-plugin/testData/box/dsl/single_with_dependency.fir.ir.txt index 7ae4cb8..a944010 100644 --- a/koin-compiler-plugin/testData/box/dsl/single_with_dependency.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/dsl/single_with_dependency.fir.ir.txt @@ -2,13 +2,13 @@ FILE fqName:org.koin.plugin.hints fileName:/main__repositoryDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Repository annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/main__serviceDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Repository modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/dsl/single_with_lazy.fir.ir.txt b/koin-compiler-plugin/testData/box/dsl/single_with_lazy.fir.ir.txt index bad9e5e..7bce7d2 100644 --- a/koin-compiler-plugin/testData/box/dsl/single_with_lazy.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/dsl/single_with_lazy.fir.ir.txt @@ -2,13 +2,13 @@ FILE fqName:org.koin.plugin.hints fileName:/main__consumerDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Consumer annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/main__heavyDepDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.HeavyDep annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Consumer modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/dsl/single_with_nullable.fir.ir.txt b/koin-compiler-plugin/testData/box/dsl/single_with_nullable.fir.ir.txt index 318f52e..e015f7d 100644 --- a/koin-compiler-plugin/testData/box/dsl/single_with_nullable.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/dsl/single_with_nullable.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/main__serviceDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:OptionalDependency modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/modules/component_scan_basic.fir.ir.txt b/koin-compiler-plugin/testData/box/modules/component_scan_basic.fir.ir.txt index f86ab50..c761c95 100644 --- a/koin-compiler-plugin/testData/box/modules/component_scan_basic.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/modules/component_scan_basic.fir.ir.txt @@ -2,12 +2,12 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testpkg_ScanModule.kt FUN name:componentscan_testpkg_ScanModule_factory visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:testpkg.ServiceB annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testpkg_ScanModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:testpkg.ServiceA annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:testpkg fileName:/test.kt CLASS CLASS name:ScanModule modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/modules/component_scan_basic.fir.txt b/koin-compiler-plugin/testData/box/modules/component_scan_basic.fir.txt index 06c6aae..110f0cf 100644 --- a/koin-compiler-plugin/testData/box/modules/component_scan_basic.fir.txt +++ b/koin-compiler-plugin/testData/box/modules/component_scan_basic.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class ScanModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class ScanModule : R|kotlin/Any| { public constructor(): R|testpkg/ScanModule| { super() } diff --git a/koin-compiler-plugin/testData/box/modules/module_extension.fir.ir.txt b/koin-compiler-plugin/testData/box/modules/module_extension.fir.ir.txt index 93b1080..2c57b99 100644 --- a/koin-compiler-plugin/testData/box/modules/module_extension.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/modules/module_extension.fir.ir.txt @@ -24,7 +24,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_appModule.kt FUN name:componentscan_appModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.AppService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:AppModule modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/modules/module_with_functions.fir.ir.txt b/koin-compiler-plugin/testData/box/modules/module_with_functions.fir.ir.txt index 07bedab..8ee8684 100644 --- a/koin-compiler-plugin/testData/box/modules/module_with_functions.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/modules/module_with_functions.fir.ir.txt @@ -235,14 +235,14 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/functionModuleM FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:moduledef_functionModule__provideRepository visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.Repository annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:moduledef_functionModule__provideService visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/params/injected_param.fir.ir.txt b/koin-compiler-plugin/testData/box/params/injected_param.fir.ir.txt index 81759ce..505d28d 100644 --- a/koin-compiler-plugin/testData/box/params/injected_param.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/params/injected_param.fir.ir.txt @@ -2,14 +2,14 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_factory visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.ServiceWithParam annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/main__injectedparams_ServiceWithParam.kt FUN name:injectedparams_ServiceWithParam visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:id index:0 type:kotlin.Int VALUE_PARAMETER kind:Regular name:name index:1 type:kotlin.String annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:ServiceWithParam modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/params/lazy_injection.fir.ir.txt b/koin-compiler-plugin/testData/box/params/lazy_injection.fir.ir.txt index 43bc868..6e8f35f 100644 --- a/koin-compiler-plugin/testData/box/params/lazy_injection.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/params/lazy_injection.fir.ir.txt @@ -2,12 +2,12 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Consumer annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.HeavyService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Consumer modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/params/property_basic.fir.ir.txt b/koin-compiler-plugin/testData/box/params/property_basic.fir.ir.txt index 195fccb..6bedc04 100644 --- a/koin-compiler-plugin/testData/box/params/property_basic.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/params/property_basic.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Config annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Config modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/params/property_basic.fir.txt b/koin-compiler-plugin/testData/box/params/property_basic.fir.txt index 1235c69..b44224f 100644 --- a/koin-compiler-plugin/testData/box/params/property_basic.fir.txt +++ b/koin-compiler-plugin/testData/box/params/property_basic.fir.txt @@ -6,7 +6,7 @@ FILE: test.kt } @R|org/koin/core/annotation/Singleton|() public final class Config : R|kotlin/Any| { - public constructor(@R|org/koin/core/annotation/Property|(value = String(server.host)) host: R|kotlin/String|, @R|org/koin/core/annotation/Property|(value = String(server.port)) port: R|kotlin/String|): R|Config| { + public constructor(@R|org/koin/core/annotation/Property|(value = String(server.host) [evaluated = String(server.host)]) host: R|kotlin/String|, @R|org/koin/core/annotation/Property|(value = String(server.port) [evaluated = String(server.port)]) port: R|kotlin/String|): R|Config| { super() } diff --git a/koin-compiler-plugin/testData/box/qualifiers/custom_qualifier_type.fir.ir.txt b/koin-compiler-plugin/testData/box/qualifiers/custom_qualifier_type.fir.ir.txt index 733f755..a266497 100644 --- a/koin-compiler-plugin/testData/box/qualifiers/custom_qualifier_type.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/qualifiers/custom_qualifier_type.fir.ir.txt @@ -2,25 +2,25 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.UrlConsumer annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscanfunc_testModule_single__q_AuthUrl visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:kotlin.String VALUE_PARAMETER kind:Regular name:qualifierType index:1 type:.AuthUrl annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscanfunc_testModule_single__q_BaseUrl visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:kotlin.String VALUE_PARAMETER kind:Regular name:qualifierType index:1 type:.BaseUrl annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscanfunc_testModule_single__roster visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:q_AuthUrl index:0 type:kotlin.Unit VALUE_PARAMETER kind:Regular name:q_BaseUrl index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS ANNOTATION_CLASS name:AuthUrl modality:OPEN visibility:public superTypes:[kotlin.Annotation] @@ -92,6 +92,8 @@ FILE fqName: fileName:/test.kt Singleton(binds = , createdAtStart = ) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:.UrlConsumer PROPERTY name:base visibility:public modality:FINAL [val] + annotations: + BaseUrl FIELD PROPERTY_BACKING_FIELD name:base type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'base: kotlin.String declared in .UrlConsumer.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER @@ -103,6 +105,8 @@ FILE fqName: fileName:/test.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:base type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .UrlConsumer declared in .UrlConsumer.' type=.UrlConsumer origin=null PROPERTY name:auth visibility:public modality:FINAL [val] + annotations: + AuthUrl FIELD PROPERTY_BACKING_FIELD name:auth type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'auth: kotlin.String declared in .UrlConsumer.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER @@ -283,7 +287,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/authUrlDefiniti FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:qualifier visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.AuthUrl annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" @@ -291,7 +295,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/baseUrlDefiniti FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:qualifier visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.BaseUrl annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/qualifiers/custom_qualifier_type.fir.txt b/koin-compiler-plugin/testData/box/qualifiers/custom_qualifier_type.fir.txt index be0fdcf..1cb3b22 100644 --- a/koin-compiler-plugin/testData/box/qualifiers/custom_qualifier_type.fir.txt +++ b/koin-compiler-plugin/testData/box/qualifiers/custom_qualifier_type.fir.txt @@ -28,10 +28,10 @@ FILE: test.kt super() } - public final val base: R|kotlin/String| = R|/base| + @R|BaseUrl|() public final val base: R|kotlin/String| = R|/base| public get(): R|kotlin/String| - public final val auth: R|kotlin/String| = R|/auth| + @R|AuthUrl|() public final val auth: R|kotlin/String| = R|/auth| public get(): R|kotlin/String| } diff --git a/koin-compiler-plugin/testData/box/qualifiers/named_on_class.fir.ir.txt b/koin-compiler-plugin/testData/box/qualifiers/named_on_class.fir.ir.txt index 5769a68..a01bc2f 100644 --- a/koin-compiler-plugin/testData/box/qualifiers/named_on_class.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/qualifiers/named_on_class.fir.ir.txt @@ -4,14 +4,14 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt VALUE_PARAMETER kind:Regular name:binding0 index:1 type:.Service VALUE_PARAMETER kind:Regular name:qualifier_prod index:2 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.TestService VALUE_PARAMETER kind:Regular name:binding0 index:1 type:.Service VALUE_PARAMETER kind:Regular name:qualifier_test index:2 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:ProdService modality:FINAL visibility:public superTypes:[.Service] diff --git a/koin-compiler-plugin/testData/box/qualifiers/named_on_class.fir.txt b/koin-compiler-plugin/testData/box/qualifiers/named_on_class.fir.txt index 0142fff..0ae8ab9 100644 --- a/koin-compiler-plugin/testData/box/qualifiers/named_on_class.fir.txt +++ b/koin-compiler-plugin/testData/box/qualifiers/named_on_class.fir.txt @@ -7,13 +7,13 @@ FILE: test.kt } public abstract interface Service : R|kotlin/Any| { } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(prod)) public final class ProdService : R|Service| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(prod) [evaluated = String(prod)]) public final class ProdService : R|Service| { public constructor(): R|ProdService| { super() } } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(test)) public final class TestService : R|Service| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(test) [evaluated = String(test)]) public final class TestService : R|Service| { public constructor(): R|TestService| { super() } diff --git a/koin-compiler-plugin/testData/box/qualifiers/named_on_parameter.fir.ir.txt b/koin-compiler-plugin/testData/box/qualifiers/named_on_parameter.fir.ir.txt index 7d717fe..8de8a56 100644 --- a/koin-compiler-plugin/testData/box/qualifiers/named_on_parameter.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/qualifiers/named_on_parameter.fir.ir.txt @@ -2,13 +2,13 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Consumer annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.SpecialDependency VALUE_PARAMETER kind:Regular name:qualifier_special index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Consumer modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/qualifiers/named_on_parameter.fir.txt b/koin-compiler-plugin/testData/box/qualifiers/named_on_parameter.fir.txt index 55d5c51..702edd9 100644 --- a/koin-compiler-plugin/testData/box/qualifiers/named_on_parameter.fir.txt +++ b/koin-compiler-plugin/testData/box/qualifiers/named_on_parameter.fir.txt @@ -5,14 +5,14 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(special)) public final class SpecialDependency : R|kotlin/Any| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(special) [evaluated = String(special)]) public final class SpecialDependency : R|kotlin/Any| { public constructor(): R|SpecialDependency| { super() } } @R|org/koin/core/annotation/Singleton|() public final class Consumer : R|kotlin/Any| { - public constructor(@R|org/koin/core/annotation/Named|(value = String(special)) dep: R|SpecialDependency|): R|Consumer| { + public constructor(@R|org/koin/core/annotation/Named|(value = String(special) [evaluated = String(special)]) dep: R|SpecialDependency|): R|Consumer| { super() } diff --git a/koin-compiler-plugin/testData/box/qualifiers/qualifier_type.fir.ir.txt b/koin-compiler-plugin/testData/box/qualifiers/qualifier_type.fir.ir.txt index b68baa3..fb66a86 100644 --- a/koin-compiler-plugin/testData/box/qualifiers/qualifier_type.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/qualifiers/qualifier_type.fir.ir.txt @@ -2,13 +2,13 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Consumer annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.QualifiedService VALUE_PARAMETER kind:Regular name:qualifierType index:1 type:.ProdQualifier annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Consumer modality:FINAL visibility:public superTypes:[kotlin.Any] @@ -29,7 +29,7 @@ FILE fqName: fileName:/test.kt CONSTRUCTOR visibility:public returnType:.Consumer [primary] VALUE_PARAMETER kind:Regular name:service index:0 type:.QualifiedService annotations: - Qualifier(value = CLASS_REFERENCE 'CLASS INTERFACE name:ProdQualifier modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.ProdQualifier>, name = ) + Qualifier(value = ProdQualifier::class, name = ) BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Consumer modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit @@ -49,7 +49,7 @@ FILE fqName: fileName:/test.kt CLASS CLASS name:QualifiedService modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: Singleton(binds = , createdAtStart = ) - Qualifier(value = CLASS_REFERENCE 'CLASS INTERFACE name:ProdQualifier modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.ProdQualifier>, name = ) + Qualifier(value = ProdQualifier::class, name = ) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:.QualifiedService CONSTRUCTOR visibility:public returnType:.QualifiedService [primary] BLOCK_BODY diff --git a/koin-compiler-plugin/testData/box/qualifiers/qualifier_type.fir.txt b/koin-compiler-plugin/testData/box/qualifiers/qualifier_type.fir.txt index a0166bc..b777a48 100644 --- a/koin-compiler-plugin/testData/box/qualifiers/qualifier_type.fir.txt +++ b/koin-compiler-plugin/testData/box/qualifiers/qualifier_type.fir.txt @@ -7,14 +7,14 @@ FILE: test.kt } public abstract interface ProdQualifier : R|kotlin/Any| { } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Qualifier|(value = (Q|ProdQualifier|)) public final class QualifiedService : R|kotlin/Any| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Qualifier|(value = (Q|ProdQualifier|) [evaluated = (Q|ProdQualifier|)]) public final class QualifiedService : R|kotlin/Any| { public constructor(): R|QualifiedService| { super() } } @R|org/koin/core/annotation/Singleton|() public final class Consumer : R|kotlin/Any| { - public constructor(@R|org/koin/core/annotation/Qualifier|(value = (Q|ProdQualifier|)) service: R|QualifiedService|): R|Consumer| { + public constructor(@R|org/koin/core/annotation/Qualifier|(value = (Q|ProdQualifier|) [evaluated = (Q|ProdQualifier|)]) service: R|QualifiedService|): R|Consumer| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/callsite_hint_module_prefix.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/callsite_hint_module_prefix.fir.ir.txt index 66aa600..cc36579 100644 --- a/koin-compiler-plugin/testData/box/safety/callsite_hint_module_prefix.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/callsite_hint_module_prefix.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/main__myService_callsite.kt FUN name:callsite visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:required index:0 type:.MyService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:LibraryConsumer modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/complete_graph.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/complete_graph.fir.ir.txt index f65ba40..b4de0a3 100644 --- a/koin-compiler-plugin/testData/box/safety/complete_graph.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/complete_graph.fir.ir.txt @@ -2,17 +2,17 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_factory visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Presenter annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Repository annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Presenter modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/configuration_group.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/configuration_group.fir.ir.txt index 682672f..27f7e64 100644 --- a/koin-compiler-plugin/testData/box/safety/configuration_group.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/configuration_group.fir.ir.txt @@ -93,13 +93,13 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_coreModule.kt FUN name:componentscan_coreModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:core.Repository annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/koin_hints_serviceModule.kt FUN name:componentscan_serviceModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:service.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:service fileName:/service/Service.kt CLASS CLASS name:Service modality:FINAL visibility:public superTypes:[kotlin.Any] @@ -200,7 +200,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/coreModuleModul FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.CoreModule annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" @@ -208,7 +208,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/serviceModuleMo FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.ServiceModule annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/safety/configuration_group.fir.txt b/koin-compiler-plugin/testData/box/safety/configuration_group.fir.txt index 05272d3..92ae763 100644 --- a/koin-compiler-plugin/testData/box/safety/configuration_group.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/configuration_group.fir.txt @@ -20,13 +20,13 @@ FILE: Service.kt } FILE: modules.kt - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(core))) @R|org/koin/core/annotation/Configuration|() public final class CoreModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(core)) [evaluated = vararg(String(core))]) @R|org/koin/core/annotation/Configuration|() public final class CoreModule : R|kotlin/Any| { public constructor(): R|CoreModule| { super() } } - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(service))) @R|org/koin/core/annotation/Configuration|() public final class ServiceModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(service)) [evaluated = vararg(String(service))]) @R|org/koin/core/annotation/Configuration|() public final class ServiceModule : R|kotlin/Any| { public constructor(): R|ServiceModule| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/default_value_ok.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/default_value_ok.fir.ir.txt index 8f51467..73fcf50 100644 --- a/koin-compiler-plugin/testData/box/safety/default_value_ok.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/default_value_ok.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Service modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/dsl_create_function.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/dsl_create_function.fir.ir.txt index 81abb6f..6f95acd 100644 --- a/koin-compiler-plugin/testData/box/safety/dsl_create_function.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/dsl_create_function.fir.ir.txt @@ -4,14 +4,14 @@ FILE fqName:org.koin.plugin.hints fileName:/main__configDsl_single.kt VALUE_PARAMETER kind:Regular name:module_appModule index:1 type:kotlin.Unit VALUE_PARAMETER kind:Regular name:providerOnly index:2 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/main__serviceDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service VALUE_PARAMETER kind:Regular name:module_appModule index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt PROPERTY name:appModule visibility:public modality:FINAL [val] diff --git a/koin-compiler-plugin/testData/box/safety/dsl_injected_param_d006.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/dsl_injected_param_d006.fir.ir.txt index 501a876..ec0a354 100644 --- a/koin-compiler-plugin/testData/box/safety/dsl_injected_param_d006.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/dsl_injected_param_d006.fir.ir.txt @@ -3,13 +3,13 @@ FILE fqName:org.koin.plugin.hints fileName:/main__greeterDsl_factory.kt VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Greeter VALUE_PARAMETER kind:Regular name:module_myModule index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/main__injectedparams_Greeter.kt FUN name:injectedparams_Greeter visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:name index:0 type:kotlin.String annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt PROPERTY name:myModule visibility:public modality:FINAL [val] diff --git a/koin-compiler-plugin/testData/box/safety/dsl_module_includes.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/dsl_module_includes.fir.ir.txt index c3cac88..47847f0 100644 --- a/koin-compiler-plugin/testData/box/safety/dsl_module_includes.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/dsl_module_includes.fir.ir.txt @@ -3,14 +3,14 @@ FILE fqName:org.koin.plugin.hints fileName:/main__repositoryDsl_single.kt VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Repository VALUE_PARAMETER kind:Regular name:module_coreModule index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/main__serviceDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service VALUE_PARAMETER kind:Regular name:module_appModule index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt PROPERTY name:coreModule visibility:public modality:FINAL [val] diff --git a/koin-compiler-plugin/testData/box/safety/dsl_nested_includes.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/dsl_nested_includes.fir.ir.txt index 08bd6e4..c70a055 100644 --- a/koin-compiler-plugin/testData/box/safety/dsl_nested_includes.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/dsl_nested_includes.fir.ir.txt @@ -3,7 +3,7 @@ FILE fqName:org.koin.plugin.hints fileName:/main__databaseDsl_single.kt VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Database VALUE_PARAMETER kind:Regular name:module_dbModule index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt PROPERTY name:dbModule visibility:public modality:FINAL [val] diff --git a/koin-compiler-plugin/testData/box/safety/dsl_transitive_includes.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/dsl_transitive_includes.fir.ir.txt index 2c65fbd..67f8e39 100644 --- a/koin-compiler-plugin/testData/box/safety/dsl_transitive_includes.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/dsl_transitive_includes.fir.ir.txt @@ -3,21 +3,21 @@ FILE fqName:org.koin.plugin.hints fileName:/main__databaseDsl_single.kt VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Database VALUE_PARAMETER kind:Regular name:module_dbModule index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/main__repositoryDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Repository VALUE_PARAMETER kind:Regular name:module_dataModule index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/main__serviceDsl_single.kt FUN name:dsl_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service VALUE_PARAMETER kind:Regular name:module_appModule index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt PROPERTY name:dbModule visibility:public modality:FINAL [val] diff --git a/koin-compiler-plugin/testData/box/safety/generic_dsl_type_no_crash.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/generic_dsl_type_no_crash.fir.ir.txt index 370a09e..4db13f9 100644 --- a/koin-compiler-plugin/testData/box/safety/generic_dsl_type_no_crash.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/generic_dsl_type_no_crash.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/main__navigator_callsite.kt FUN name:callsite visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:required index:0 type:.Navigator annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:AppKey modality:FINAL visibility:public superTypes:[.Key] diff --git a/koin-compiler-plugin/testData/box/safety/injected_param_ok.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/injected_param_ok.fir.ir.txt index 547c448..2e6e23c 100644 --- a/koin-compiler-plugin/testData/box/safety/injected_param_ok.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/injected_param_ok.fir.ir.txt @@ -2,13 +2,13 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_factory visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Greeter annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/main__injectedparams_Greeter.kt FUN name:injectedparams_Greeter visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:name index:0 type:kotlin.String annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Greeter modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/injected_param_unit_qualifier_collision.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/injected_param_unit_qualifier_collision.fir.ir.txt index b4e071d..3b267a7 100644 --- a/koin-compiler-plugin/testData/box/safety/injected_param_unit_qualifier_collision.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/injected_param_unit_qualifier_collision.fir.ir.txt @@ -42,19 +42,19 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_launchersModule.kt VALUE_PARAMETER kind:Regular name:contributed index:0 type:kotlin.Unit VALUE_PARAMETER kind:Regular name:qualifier_initNoParam index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscanfunc_launchersModule_single__q_initWithParam visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:kotlin.Unit VALUE_PARAMETER kind:Regular name:qualifier_initWithParam index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscanfunc_launchersModule_single__roster visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:q_initNoParam index:0 type:kotlin.Unit VALUE_PARAMETER kind:Regular name:q_initWithParam index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:LaunchersModule modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/injected_param_unit_qualifier_collision.fir.txt b/koin-compiler-plugin/testData/box/safety/injected_param_unit_qualifier_collision.fir.txt index 22275d5..ff8f58a 100644 --- a/koin-compiler-plugin/testData/box/safety/injected_param_unit_qualifier_collision.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/injected_param_unit_qualifier_collision.fir.txt @@ -5,10 +5,10 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Named|(value = String(initWithParam)) @R|org/koin/core/annotation/Singleton|() public final fun initWithParam(@R|org/koin/core/annotation/InjectedParam|() tag: R|kotlin/String|): R|kotlin/Unit| { + @R|org/koin/core/annotation/Named|(value = String(initWithParam) [evaluated = String(initWithParam)]) @R|org/koin/core/annotation/Singleton|() public final fun initWithParam(@R|org/koin/core/annotation/InjectedParam|() tag: R|kotlin/String|): R|kotlin/Unit| { R|kotlin/check|(==(R|/tag|, String(x))) } - @R|org/koin/core/annotation/Named|(value = String(initNoParam)) @R|org/koin/core/annotation/Singleton|() public final fun initNoParam(): R|kotlin/Unit| { + @R|org/koin/core/annotation/Named|(value = String(initNoParam) [evaluated = String(initNoParam)]) @R|org/koin/core/annotation/Singleton|() public final fun initNoParam(): R|kotlin/Unit| { } public final fun box(): R|kotlin/String| { lval koin: R|org/koin/core/Koin| = R|org/koin/dsl/koinApplication|( = koinApplication@fun R|org/koin/core/KoinApplication|.(): R|kotlin/Unit| { diff --git a/koin-compiler-plugin/testData/box/safety/lazy_valid.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/lazy_valid.fir.ir.txt index deca0f6..f846c50 100644 --- a/koin-compiler-plugin/testData/box/safety/lazy_valid.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/lazy_valid.fir.ir.txt @@ -2,12 +2,12 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Consumer annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.HeavyService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Consumer modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/list_ok.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/list_ok.fir.ir.txt index 7a4eba4..ea8fdb0 100644 --- a/koin-compiler-plugin/testData/box/safety/list_ok.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/list_ok.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.PluginManager annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:PluginManager modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/module_includes_chain.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/module_includes_chain.fir.ir.txt index 775a5b9..276bc65 100644 --- a/koin-compiler-plugin/testData/box/safety/module_includes_chain.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/module_includes_chain.fir.ir.txt @@ -88,7 +88,7 @@ FILE fqName: fileName:/infraModuleModule.kt FILE fqName: fileName:/test.kt CLASS CLASS name:AppModule modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - Module(includes = [CLASS_REFERENCE 'CLASS CLASS name:DataModule modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.DataModule>] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>, createdAtStart = ) + Module(includes = [DataModule::class] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>, createdAtStart = ) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:.AppModule CONSTRUCTOR visibility:public returnType:.AppModule [primary] BLOCK_BODY @@ -149,7 +149,7 @@ FILE fqName: fileName:/test.kt public open fun toString (): kotlin.String declared in kotlin.Any CLASS CLASS name:DataModule modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - Module(includes = [CLASS_REFERENCE 'CLASS CLASS name:InfraModule modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.InfraModule>] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>, createdAtStart = ) + Module(includes = [InfraModule::class] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>, createdAtStart = ) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:.DataModule CONSTRUCTOR visibility:public returnType:.DataModule [primary] BLOCK_BODY @@ -290,7 +290,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/appModuleModule FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:moduledef_appModule__provideService visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.AppService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" @@ -298,7 +298,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/dataModuleModul FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:moduledef_dataModule__provideRepo visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.Repository annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" @@ -306,7 +306,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/infraModuleModu FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:moduledef_infraModule__provideDb visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.Database annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/safety/module_includes_chain.fir.txt b/koin-compiler-plugin/testData/box/safety/module_includes_chain.fir.txt index 9df1746..6299509 100644 --- a/koin-compiler-plugin/testData/box/safety/module_includes_chain.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/module_includes_chain.fir.txt @@ -33,7 +33,7 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Module|(includes = ((Q|InfraModule|))) public final class DataModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|(includes = ((Q|InfraModule|)) [evaluated = ((Q|InfraModule|))]) public final class DataModule : R|kotlin/Any| { public constructor(): R|DataModule| { super() } @@ -43,7 +43,7 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Module|(includes = ((Q|DataModule|))) public final class AppModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|(includes = ((Q|DataModule|)) [evaluated = ((Q|DataModule|))]) public final class AppModule : R|kotlin/Any| { public constructor(): R|AppModule| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/module_includes_visible.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/module_includes_visible.fir.ir.txt index 1339417..456d4d5 100644 --- a/koin-compiler-plugin/testData/box/safety/module_includes_visible.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/module_includes_visible.fir.ir.txt @@ -56,7 +56,7 @@ FILE fqName: fileName:/infraModuleModule.kt FILE fqName: fileName:/test.kt CLASS CLASS name:AppModule modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - Module(includes = [CLASS_REFERENCE 'CLASS CLASS name:InfraModule modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.InfraModule>] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>, createdAtStart = ) + Module(includes = [InfraModule::class] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>, createdAtStart = ) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:.AppModule CONSTRUCTOR visibility:public returnType:.AppModule [primary] BLOCK_BODY @@ -196,7 +196,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/appModuleModule FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:moduledef_appModule__provideService visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.AppService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" @@ -204,7 +204,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/infraModuleModu FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:moduledef_infraModule__provideDatabase visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.Database annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/safety/module_includes_visible.fir.txt b/koin-compiler-plugin/testData/box/safety/module_includes_visible.fir.txt index 68e9c9a..f238059 100644 --- a/koin-compiler-plugin/testData/box/safety/module_includes_visible.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/module_includes_visible.fir.txt @@ -15,7 +15,7 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Module|(includes = ((Q|InfraModule|))) public final class AppModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|(includes = ((Q|InfraModule|)) [evaluated = ((Q|InfraModule|))]) public final class AppModule : R|kotlin/Any| { public constructor(): R|AppModule| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/nullable_ok.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/nullable_ok.fir.ir.txt index f4264f7..1c06413 100644 --- a/koin-compiler-plugin/testData/box/safety/nullable_ok.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/nullable_ok.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:MissingDep modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/property_value_ok.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/property_value_ok.fir.ir.txt index 7e4c6d5..57d546a 100644 --- a/koin-compiler-plugin/testData/box/safety/property_value_ok.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/property_value_ok.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_factory visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.ApiClient annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt PROPERTY name:defaultApiTimeout visibility:public modality:FINAL [val] diff --git a/koin-compiler-plugin/testData/box/safety/property_value_ok.fir.txt b/koin-compiler-plugin/testData/box/safety/property_value_ok.fir.txt index 57e5d7b..97c864b 100644 --- a/koin-compiler-plugin/testData/box/safety/property_value_ok.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/property_value_ok.fir.txt @@ -1,8 +1,8 @@ FILE: test.kt - field:@R|org/koin/core/annotation/PropertyValue|(value = String(api.timeout)) public final val defaultApiTimeout: R|kotlin/Int| = Int(30) + field:@R|org/koin/core/annotation/PropertyValue|(value = String(api.timeout) [evaluated = String(api.timeout)]) public final val defaultApiTimeout: R|kotlin/Int| = Int(30) public get(): R|kotlin/Int| @R|org/koin/core/annotation/Factory|() public final class ApiClient : R|kotlin/Any| { - public constructor(@R|org/koin/core/annotation/Property|(value = String(api.timeout)) timeout: R|kotlin/Int|): R|ApiClient| { + public constructor(@R|org/koin/core/annotation/Property|(value = String(api.timeout) [evaluated = String(api.timeout)]) timeout: R|kotlin/Int|): R|ApiClient| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/provided_param_dsl_ok.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/provided_param_dsl_ok.fir.ir.txt index 8a230b9..b7cc390 100644 --- a/koin-compiler-plugin/testData/box/safety/provided_param_dsl_ok.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/provided_param_dsl_ok.fir.ir.txt @@ -3,7 +3,7 @@ FILE fqName:org.koin.plugin.hints fileName:/main__serviceDsl_single.kt VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service VALUE_PARAMETER kind:Regular name:module_testModule index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt PROPERTY name:testModule visibility:public modality:FINAL [val] diff --git a/koin-compiler-plugin/testData/box/safety/provided_param_ok.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/provided_param_ok.fir.ir.txt index 44574dc..62bcf95 100644 --- a/koin-compiler-plugin/testData/box/safety/provided_param_ok.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/provided_param_ok.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:ExternalContext modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/provided_type_ok.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/provided_type_ok.fir.ir.txt index d9cd86c..69d46e4 100644 --- a/koin-compiler-plugin/testData/box/safety/provided_type_ok.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/provided_type_ok.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:ExternalContext modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/qualified_function_cross_module.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/qualified_function_cross_module.fir.ir.txt index 9171558..9e4efac 100644 --- a/koin-compiler-plugin/testData/box/safety/qualified_function_cross_module.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/qualified_function_cross_module.fir.ir.txt @@ -133,26 +133,26 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_consumerModule.kt FUN name:componentscan_consumerModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:consumer.UrlClient annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/koin_hints_serviceModule.kt FUN name:componentscanfunc_serviceModule_single__q_authUrl visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:service.Url VALUE_PARAMETER kind:Regular name:qualifier_authUrl index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscanfunc_serviceModule_single__q_baseUrl visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:service.Url VALUE_PARAMETER kind:Regular name:qualifier_baseUrl index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscanfunc_serviceModule_single__roster visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:q_authUrl index:0 type:kotlin.Unit VALUE_PARAMETER kind:Regular name:q_baseUrl index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:service fileName:/service/Services.kt CLASS INTERFACE name:Url modality:ABSTRACT visibility:public superTypes:[kotlin.Any] @@ -354,7 +354,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/consumerModuleM FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.ConsumerModule annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" @@ -362,7 +362,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/serviceModuleMo FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.ServiceModule annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/safety/qualified_function_cross_module.fir.txt b/koin-compiler-plugin/testData/box/safety/qualified_function_cross_module.fir.txt index 86936b2..efd3e90 100644 --- a/koin-compiler-plugin/testData/box/safety/qualified_function_cross_module.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/qualified_function_cross_module.fir.txt @@ -6,7 +6,7 @@ FILE: Services.kt public get(): R|kotlin/String| } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(baseUrl)) public final fun provideBaseUrl(): R|service/Url| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(baseUrl) [evaluated = String(baseUrl)]) public final fun provideBaseUrl(): R|service/Url| { ^provideBaseUrl object : R|service/Url| { private constructor(): R|service/| { super() @@ -18,7 +18,7 @@ FILE: Services.kt } } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(authUrl)) public final fun provideAuthUrl(): R|service/Url| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(authUrl) [evaluated = String(authUrl)]) public final fun provideAuthUrl(): R|service/Url| { ^provideAuthUrl object : R|service/Url| { private constructor(): R|service/| { super() @@ -34,7 +34,7 @@ FILE: UrlClient.kt package consumer @R|org/koin/core/annotation/Singleton|() public final class UrlClient : R|kotlin/Any| { - public constructor(@R|org/koin/core/annotation/Named|(value = String(baseUrl)) base: R|service/Url|, @R|org/koin/core/annotation/Named|(value = String(authUrl)) auth: R|service/Url|): R|consumer/UrlClient| { + public constructor(@R|org/koin/core/annotation/Named|(value = String(baseUrl) [evaluated = String(baseUrl)]) base: R|service/Url|, @R|org/koin/core/annotation/Named|(value = String(authUrl) [evaluated = String(authUrl)]) auth: R|service/Url|): R|consumer/UrlClient| { super() } @@ -46,13 +46,13 @@ FILE: UrlClient.kt } FILE: modules.kt - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(service))) @R|org/koin/core/annotation/Configuration|() public final class ServiceModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(service)) [evaluated = vararg(String(service))]) @R|org/koin/core/annotation/Configuration|() public final class ServiceModule : R|kotlin/Any| { public constructor(): R|ServiceModule| { super() } } - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(consumer))) @R|org/koin/core/annotation/Configuration|() public final class ConsumerModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(consumer)) [evaluated = vararg(String(consumer))]) @R|org/koin/core/annotation/Configuration|() public final class ConsumerModule : R|kotlin/Any| { public constructor(): R|ConsumerModule| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/qualifier_cross_module.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/qualifier_cross_module.fir.ir.txt index 17f3d87..2d801ac 100644 --- a/koin-compiler-plugin/testData/box/safety/qualifier_cross_module.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/qualifier_cross_module.fir.ir.txt @@ -153,20 +153,20 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_dataModule.kt VALUE_PARAMETER kind:Regular name:binding0 index:1 type:data.Cache VALUE_PARAMETER kind:Regular name:qualifier_local index:2 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_dataModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:data.RemoteCache VALUE_PARAMETER kind:Regular name:binding0 index:1 type:data.Cache VALUE_PARAMETER kind:Regular name:qualifier_remote index:2 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/koin_hints_uiModule.kt FUN name:componentscan_uiModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:ui.CacheManager annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt FUN name:box visibility:public modality:FINAL returnType:kotlin.String @@ -304,7 +304,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/dataModuleModul FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.DataModule annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" @@ -312,7 +312,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/uiModuleModule. FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.UiModule annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/safety/qualifier_cross_module.fir.txt b/koin-compiler-plugin/testData/box/safety/qualifier_cross_module.fir.txt index da2d24c..95ec661 100644 --- a/koin-compiler-plugin/testData/box/safety/qualifier_cross_module.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/qualifier_cross_module.fir.txt @@ -3,13 +3,13 @@ FILE: CacheImpl.kt public abstract interface Cache : R|kotlin/Any| { } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(local)) public final class LocalCache : R|data/Cache| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(local) [evaluated = String(local)]) public final class LocalCache : R|data/Cache| { public constructor(): R|data/LocalCache| { super() } } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(remote)) public final class RemoteCache : R|data/Cache| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(remote) [evaluated = String(remote)]) public final class RemoteCache : R|data/Cache| { public constructor(): R|data/RemoteCache| { super() } @@ -19,7 +19,7 @@ FILE: CacheManager.kt package ui @R|org/koin/core/annotation/Singleton|() public final class CacheManager : R|kotlin/Any| { - public constructor(@R|org/koin/core/annotation/Named|(value = String(local)) local: R|data/Cache|, @R|org/koin/core/annotation/Named|(value = String(remote)) remote: R|data/Cache|): R|ui/CacheManager| { + public constructor(@R|org/koin/core/annotation/Named|(value = String(local) [evaluated = String(local)]) local: R|data/Cache|, @R|org/koin/core/annotation/Named|(value = String(remote) [evaluated = String(remote)]) remote: R|data/Cache|): R|ui/CacheManager| { super() } @@ -31,13 +31,13 @@ FILE: CacheManager.kt } FILE: modules.kt - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(data))) @R|org/koin/core/annotation/Configuration|() public final class DataModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(data)) [evaluated = vararg(String(data))]) @R|org/koin/core/annotation/Configuration|() public final class DataModule : R|kotlin/Any| { public constructor(): R|DataModule| { super() } } - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(ui))) @R|org/koin/core/annotation/Configuration|() public final class UiModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(ui)) [evaluated = vararg(String(ui))]) @R|org/koin/core/annotation/Configuration|() public final class UiModule : R|kotlin/Any| { public constructor(): R|UiModule| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/qualifier_cross_module_type.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/qualifier_cross_module_type.fir.ir.txt index ecb11ca..72041bc 100644 --- a/koin-compiler-plugin/testData/box/safety/qualifier_cross_module_type.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/qualifier_cross_module_type.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:data fileName:/data/CacheImpl.kt CLASS CLASS name:LocalCache modality:FINAL visibility:public superTypes:[data.Cache] annotations: Singleton(binds = , createdAtStart = ) - Qualifier(value = CLASS_REFERENCE 'CLASS CLASS name:LocalQualifier modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass, name = ) + Qualifier(value = LocalQualifier::class, name = ) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:data.LocalCache CONSTRUCTOR visibility:public returnType:data.LocalCache [primary] BLOCK_BODY @@ -43,7 +43,7 @@ FILE fqName:data fileName:/data/CacheImpl.kt CLASS CLASS name:RemoteCache modality:FINAL visibility:public superTypes:[data.Cache] annotations: Singleton(binds = , createdAtStart = ) - Qualifier(value = CLASS_REFERENCE 'CLASS CLASS name:RemoteQualifier modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass, name = ) + Qualifier(value = RemoteQualifier::class, name = ) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:data.RemoteCache CONSTRUCTOR visibility:public returnType:data.RemoteCache [primary] BLOCK_BODY @@ -193,20 +193,20 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_dataModule.kt VALUE_PARAMETER kind:Regular name:binding0 index:1 type:data.Cache VALUE_PARAMETER kind:Regular name:qualifierType index:2 type:data.LocalQualifier annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_dataModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:data.RemoteCache VALUE_PARAMETER kind:Regular name:binding0 index:1 type:data.Cache VALUE_PARAMETER kind:Regular name:qualifierType index:2 type:data.RemoteQualifier annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/koin_hints_uiModule.kt FUN name:componentscan_uiModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:ui.CacheManager annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt FUN name:box visibility:public modality:FINAL returnType:kotlin.String @@ -286,10 +286,10 @@ FILE fqName:ui fileName:/ui/CacheManager.kt CONSTRUCTOR visibility:public returnType:ui.CacheManager [primary] VALUE_PARAMETER kind:Regular name:local index:0 type:data.Cache annotations: - Qualifier(value = CLASS_REFERENCE 'CLASS CLASS name:LocalQualifier modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass, name = ) + Qualifier(value = LocalQualifier::class, name = ) VALUE_PARAMETER kind:Regular name:remote index:1 type:data.Cache annotations: - Qualifier(value = CLASS_REFERENCE 'CLASS CLASS name:RemoteQualifier modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass, name = ) + Qualifier(value = RemoteQualifier::class, name = ) BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:CacheManager modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit @@ -346,7 +346,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/dataModuleModul FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.DataModule annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" @@ -354,7 +354,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/uiModuleModule. FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.UiModule annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/safety/qualifier_cross_module_type.fir.txt b/koin-compiler-plugin/testData/box/safety/qualifier_cross_module_type.fir.txt index 5aec600..8b04ca6 100644 --- a/koin-compiler-plugin/testData/box/safety/qualifier_cross_module_type.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/qualifier_cross_module_type.fir.txt @@ -15,13 +15,13 @@ FILE: CacheImpl.kt } } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Qualifier|(value = (Q|data/LocalQualifier|)) public final class LocalCache : R|data/Cache| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Qualifier|(value = (Q|data/LocalQualifier|) [evaluated = (Q|data/LocalQualifier|)]) public final class LocalCache : R|data/Cache| { public constructor(): R|data/LocalCache| { super() } } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Qualifier|(value = (Q|data/RemoteQualifier|)) public final class RemoteCache : R|data/Cache| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Qualifier|(value = (Q|data/RemoteQualifier|) [evaluated = (Q|data/RemoteQualifier|)]) public final class RemoteCache : R|data/Cache| { public constructor(): R|data/RemoteCache| { super() } @@ -31,7 +31,7 @@ FILE: CacheManager.kt package ui @R|org/koin/core/annotation/Singleton|() public final class CacheManager : R|kotlin/Any| { - public constructor(@R|org/koin/core/annotation/Qualifier|(value = (Q|data/LocalQualifier|)) local: R|data/Cache|, @R|org/koin/core/annotation/Qualifier|(value = (Q|data/RemoteQualifier|)) remote: R|data/Cache|): R|ui/CacheManager| { + public constructor(@R|org/koin/core/annotation/Qualifier|(value = (Q|data/LocalQualifier|) [evaluated = (Q|data/LocalQualifier|)]) local: R|data/Cache|, @R|org/koin/core/annotation/Qualifier|(value = (Q|data/RemoteQualifier|) [evaluated = (Q|data/RemoteQualifier|)]) remote: R|data/Cache|): R|ui/CacheManager| { super() } @@ -43,13 +43,13 @@ FILE: CacheManager.kt } FILE: modules.kt - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(data))) @R|org/koin/core/annotation/Configuration|() public final class DataModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(data)) [evaluated = vararg(String(data))]) @R|org/koin/core/annotation/Configuration|() public final class DataModule : R|kotlin/Any| { public constructor(): R|DataModule| { super() } } - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(ui))) @R|org/koin/core/annotation/Configuration|() public final class UiModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(ui)) [evaluated = vararg(String(ui))]) @R|org/koin/core/annotation/Configuration|() public final class UiModule : R|kotlin/Any| { public constructor(): R|UiModule| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/qualifier_dotted_name.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/qualifier_dotted_name.fir.ir.txt index 0847c96..df5fcca 100644 --- a/koin-compiler-plugin/testData/box/safety/qualifier_dotted_name.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/qualifier_dotted_name.fir.ir.txt @@ -153,20 +153,20 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_dataModule.kt VALUE_PARAMETER kind:Regular name:binding0 index:1 type:data.DataSource VALUE_PARAMETER kind:Regular name:qualifier_com$2eexample$2elocal index:2 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_dataModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:data.RemoteDataSource VALUE_PARAMETER kind:Regular name:binding0 index:1 type:data.DataSource VALUE_PARAMETER kind:Regular name:qualifier_com$2eexample$2eremote index:2 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/koin_hints_uiModule.kt FUN name:componentscan_uiModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:ui.Repository annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt FUN name:box visibility:public modality:FINAL returnType:kotlin.String @@ -304,7 +304,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/dataModuleModul FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.DataModule annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" @@ -312,7 +312,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/uiModuleModule. FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.UiModule annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/safety/qualifier_dotted_name.fir.txt b/koin-compiler-plugin/testData/box/safety/qualifier_dotted_name.fir.txt index 6e78e4c..3a32eb5 100644 --- a/koin-compiler-plugin/testData/box/safety/qualifier_dotted_name.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/qualifier_dotted_name.fir.txt @@ -3,13 +3,13 @@ FILE: Services.kt public abstract interface DataSource : R|kotlin/Any| { } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(com.example.local)) public final class LocalDataSource : R|data/DataSource| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(com.example.local) [evaluated = String(com.example.local)]) public final class LocalDataSource : R|data/DataSource| { public constructor(): R|data/LocalDataSource| { super() } } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(com.example.remote)) public final class RemoteDataSource : R|data/DataSource| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(com.example.remote) [evaluated = String(com.example.remote)]) public final class RemoteDataSource : R|data/DataSource| { public constructor(): R|data/RemoteDataSource| { super() } @@ -19,7 +19,7 @@ FILE: Repository.kt package ui @R|org/koin/core/annotation/Singleton|() public final class Repository : R|kotlin/Any| { - public constructor(@R|org/koin/core/annotation/Named|(value = String(com.example.local)) local: R|data/DataSource|, @R|org/koin/core/annotation/Named|(value = String(com.example.remote)) remote: R|data/DataSource|): R|ui/Repository| { + public constructor(@R|org/koin/core/annotation/Named|(value = String(com.example.local) [evaluated = String(com.example.local)]) local: R|data/DataSource|, @R|org/koin/core/annotation/Named|(value = String(com.example.remote) [evaluated = String(com.example.remote)]) remote: R|data/DataSource|): R|ui/Repository| { super() } @@ -31,13 +31,13 @@ FILE: Repository.kt } FILE: modules.kt - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(data))) @R|org/koin/core/annotation/Configuration|() public final class DataModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(data)) [evaluated = vararg(String(data))]) @R|org/koin/core/annotation/Configuration|() public final class DataModule : R|kotlin/Any| { public constructor(): R|DataModule| { super() } } - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(ui))) @R|org/koin/core/annotation/Configuration|() public final class UiModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(ui)) [evaluated = vararg(String(ui))]) @R|org/koin/core/annotation/Configuration|() public final class UiModule : R|kotlin/Any| { public constructor(): R|UiModule| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/qualifier_match.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/qualifier_match.fir.ir.txt index 216f946..39e2be4 100644 --- a/koin-compiler-plugin/testData/box/safety/qualifier_match.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/qualifier_match.fir.ir.txt @@ -2,21 +2,21 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.CacheManager annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.LocalCache VALUE_PARAMETER kind:Regular name:binding0 index:1 type:.Cache VALUE_PARAMETER kind:Regular name:qualifier_local index:2 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.RemoteCache VALUE_PARAMETER kind:Regular name:binding0 index:1 type:.Cache VALUE_PARAMETER kind:Regular name:qualifier_remote index:2 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:CacheManager modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/qualifier_match.fir.txt b/koin-compiler-plugin/testData/box/safety/qualifier_match.fir.txt index cc03db7..3c49808 100644 --- a/koin-compiler-plugin/testData/box/safety/qualifier_match.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/qualifier_match.fir.txt @@ -7,20 +7,20 @@ FILE: test.kt } public abstract interface Cache : R|kotlin/Any| { } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(local)) public final class LocalCache : R|Cache| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(local) [evaluated = String(local)]) public final class LocalCache : R|Cache| { public constructor(): R|LocalCache| { super() } } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(remote)) public final class RemoteCache : R|Cache| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(remote) [evaluated = String(remote)]) public final class RemoteCache : R|Cache| { public constructor(): R|RemoteCache| { super() } } @R|org/koin/core/annotation/Singleton|() public final class CacheManager : R|kotlin/Any| { - public constructor(@R|org/koin/core/annotation/Named|(value = String(local)) local: R|Cache|, @R|org/koin/core/annotation/Named|(value = String(remote)) remote: R|Cache|): R|CacheManager| { + public constructor(@R|org/koin/core/annotation/Named|(value = String(local) [evaluated = String(local)]) local: R|Cache|, @R|org/koin/core/annotation/Named|(value = String(remote) [evaluated = String(remote)]) remote: R|Cache|): R|CacheManager| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/scope_id_ok.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/scope_id_ok.fir.ir.txt index 67fe57c..7ac7506 100644 --- a/koin-compiler-plugin/testData/box/safety/scope_id_ok.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/scope_id_ok.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_factory visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.ProfileService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:ProfileService modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/scope_id_ok.fir.txt b/koin-compiler-plugin/testData/box/safety/scope_id_ok.fir.txt index 38e5b31..c882110 100644 --- a/koin-compiler-plugin/testData/box/safety/scope_id_ok.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/scope_id_ok.fir.txt @@ -9,7 +9,7 @@ FILE: test.kt } @R|org/koin/core/annotation/Factory|() public final class ProfileService : R|kotlin/Any| { - public constructor(@R|org/koin/core/annotation/ScopeId|(name = String(user_session)) session: R|UserSession|): R|ProfileService| { + public constructor(@R|org/koin/core/annotation/ScopeId|(name = String(user_session) [evaluated = String(user_session)]) session: R|UserSession|): R|ProfileService| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/scope_param_dsl_ok.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/scope_param_dsl_ok.fir.ir.txt index be53da8..75189d8 100644 --- a/koin-compiler-plugin/testData/box/safety/scope_param_dsl_ok.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/scope_param_dsl_ok.fir.ir.txt @@ -3,7 +3,7 @@ FILE fqName:org.koin.plugin.hints fileName:/main__scopeAwareRepositoryDsl_single VALUE_PARAMETER kind:Regular name:contributed index:0 type:.ScopeAwareRepository VALUE_PARAMETER kind:Regular name:module_testModule index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt PROPERTY name:testModule visibility:public modality:FINAL [val] diff --git a/koin-compiler-plugin/testData/box/safety/scope_param_ok.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/scope_param_ok.fir.ir.txt index 4a0f9e4..434778b 100644 --- a/koin-compiler-plugin/testData/box/safety/scope_param_ok.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/scope_param_ok.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.ScopeAwareService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:ScopeAwareService modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/scoped_visibility.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/scoped_visibility.fir.ir.txt index faa2101..eae2a5f 100644 --- a/koin-compiler-plugin/testData/box/safety/scoped_visibility.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/scoped_visibility.fir.ir.txt @@ -3,12 +3,12 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt VALUE_PARAMETER kind:Regular name:contributed index:0 type:.SessionData VALUE_PARAMETER kind:Regular name:scope index:1 type:.SessionScope annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.AuthService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:AuthService modality:FINAL visibility:public superTypes:[kotlin.Any] @@ -35,7 +35,7 @@ FILE fqName: fileName:/test.kt CLASS CLASS name:SessionData modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: Scoped(binds = ) - Scope(value = CLASS_REFERENCE 'CLASS CLASS name:SessionScope modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.SessionScope>, name = ) + Scope(value = SessionScope::class, name = ) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:.SessionData PROPERTY name:auth visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:auth type:.AuthService visibility:private [final] diff --git a/koin-compiler-plugin/testData/box/safety/scoped_visibility.fir.txt b/koin-compiler-plugin/testData/box/safety/scoped_visibility.fir.txt index ecc9f29..85a3d78 100644 --- a/koin-compiler-plugin/testData/box/safety/scoped_visibility.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/scoped_visibility.fir.txt @@ -17,7 +17,7 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Scoped|() @R|org/koin/core/annotation/Scope|(value = (Q|SessionScope|)) public final class SessionData : R|kotlin/Any| { + @R|org/koin/core/annotation/Scoped|() @R|org/koin/core/annotation/Scope|(value = (Q|SessionScope|) [evaluated = (Q|SessionScope|)]) public final class SessionData : R|kotlin/Any| { public constructor(auth: R|AuthService|): R|SessionData| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/startkoin_full_graph.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/startkoin_full_graph.fir.ir.txt index 821e11a..23b48a7 100644 --- a/koin-compiler-plugin/testData/box/safety/startkoin_full_graph.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/startkoin_full_graph.fir.ir.txt @@ -1,7 +1,7 @@ FILE fqName: fileName:/app.kt CLASS OBJECT name:MyApp modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - KoinApplication(configurations = , modules = [CLASS_REFERENCE 'CLASS CLASS name:CoreModule modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.CoreModule>, CLASS_REFERENCE 'CLASS CLASS name:ServiceModule modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.ServiceModule>] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>) + KoinApplication(configurations = , modules = [CoreModule::class, ServiceModule::class] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:.MyApp CONSTRUCTOR visibility:private returnType:.MyApp [primary] BLOCK_BODY @@ -113,13 +113,13 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_coreModule.kt FUN name:componentscan_coreModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:core.Repository annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/koin_hints_serviceModule.kt FUN name:componentscan_serviceModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:service.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:service fileName:/service/Service.kt CLASS CLASS name:Service modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/safety/startkoin_full_graph.fir.txt b/koin-compiler-plugin/testData/box/safety/startkoin_full_graph.fir.txt index cd2d130..b293e31 100644 --- a/koin-compiler-plugin/testData/box/safety/startkoin_full_graph.fir.txt +++ b/koin-compiler-plugin/testData/box/safety/startkoin_full_graph.fir.txt @@ -20,20 +20,20 @@ FILE: Service.kt } FILE: modules.kt - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(core))) public final class CoreModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(core)) [evaluated = vararg(String(core))]) public final class CoreModule : R|kotlin/Any| { public constructor(): R|CoreModule| { super() } } - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(service))) public final class ServiceModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(service)) [evaluated = vararg(String(service))]) public final class ServiceModule : R|kotlin/Any| { public constructor(): R|ServiceModule| { super() } } FILE: app.kt - @R|org/koin/core/annotation/KoinApplication|(modules = ((Q|CoreModule|), (Q|ServiceModule|))) public final object MyApp : R|kotlin/Any| { + @R|org/koin/core/annotation/KoinApplication|(modules = ((Q|CoreModule|), (Q|ServiceModule|)) [evaluated = ((Q|CoreModule|), (Q|ServiceModule|))]) public final object MyApp : R|kotlin/Any| { private constructor(): R|MyApp| { super() } diff --git a/koin-compiler-plugin/testData/box/safety/toplevel_function_ok.fir.ir.txt b/koin-compiler-plugin/testData/box/safety/toplevel_function_ok.fir.ir.txt index 2e72785..9495f79 100644 --- a/koin-compiler-plugin/testData/box/safety/toplevel_function_ok.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/safety/toplevel_function_ok.fir.ir.txt @@ -2,12 +2,12 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Service annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscanfunc_testModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.DataSource annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:DatabaseDataSource modality:FINAL visibility:public superTypes:[.DataSource] diff --git a/koin-compiler-plugin/testData/box/scopes/scope_class.fir.ir.txt b/koin-compiler-plugin/testData/box/scopes/scope_class.fir.ir.txt index 0ab751c..2e197ab 100644 --- a/koin-compiler-plugin/testData/box/scopes/scope_class.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/scopes/scope_class.fir.ir.txt @@ -3,7 +3,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt VALUE_PARAMETER kind:Regular name:contributed index:0 type:.ScopedService VALUE_PARAMETER kind:Regular name:scope index:1 type:.MyScope annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:MyScope modality:FINAL visibility:public superTypes:[kotlin.Any] @@ -28,7 +28,7 @@ FILE fqName: fileName:/test.kt CLASS CLASS name:ScopedService modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: Scoped(binds = ) - Scope(value = CLASS_REFERENCE 'CLASS CLASS name:MyScope modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.MyScope>, name = ) + Scope(value = MyScope::class, name = ) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:.ScopedService CONSTRUCTOR visibility:public returnType:.ScopedService [primary] BLOCK_BODY diff --git a/koin-compiler-plugin/testData/box/scopes/scope_class.fir.txt b/koin-compiler-plugin/testData/box/scopes/scope_class.fir.txt index 7658442..01e6427 100644 --- a/koin-compiler-plugin/testData/box/scopes/scope_class.fir.txt +++ b/koin-compiler-plugin/testData/box/scopes/scope_class.fir.txt @@ -11,7 +11,7 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Scoped|() @R|org/koin/core/annotation/Scope|(value = (Q|MyScope|)) public final class ScopedService : R|kotlin/Any| { + @R|org/koin/core/annotation/Scoped|() @R|org/koin/core/annotation/Scope|(value = (Q|MyScope|) [evaluated = (Q|MyScope|)]) public final class ScopedService : R|kotlin/Any| { public constructor(): R|ScopedService| { super() } diff --git a/koin-compiler-plugin/testData/box/scopes/scope_id_param_name.fir.ir.txt b/koin-compiler-plugin/testData/box/scopes/scope_id_param_name.fir.ir.txt index 8c0431e..b848b7a 100644 --- a/koin-compiler-plugin/testData/box/scopes/scope_id_param_name.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/scopes/scope_id_param_name.fir.ir.txt @@ -2,13 +2,13 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_factory visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Lex annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_scoped visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.Tnt VALUE_PARAMETER kind:Regular name:scope index:1 type:.MyType annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:Lex modality:FINAL visibility:public superTypes:[kotlin.Any] @@ -70,7 +70,7 @@ FILE fqName: fileName:/test.kt public open fun toString (): kotlin.String declared in kotlin.Any CLASS CLASS name:Tnt modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - Scope(value = CLASS_REFERENCE 'CLASS INTERFACE name:MyType modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.MyType>, name = ) + Scope(value = MyType::class, name = ) Scoped(binds = ) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:.Tnt PROPERTY name:signature visibility:public modality:FINAL [val] diff --git a/koin-compiler-plugin/testData/box/scopes/scope_id_param_name.fir.txt b/koin-compiler-plugin/testData/box/scopes/scope_id_param_name.fir.txt index ef93ca7..cb73409 100644 --- a/koin-compiler-plugin/testData/box/scopes/scope_id_param_name.fir.txt +++ b/koin-compiler-plugin/testData/box/scopes/scope_id_param_name.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt public abstract interface MyType : R|kotlin/Any| { } - @R|org/koin/core/annotation/Scope|(value = (Q|MyType|)) @R|org/koin/core/annotation/Scoped|() public final class Tnt : R|kotlin/Any| { + @R|org/koin/core/annotation/Scope|(value = (Q|MyType|) [evaluated = (Q|MyType|)]) @R|org/koin/core/annotation/Scoped|() public final class Tnt : R|kotlin/Any| { public constructor(): R|Tnt| { super() } @@ -11,7 +11,7 @@ FILE: test.kt } @R|org/koin/core/annotation/Factory|() public final class Lex : R|kotlin/Any| { - public constructor(@R|org/koin/core/annotation/ScopeId|(name = String(a)) t: R|Tnt|): R|Lex| { + public constructor(@R|org/koin/core/annotation/ScopeId|(name = String(a) [evaluated = String(a)]) t: R|Tnt|): R|Lex| { super() } diff --git a/koin-compiler-plugin/testData/box/scopes/scope_name.fir.ir.txt b/koin-compiler-plugin/testData/box/scopes/scope_name.fir.ir.txt index cb98eef..dd8a285 100644 --- a/koin-compiler-plugin/testData/box/scopes/scope_name.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/scopes/scope_name.fir.ir.txt @@ -2,13 +2,13 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testModule.kt FUN name:componentscan_testModule_scoped visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.SessionData annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_testModule_scoped visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.UserRepositoryImpl VALUE_PARAMETER kind:Regular name:binding0 index:1 type:.UserRepository annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:SessionData modality:FINAL visibility:public superTypes:[kotlin.Any] @@ -72,7 +72,7 @@ FILE fqName: fileName:/test.kt CLASS CLASS name:UserRepositoryImpl modality:FINAL visibility:public superTypes:[.UserRepository] annotations: Scope(value = , name = "session") - Scoped(binds = [CLASS_REFERENCE 'CLASS INTERFACE name:UserRepository modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.UserRepository>] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>) + Scoped(binds = [UserRepository::class] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:.UserRepositoryImpl CONSTRUCTOR visibility:public returnType:.UserRepositoryImpl [primary] BLOCK_BODY diff --git a/koin-compiler-plugin/testData/box/scopes/scope_name.fir.txt b/koin-compiler-plugin/testData/box/scopes/scope_name.fir.txt index 9e5c1a9..3b1205a 100644 --- a/koin-compiler-plugin/testData/box/scopes/scope_name.fir.txt +++ b/koin-compiler-plugin/testData/box/scopes/scope_name.fir.txt @@ -9,7 +9,7 @@ FILE: test.kt public abstract fun id(): R|kotlin/String| } - @R|org/koin/core/annotation/Scope|(name = String(session)) @R|org/koin/core/annotation/Scoped|(binds = ((Q|UserRepository|))) public final class UserRepositoryImpl : R|UserRepository| { + @R|org/koin/core/annotation/Scope|(name = String(session) [evaluated = String(session)]) @R|org/koin/core/annotation/Scoped|(binds = ((Q|UserRepository|)) [evaluated = ((Q|UserRepository|))]) public final class UserRepositoryImpl : R|UserRepository| { public constructor(): R|UserRepositoryImpl| { super() } @@ -19,7 +19,7 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Scope|(name = String(session)) @R|org/koin/core/annotation/Scoped|() public final class SessionData : R|kotlin/Any| { + @R|org/koin/core/annotation/Scope|(name = String(session) [evaluated = String(session)]) @R|org/koin/core/annotation/Scoped|() public final class SessionData : R|kotlin/Any| { public constructor(token: R|kotlin/String| = String(session-token)): R|SessionData| { super() } diff --git a/koin-compiler-plugin/testData/box/startkoin/configuration_discovery.fir.ir.txt b/koin-compiler-plugin/testData/box/startkoin/configuration_discovery.fir.ir.txt index d4fa2f2..2387ed1 100644 --- a/koin-compiler-plugin/testData/box/startkoin/configuration_discovery.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/startkoin/configuration_discovery.fir.ir.txt @@ -24,7 +24,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_featureModule.kt FUN name:componentscan_featureModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.FeatureService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:FeatureModule modality:FINAL visibility:public superTypes:[kotlin.Any] @@ -104,7 +104,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/featureModuleMo FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.FeatureModule annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/startkoin/explicit_modules_override_configuration.fir.ir.txt b/koin-compiler-plugin/testData/box/startkoin/explicit_modules_override_configuration.fir.ir.txt index 4df513e..140ef2a 100644 --- a/koin-compiler-plugin/testData/box/startkoin/explicit_modules_override_configuration.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/startkoin/explicit_modules_override_configuration.fir.ir.txt @@ -173,7 +173,7 @@ FILE fqName: fileName:/test.kt VALUE_PARAMETER kind:DispatchReceiver name: index:0 type:.Feature CLASS INTERFACE name:MyApp modality:ABSTRACT visibility:public superTypes:[kotlin.Any] annotations: - KoinApplication(configurations = , modules = [CLASS_REFERENCE 'CLASS CLASS name:AppModule modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.AppModule>] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>) + KoinApplication(configurations = , modules = [AppModule::class] type=kotlin.Array> varargElementType=kotlin.reflect.KClass<*>) thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name: type:.MyApp FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN returnType:kotlin.Boolean [fake_override,operator] VALUE_PARAMETER kind:DispatchReceiver name: index:0 type:kotlin.Any @@ -228,7 +228,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/appModuleModule FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:moduledef_appModule__appFeature visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.Feature annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" @@ -236,14 +236,14 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/coreConfigurati FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.CoreConfiguration annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:moduledef_coreConfiguration__defaultFeature visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:.Feature annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/startkoin/explicit_modules_override_configuration.fir.txt b/koin-compiler-plugin/testData/box/startkoin/explicit_modules_override_configuration.fir.txt index ecdcea1..f365d92 100644 --- a/koin-compiler-plugin/testData/box/startkoin/explicit_modules_override_configuration.fir.txt +++ b/koin-compiler-plugin/testData/box/startkoin/explicit_modules_override_configuration.fir.txt @@ -43,7 +43,7 @@ FILE: test.kt } } - @R|org/koin/core/annotation/KoinApplication|(modules = ((Q|AppModule|))) public abstract interface MyApp : R|kotlin/Any| { + @R|org/koin/core/annotation/KoinApplication|(modules = ((Q|AppModule|)) [evaluated = ((Q|AppModule|))]) public abstract interface MyApp : R|kotlin/Any| { } public final fun box(): R|kotlin/String| { lval koin: R|org/koin/core/Koin| = R|org/koin/plugin/module/dsl/startKoin|( = startKoin@fun R|org/koin/core/KoinApplication|.(): R|kotlin/Unit| { diff --git a/koin-compiler-plugin/testData/box/startkoin/koin_application.fir.ir.txt b/koin-compiler-plugin/testData/box/startkoin/koin_application.fir.ir.txt index f531d19..b967000 100644 --- a/koin-compiler-plugin/testData/box/startkoin/koin_application.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/startkoin/koin_application.fir.ir.txt @@ -24,7 +24,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_appModule.kt FUN name:componentscan_appModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.AppService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:AppModule modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/startkoin/multiple_modules.fir.ir.txt b/koin-compiler-plugin/testData/box/startkoin/multiple_modules.fir.ir.txt index c270860..831eeac 100644 --- a/koin-compiler-plugin/testData/box/startkoin/multiple_modules.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/startkoin/multiple_modules.fir.ir.txt @@ -80,23 +80,23 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_moduleA.kt FUN name:componentscan_moduleA_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.ServiceA annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_moduleA_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.ServiceB annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:org.koin.plugin.hints fileName:/koin_hints_moduleB.kt FUN name:componentscan_moduleB_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.ServiceA annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscan_moduleB_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.ServiceB annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:ModuleA modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/startkoin/startkoin_basic.fir.ir.txt b/koin-compiler-plugin/testData/box/startkoin/startkoin_basic.fir.ir.txt index 569ecb8..5fe9c65 100644 --- a/koin-compiler-plugin/testData/box/startkoin/startkoin_basic.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/startkoin/startkoin_basic.fir.ir.txt @@ -24,7 +24,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_appModule.kt FUN name:componentscan_appModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:.AppService annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName: fileName:/test.kt CLASS CLASS name:AppModule modality:FINAL visibility:public superTypes:[kotlin.Any] diff --git a/koin-compiler-plugin/testData/box/toplevel/qualified_unit_singletons.fir.ir.txt b/koin-compiler-plugin/testData/box/toplevel/qualified_unit_singletons.fir.ir.txt index cc10c15..c13256c 100644 --- a/koin-compiler-plugin/testData/box/toplevel/qualified_unit_singletons.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/toplevel/qualified_unit_singletons.fir.ir.txt @@ -3,19 +3,19 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testpkg_AppModule.kt VALUE_PARAMETER kind:Regular name:contributed index:0 type:kotlin.Unit VALUE_PARAMETER kind:Regular name:qualifier_initFlagsAndLogging index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscanfunc_testpkg_AppModule_single__q_initNotifier visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:kotlin.Unit VALUE_PARAMETER kind:Regular name:qualifier_initNotifier index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FUN name:componentscanfunc_testpkg_AppModule_single__roster visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:q_initFlagsAndLogging index:0 type:kotlin.Unit VALUE_PARAMETER kind:Regular name:q_initNotifier index:1 type:kotlin.Unit annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:testpkg fileName:/test.kt CLASS CLASS name:AppModule modality:FINAL visibility:public superTypes:[kotlin.Any] @@ -83,7 +83,7 @@ FILE fqName:org.koin.plugin.hints fileName:org/koin/plugin/hints/testpkgAppModul FUN GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] name:configuration_default visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER GENERATED[org.koin.compiler.plugin.fir.KoinModuleFirGenerator.Key] kind:Regular name:contributed index:0 type:testpkg.AppModule annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY CALL 'public final fun error (message: kotlin.Any): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null ARG message: CONST String type=kotlin.String value="Stub!" diff --git a/koin-compiler-plugin/testData/box/toplevel/qualified_unit_singletons.fir.txt b/koin-compiler-plugin/testData/box/toplevel/qualified_unit_singletons.fir.txt index d8360b9..a03fd47 100644 --- a/koin-compiler-plugin/testData/box/toplevel/qualified_unit_singletons.fir.txt +++ b/koin-compiler-plugin/testData/box/toplevel/qualified_unit_singletons.fir.txt @@ -1,15 +1,15 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) @R|org/koin/core/annotation/Configuration|() public final class AppModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) @R|org/koin/core/annotation/Configuration|() public final class AppModule : R|kotlin/Any| { public constructor(): R|testpkg/AppModule| { super() } } - @R|org/koin/core/annotation/Named|(value = String(initFlagsAndLogging)) @R|org/koin/core/annotation/Singleton|(createdAtStart = Boolean(true)) public final fun initFlagsAndLogging(): R|kotlin/Unit| { + @R|org/koin/core/annotation/Named|(value = String(initFlagsAndLogging) [evaluated = String(initFlagsAndLogging)]) @R|org/koin/core/annotation/Singleton|(createdAtStart = Boolean(true) [evaluated = Boolean(true)]) public final fun initFlagsAndLogging(): R|kotlin/Unit| { } - @R|org/koin/core/annotation/Named|(value = String(initNotifier)) @R|org/koin/core/annotation/Singleton|(createdAtStart = Boolean(true)) public final fun initNotifier(): R|kotlin/Unit| { + @R|org/koin/core/annotation/Named|(value = String(initNotifier) [evaluated = String(initNotifier)]) @R|org/koin/core/annotation/Singleton|(createdAtStart = Boolean(true) [evaluated = Boolean(true)]) public final fun initNotifier(): R|kotlin/Unit| { } public final fun box(): R|kotlin/String| { lval koin: R|org/koin/core/Koin| = R|org/koin/dsl/koinApplication|( = koinApplication@fun R|org/koin/core/KoinApplication|.(): R|kotlin/Unit| { diff --git a/koin-compiler-plugin/testData/box/toplevel/singleton_function.fir.ir.txt b/koin-compiler-plugin/testData/box/toplevel/singleton_function.fir.ir.txt index 3d95229..19dfff3 100644 --- a/koin-compiler-plugin/testData/box/toplevel/singleton_function.fir.ir.txt +++ b/koin-compiler-plugin/testData/box/toplevel/singleton_function.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName:org.koin.plugin.hints fileName:/koin_hints_testpkg_TestModule.kt FUN name:componentscanfunc_testpkg_TestModule_single visibility:public modality:FINAL returnType:kotlin.Unit VALUE_PARAMETER kind:Regular name:contributed index:0 type:testpkg.DataSource annotations: - Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "Koin compiler plugin internal hint function", replaceWith = , level = DeprecationLevel.HIDDEN) BLOCK_BODY FILE fqName:testpkg fileName:/test.kt CLASS CLASS name:DatabaseDataSource modality:FINAL visibility:public superTypes:[testpkg.DataSource] diff --git a/koin-compiler-plugin/testData/box/toplevel/singleton_function.fir.txt b/koin-compiler-plugin/testData/box/toplevel/singleton_function.fir.txt index 67da5e0..bc3d7e1 100644 --- a/koin-compiler-plugin/testData/box/toplevel/singleton_function.fir.txt +++ b/koin-compiler-plugin/testData/box/toplevel/singleton_function.fir.txt @@ -12,7 +12,7 @@ FILE: test.kt @R|org/koin/core/annotation/Singleton|() public final fun provideDataSource(): R|testpkg/DataSource| { ^provideDataSource R|testpkg/DatabaseDataSource.DatabaseDataSource|() } - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class TestModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class TestModule : R|kotlin/Any| { public constructor(): R|testpkg/TestModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/call_site_param_arity_mismatch.fir.txt b/koin-compiler-plugin/testData/diagnostics/call_site_param_arity_mismatch.fir.txt index 673b623..7f3717b 100644 --- a/koin-compiler-plugin/testData/diagnostics/call_site_param_arity_mismatch.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/call_site_param_arity_mismatch.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class TestModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class TestModule : R|kotlin/Any| { public constructor(): R|testpkg/TestModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/call_site_param_missing_d006.fir.txt b/koin-compiler-plugin/testData/diagnostics/call_site_param_missing_d006.fir.txt index 2ef8418..62fcca3 100644 --- a/koin-compiler-plugin/testData/diagnostics/call_site_param_missing_d006.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/call_site_param_missing_d006.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class TestModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class TestModule : R|kotlin/Any| { public constructor(): R|testpkg/TestModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/call_site_param_no_injected_no_d006.fir.txt b/koin-compiler-plugin/testData/diagnostics/call_site_param_no_injected_no_d006.fir.txt index 01f7703..ccf8409 100644 --- a/koin-compiler-plugin/testData/diagnostics/call_site_param_no_injected_no_d006.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/call_site_param_no_injected_no_d006.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class TestModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class TestModule : R|kotlin/Any| { public constructor(): R|testpkg/TestModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/call_site_param_nullable_ok.fir.txt b/koin-compiler-plugin/testData/diagnostics/call_site_param_nullable_ok.fir.txt index b03dc55..45588fc 100644 --- a/koin-compiler-plugin/testData/diagnostics/call_site_param_nullable_ok.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/call_site_param_nullable_ok.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class TestModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class TestModule : R|kotlin/Any| { public constructor(): R|testpkg/TestModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/call_site_param_ok.fir.txt b/koin-compiler-plugin/testData/diagnostics/call_site_param_ok.fir.txt index 3f8f26f..f453006 100644 --- a/koin-compiler-plugin/testData/diagnostics/call_site_param_ok.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/call_site_param_ok.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class TestModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class TestModule : R|kotlin/Any| { public constructor(): R|testpkg/TestModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/call_site_param_type_mismatch.fir.txt b/koin-compiler-plugin/testData/diagnostics/call_site_param_type_mismatch.fir.txt index 753fc7f..14eae1c 100644 --- a/koin-compiler-plugin/testData/diagnostics/call_site_param_type_mismatch.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/call_site_param_type_mismatch.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class TestModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class TestModule : R|kotlin/Any| { public constructor(): R|testpkg/TestModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/circular_dependency_broken_by_lazy.fir.txt b/koin-compiler-plugin/testData/diagnostics/circular_dependency_broken_by_lazy.fir.txt index 5d0ac0d..6d3dab7 100644 --- a/koin-compiler-plugin/testData/diagnostics/circular_dependency_broken_by_lazy.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/circular_dependency_broken_by_lazy.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class TestModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class TestModule : R|kotlin/Any| { public constructor(): R|testpkg/TestModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/circular_dependency_direct.fir.txt b/koin-compiler-plugin/testData/diagnostics/circular_dependency_direct.fir.txt index 4ca14d5..63d53d7 100644 --- a/koin-compiler-plugin/testData/diagnostics/circular_dependency_direct.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/circular_dependency_direct.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class TestModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class TestModule : R|kotlin/Any| { public constructor(): R|testpkg/TestModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/circular_dependency_transitive.fir.txt b/koin-compiler-plugin/testData/diagnostics/circular_dependency_transitive.fir.txt index 25a94af..016ca41 100644 --- a/koin-compiler-plugin/testData/diagnostics/circular_dependency_transitive.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/circular_dependency_transitive.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class TestModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class TestModule : R|kotlin/Any| { public constructor(): R|testpkg/TestModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/configuration_label_mismatch.fir.txt b/koin-compiler-plugin/testData/diagnostics/configuration_label_mismatch.fir.txt index 451b254..415f0f1 100644 --- a/koin-compiler-plugin/testData/diagnostics/configuration_label_mismatch.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/configuration_label_mismatch.fir.txt @@ -20,13 +20,13 @@ FILE: Service.kt } FILE: modules.kt - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(core))) @R|org/koin/core/annotation/Configuration|(value = vararg(String(core))) public final class CoreModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(core)) [evaluated = vararg(String(core))]) @R|org/koin/core/annotation/Configuration|(value = vararg(String(core)) [evaluated = vararg(String(core))]) public final class CoreModule : R|kotlin/Any| { public constructor(): R|CoreModule| { super() } } - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(service))) @R|org/koin/core/annotation/Configuration|(value = vararg(String(service))) public final class ServiceModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(service)) [evaluated = vararg(String(service))]) @R|org/koin/core/annotation/Configuration|(value = vararg(String(service)) [evaluated = vararg(String(service))]) public final class ServiceModule : R|kotlin/Any| { public constructor(): R|ServiceModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/missing_viewmodel_artifact.fir.txt b/koin-compiler-plugin/testData/diagnostics/missing_viewmodel_artifact.fir.txt index fd0863a..e104c11 100644 --- a/koin-compiler-plugin/testData/diagnostics/missing_viewmodel_artifact.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/missing_viewmodel_artifact.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class AppModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class AppModule : R|kotlin/Any| { public constructor(): R|testpkg/AppModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/missing_worker_artifact.fir.txt b/koin-compiler-plugin/testData/diagnostics/missing_worker_artifact.fir.txt index fe7dcb2..889c20a 100644 --- a/koin-compiler-plugin/testData/diagnostics/missing_worker_artifact.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/missing_worker_artifact.fir.txt @@ -1,7 +1,7 @@ FILE: test.kt package testpkg - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg))) public final class AppModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(testpkg)) [evaluated = vararg(String(testpkg))]) public final class AppModule : R|kotlin/Any| { public constructor(): R|testpkg/AppModule| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/qualifier_mismatch.fir.txt b/koin-compiler-plugin/testData/diagnostics/qualifier_mismatch.fir.txt index bace0f9..955355d 100644 --- a/koin-compiler-plugin/testData/diagnostics/qualifier_mismatch.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/qualifier_mismatch.fir.txt @@ -5,14 +5,14 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(test)) public final class Repository : R|kotlin/Any| { + @R|org/koin/core/annotation/Singleton|() @R|org/koin/core/annotation/Named|(value = String(test) [evaluated = String(test)]) public final class Repository : R|kotlin/Any| { public constructor(): R|Repository| { super() } } @R|org/koin/core/annotation/Singleton|() public final class Service : R|kotlin/Any| { - public constructor(@R|org/koin/core/annotation/Named|(value = String(prod)) repo: R|Repository|): R|Service| { + public constructor(@R|org/koin/core/annotation/Named|(value = String(prod) [evaluated = String(prod)]) repo: R|Repository|): R|Service| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/scoped_cross_scope.fir.txt b/koin-compiler-plugin/testData/diagnostics/scoped_cross_scope.fir.txt index 9473b0a..cd594c7 100644 --- a/koin-compiler-plugin/testData/diagnostics/scoped_cross_scope.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/scoped_cross_scope.fir.txt @@ -17,7 +17,7 @@ FILE: test.kt } } - @R|org/koin/core/annotation/Scoped|() @R|org/koin/core/annotation/Scope|(value = (Q|SessionScope|)) public final class Service : R|kotlin/Any| { + @R|org/koin/core/annotation/Scoped|() @R|org/koin/core/annotation/Scope|(value = (Q|SessionScope|) [evaluated = (Q|SessionScope|)]) public final class Service : R|kotlin/Any| { public constructor(auth: R|AuthData|): R|Service| { super() } @@ -26,7 +26,7 @@ FILE: test.kt public get(): R|AuthData| } - @R|org/koin/core/annotation/Scoped|() @R|org/koin/core/annotation/Scope|(value = (Q|UserScope|)) public final class AuthData : R|kotlin/Any| { + @R|org/koin/core/annotation/Scoped|() @R|org/koin/core/annotation/Scope|(value = (Q|UserScope|) [evaluated = (Q|UserScope|)]) public final class AuthData : R|kotlin/Any| { public constructor(): R|AuthData| { super() } diff --git a/koin-compiler-plugin/testData/diagnostics/startkoin_missing.fir.txt b/koin-compiler-plugin/testData/diagnostics/startkoin_missing.fir.txt index 46040d2..ce51f17 100644 --- a/koin-compiler-plugin/testData/diagnostics/startkoin_missing.fir.txt +++ b/koin-compiler-plugin/testData/diagnostics/startkoin_missing.fir.txt @@ -17,13 +17,13 @@ FILE: Service.kt } FILE: modules.kt - @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(service))) public final class ServiceModule : R|kotlin/Any| { + @R|org/koin/core/annotation/Module|() @R|org/koin/core/annotation/ComponentScan|(value = vararg(String(service)) [evaluated = vararg(String(service))]) public final class ServiceModule : R|kotlin/Any| { public constructor(): R|ServiceModule| { super() } } - @R|org/koin/core/annotation/KoinApplication|(modules = ((Q|ServiceModule|))) public final object MyApp : R|kotlin/Any| { + @R|org/koin/core/annotation/KoinApplication|(modules = ((Q|ServiceModule|)) [evaluated = ((Q|ServiceModule|))]) public final object MyApp : R|kotlin/Any| { private constructor(): R|MyApp| { super() } From be81e5a0147a7c708fa67cdb9150a98a223ffc36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=83=D1=80=D0=B0=D0=BA=D1=83=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=90=D0=B4=D0=B8=D0=BB=D0=B5=D1=82?= Date: Tue, 9 Jun 2026 16:44:17 +0600 Subject: [PATCH 3/5] test: update sample apps for plugin 1.0.1 --- test-apps/gradle/libs.versions.toml | 6 ++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../annotations/AnnotationsConfigTest.kt | 22 ++++++++++++++++++- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/test-apps/gradle/libs.versions.toml b/test-apps/gradle/libs.versions.toml index 9490d46..b8941af 100644 --- a/test-apps/gradle/libs.versions.toml +++ b/test-apps/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -kotlin = "2.3.20" +kotlin = "2.4.0" koin = "4.2.1" -koin-plugin = "1.0.0" +koin-plugin = "1.0.1" [libraries] koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" } @@ -11,4 +11,4 @@ koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = " [plugins] kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } -koin-plugin = { id = "io.insert-koin.compiler.plugin", version.ref = "koin-plugin" } \ No newline at end of file +koin-plugin = { id = "io.insert-koin.compiler.plugin", version.ref = "koin-plugin" } diff --git a/test-apps/gradle/wrapper/gradle-wrapper.properties b/test-apps/gradle/wrapper/gradle-wrapper.properties index d4081da..5dd3c01 100644 --- a/test-apps/gradle/wrapper/gradle-wrapper.properties +++ b/test-apps/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/test-apps/sample-app/src/jvmMain/kotlin/examples/annotations/AnnotationsConfigTest.kt b/test-apps/sample-app/src/jvmMain/kotlin/examples/annotations/AnnotationsConfigTest.kt index a124f36..c6f2be7 100644 --- a/test-apps/sample-app/src/jvmMain/kotlin/examples/annotations/AnnotationsConfigTest.kt +++ b/test-apps/sample-app/src/jvmMain/kotlin/examples/annotations/AnnotationsConfigTest.kt @@ -1,10 +1,15 @@ package examples.annotations +import feature.FeatureService +import feature.PremiumConsumer import org.koin.core.annotation.ComponentScan import org.koin.core.annotation.Configuration import org.koin.core.annotation.KoinApplication import org.koin.core.annotation.Module import org.koin.core.annotation.Singleton +import org.koin.core.context.stopKoin +import org.koin.core.logger.Level +import org.koin.plugin.module.dsl.startKoin @Module @ComponentScan @@ -16,4 +21,19 @@ class ConfigSingle // @Configuration modules are auto-discovered - no need for explicit modules parameter! @KoinApplication -object MyApp2 \ No newline at end of file +object MyApp2 + +fun main() { + val koin = startKoin { + printLogger(Level.DEBUG) + }.koin + + try { + check(koin.getOrNull() != null) { "ConfigSingle should be resolved from MyModule2" } + check(koin.getOrNull() != null) { "FeatureService should be resolved from FeatureModule" } + check(koin.getOrNull() != null) { "PremiumConsumer should be resolved from FeatureModule" } + println("OK") + } finally { + stopKoin() + } +} From de53c6c319f9db8f5a420a8d2a3791de7f8a8fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=83=D1=80=D0=B0=D0=BA=D1=83=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=90=D0=B4=D0=B8=D0=BB=D0=B5=D1=82?= Date: Tue, 9 Jun 2026 16:44:32 +0600 Subject: [PATCH 4/5] test: migrate Android playgrounds to AGP 9 --- playground-apps/app-annotations/app/build.gradle.kts | 1 - playground-apps/app-annotations/build.gradle.kts | 1 - .../app-annotations/core/analytics/build.gradle.kts | 1 - playground-apps/app-annotations/core/common/build.gradle.kts | 1 - playground-apps/app-annotations/core/data/build.gradle.kts | 1 - .../app-annotations/core/database/build.gradle.kts | 1 - .../app-annotations/core/datastore/build.gradle.kts | 1 - playground-apps/app-annotations/core/domain/build.gradle.kts | 1 - playground-apps/app-annotations/core/model/build.gradle.kts | 1 - .../app-annotations/core/network/build.gradle.kts | 1 - .../app-annotations/core/notifications/build.gradle.kts | 1 - .../app-annotations/feature/bookmarks/build.gradle.kts | 1 - .../app-annotations/feature/detail/build.gradle.kts | 1 - .../app-annotations/feature/home/build.gradle.kts | 1 - .../app-annotations/feature/settings/build.gradle.kts | 1 - playground-apps/app-annotations/gradle/libs.versions.toml | 5 ++--- .../app-annotations/gradle/wrapper/gradle-wrapper.properties | 2 +- playground-apps/app-annotations/sync/work/build.gradle.kts | 1 - playground-apps/app-dsl/app/build.gradle.kts | 1 - playground-apps/app-dsl/build.gradle.kts | 1 - playground-apps/app-dsl/core/analytics/build.gradle.kts | 1 - playground-apps/app-dsl/core/common/build.gradle.kts | 1 - playground-apps/app-dsl/core/data/build.gradle.kts | 1 - playground-apps/app-dsl/core/database/build.gradle.kts | 1 - playground-apps/app-dsl/core/datastore/build.gradle.kts | 1 - playground-apps/app-dsl/core/domain/build.gradle.kts | 1 - playground-apps/app-dsl/core/model/build.gradle.kts | 1 - playground-apps/app-dsl/core/network/build.gradle.kts | 1 - playground-apps/app-dsl/core/notifications/build.gradle.kts | 1 - playground-apps/app-dsl/feature/bookmarks/build.gradle.kts | 1 - playground-apps/app-dsl/feature/detail/build.gradle.kts | 1 - playground-apps/app-dsl/feature/home/build.gradle.kts | 1 - playground-apps/app-dsl/feature/settings/build.gradle.kts | 1 - playground-apps/app-dsl/gradle/libs.versions.toml | 5 ++--- .../app-dsl/gradle/wrapper/gradle-wrapper.properties | 2 +- playground-apps/app-dsl/sync/work/build.gradle.kts | 1 - .../app-floor-2320/gradle/wrapper/gradle-wrapper.properties | 2 +- 37 files changed, 7 insertions(+), 41 deletions(-) diff --git a/playground-apps/app-annotations/app/build.gradle.kts b/playground-apps/app-annotations/app/build.gradle.kts index adb196f..2f18b72 100644 --- a/playground-apps/app-annotations/app/build.gradle.kts +++ b/playground-apps/app-annotations/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.koin.compiler) diff --git a/playground-apps/app-annotations/build.gradle.kts b/playground-apps/app-annotations/build.gradle.kts index 2e3dbd5..dce508b 100644 --- a/playground-apps/app-annotations/build.gradle.kts +++ b/playground-apps/app-annotations/build.gradle.kts @@ -1,7 +1,6 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false - alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.koin.compiler) apply false diff --git a/playground-apps/app-annotations/core/analytics/build.gradle.kts b/playground-apps/app-annotations/core/analytics/build.gradle.kts index 1c26576..a0cab5c 100644 --- a/playground-apps/app-annotations/core/analytics/build.gradle.kts +++ b/playground-apps/app-annotations/core/analytics/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-annotations/core/common/build.gradle.kts b/playground-apps/app-annotations/core/common/build.gradle.kts index 36668e1..c400445 100644 --- a/playground-apps/app-annotations/core/common/build.gradle.kts +++ b/playground-apps/app-annotations/core/common/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-annotations/core/data/build.gradle.kts b/playground-apps/app-annotations/core/data/build.gradle.kts index a78799e..218ae89 100644 --- a/playground-apps/app-annotations/core/data/build.gradle.kts +++ b/playground-apps/app-annotations/core/data/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-annotations/core/database/build.gradle.kts b/playground-apps/app-annotations/core/database/build.gradle.kts index c85843e..6b7e5ef 100644 --- a/playground-apps/app-annotations/core/database/build.gradle.kts +++ b/playground-apps/app-annotations/core/database/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) alias(libs.plugins.room) alias(libs.plugins.ksp) diff --git a/playground-apps/app-annotations/core/datastore/build.gradle.kts b/playground-apps/app-annotations/core/datastore/build.gradle.kts index f5076b2..61c3ce9 100644 --- a/playground-apps/app-annotations/core/datastore/build.gradle.kts +++ b/playground-apps/app-annotations/core/datastore/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-annotations/core/domain/build.gradle.kts b/playground-apps/app-annotations/core/domain/build.gradle.kts index 4d1d4d0..c2da763 100644 --- a/playground-apps/app-annotations/core/domain/build.gradle.kts +++ b/playground-apps/app-annotations/core/domain/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-annotations/core/model/build.gradle.kts b/playground-apps/app-annotations/core/model/build.gradle.kts index 423edab..deee68b 100644 --- a/playground-apps/app-annotations/core/model/build.gradle.kts +++ b/playground-apps/app-annotations/core/model/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) } android { diff --git a/playground-apps/app-annotations/core/network/build.gradle.kts b/playground-apps/app-annotations/core/network/build.gradle.kts index 2e8abf2..e115704 100644 --- a/playground-apps/app-annotations/core/network/build.gradle.kts +++ b/playground-apps/app-annotations/core/network/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-annotations/core/notifications/build.gradle.kts b/playground-apps/app-annotations/core/notifications/build.gradle.kts index 375db36..e4cc2af 100644 --- a/playground-apps/app-annotations/core/notifications/build.gradle.kts +++ b/playground-apps/app-annotations/core/notifications/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-annotations/feature/bookmarks/build.gradle.kts b/playground-apps/app-annotations/feature/bookmarks/build.gradle.kts index 161cc18..dfb4921 100644 --- a/playground-apps/app-annotations/feature/bookmarks/build.gradle.kts +++ b/playground-apps/app-annotations/feature/bookmarks/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-annotations/feature/detail/build.gradle.kts b/playground-apps/app-annotations/feature/detail/build.gradle.kts index c2979de..5bdd682 100644 --- a/playground-apps/app-annotations/feature/detail/build.gradle.kts +++ b/playground-apps/app-annotations/feature/detail/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-annotations/feature/home/build.gradle.kts b/playground-apps/app-annotations/feature/home/build.gradle.kts index 97371ee..f70262d 100644 --- a/playground-apps/app-annotations/feature/home/build.gradle.kts +++ b/playground-apps/app-annotations/feature/home/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-annotations/feature/settings/build.gradle.kts b/playground-apps/app-annotations/feature/settings/build.gradle.kts index 96e3a35..ccfe8ed 100644 --- a/playground-apps/app-annotations/feature/settings/build.gradle.kts +++ b/playground-apps/app-annotations/feature/settings/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-annotations/gradle/libs.versions.toml b/playground-apps/app-annotations/gradle/libs.versions.toml index 7c9b0dc..6b67c9f 100644 --- a/playground-apps/app-annotations/gradle/libs.versions.toml +++ b/playground-apps/app-annotations/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -agp = "8.13.2" +agp = "9.2.1" kotlin = "2.4.0" koin = "4.2.1" koin-plugin = "1.0.1" composeBom = "2026.03.00" navigation = "2.9.7" room = "2.8.4" -ksp = "2.3.3" +ksp = "2.3.9" datastore = "1.2.1" workmanager = "2.11.1" serialization = "1.10.0" @@ -56,7 +56,6 @@ kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx- [plugins] android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } koin-compiler = { id = "io.insert-koin.compiler.plugin", version.ref = "koin-plugin" } diff --git a/playground-apps/app-annotations/gradle/wrapper/gradle-wrapper.properties b/playground-apps/app-annotations/gradle/wrapper/gradle-wrapper.properties index 3ae1e2f..9937dae 100644 --- a/playground-apps/app-annotations/gradle/wrapper/gradle-wrapper.properties +++ b/playground-apps/app-annotations/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/playground-apps/app-annotations/sync/work/build.gradle.kts b/playground-apps/app-annotations/sync/work/build.gradle.kts index 8825d45..a22c030 100644 --- a/playground-apps/app-annotations/sync/work/build.gradle.kts +++ b/playground-apps/app-annotations/sync/work/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-dsl/app/build.gradle.kts b/playground-apps/app-dsl/app/build.gradle.kts index 8a27701..25b3bf9 100644 --- a/playground-apps/app-dsl/app/build.gradle.kts +++ b/playground-apps/app-dsl/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.koin.compiler) diff --git a/playground-apps/app-dsl/build.gradle.kts b/playground-apps/app-dsl/build.gradle.kts index 2e3dbd5..dce508b 100644 --- a/playground-apps/app-dsl/build.gradle.kts +++ b/playground-apps/app-dsl/build.gradle.kts @@ -1,7 +1,6 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false - alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.koin.compiler) apply false diff --git a/playground-apps/app-dsl/core/analytics/build.gradle.kts b/playground-apps/app-dsl/core/analytics/build.gradle.kts index 4328177..ffe7e76 100644 --- a/playground-apps/app-dsl/core/analytics/build.gradle.kts +++ b/playground-apps/app-dsl/core/analytics/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-dsl/core/common/build.gradle.kts b/playground-apps/app-dsl/core/common/build.gradle.kts index 0a3b243..ce815e1 100644 --- a/playground-apps/app-dsl/core/common/build.gradle.kts +++ b/playground-apps/app-dsl/core/common/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-dsl/core/data/build.gradle.kts b/playground-apps/app-dsl/core/data/build.gradle.kts index 226a98f..542c90c 100644 --- a/playground-apps/app-dsl/core/data/build.gradle.kts +++ b/playground-apps/app-dsl/core/data/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-dsl/core/database/build.gradle.kts b/playground-apps/app-dsl/core/database/build.gradle.kts index 9da8525..dc06dad 100644 --- a/playground-apps/app-dsl/core/database/build.gradle.kts +++ b/playground-apps/app-dsl/core/database/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) alias(libs.plugins.room) alias(libs.plugins.ksp) diff --git a/playground-apps/app-dsl/core/datastore/build.gradle.kts b/playground-apps/app-dsl/core/datastore/build.gradle.kts index ad9a090..0e05f37 100644 --- a/playground-apps/app-dsl/core/datastore/build.gradle.kts +++ b/playground-apps/app-dsl/core/datastore/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-dsl/core/domain/build.gradle.kts b/playground-apps/app-dsl/core/domain/build.gradle.kts index f1a1d79..e5d7ee6 100644 --- a/playground-apps/app-dsl/core/domain/build.gradle.kts +++ b/playground-apps/app-dsl/core/domain/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-dsl/core/model/build.gradle.kts b/playground-apps/app-dsl/core/model/build.gradle.kts index 423edab..deee68b 100644 --- a/playground-apps/app-dsl/core/model/build.gradle.kts +++ b/playground-apps/app-dsl/core/model/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) } android { diff --git a/playground-apps/app-dsl/core/network/build.gradle.kts b/playground-apps/app-dsl/core/network/build.gradle.kts index da280a5..35b7ccc 100644 --- a/playground-apps/app-dsl/core/network/build.gradle.kts +++ b/playground-apps/app-dsl/core/network/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-dsl/core/notifications/build.gradle.kts b/playground-apps/app-dsl/core/notifications/build.gradle.kts index c60d947..5f2847e 100644 --- a/playground-apps/app-dsl/core/notifications/build.gradle.kts +++ b/playground-apps/app-dsl/core/notifications/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-dsl/feature/bookmarks/build.gradle.kts b/playground-apps/app-dsl/feature/bookmarks/build.gradle.kts index 2046764..36cfc28 100644 --- a/playground-apps/app-dsl/feature/bookmarks/build.gradle.kts +++ b/playground-apps/app-dsl/feature/bookmarks/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-dsl/feature/detail/build.gradle.kts b/playground-apps/app-dsl/feature/detail/build.gradle.kts index 1450909..dcd995a 100644 --- a/playground-apps/app-dsl/feature/detail/build.gradle.kts +++ b/playground-apps/app-dsl/feature/detail/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-dsl/feature/home/build.gradle.kts b/playground-apps/app-dsl/feature/home/build.gradle.kts index 4d73317..e23d961 100644 --- a/playground-apps/app-dsl/feature/home/build.gradle.kts +++ b/playground-apps/app-dsl/feature/home/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-dsl/feature/settings/build.gradle.kts b/playground-apps/app-dsl/feature/settings/build.gradle.kts index daaa35c..8d68602 100644 --- a/playground-apps/app-dsl/feature/settings/build.gradle.kts +++ b/playground-apps/app-dsl/feature/settings/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-dsl/gradle/libs.versions.toml b/playground-apps/app-dsl/gradle/libs.versions.toml index 2dbc39c..5cea9fd 100644 --- a/playground-apps/app-dsl/gradle/libs.versions.toml +++ b/playground-apps/app-dsl/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -agp = "8.13.2" +agp = "9.2.1" kotlin = "2.4.0" koin = "4.2.1" koin-plugin = "1.0.1" composeBom = "2026.03.00" navigation = "2.9.7" room = "2.8.4" -ksp = "2.3.3" +ksp = "2.3.9" datastore = "1.2.1" workmanager = "2.11.1" serialization = "1.10.0" @@ -53,7 +53,6 @@ kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx- [plugins] android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } koin-compiler = { id = "io.insert-koin.compiler.plugin", version.ref = "koin-plugin" } diff --git a/playground-apps/app-dsl/gradle/wrapper/gradle-wrapper.properties b/playground-apps/app-dsl/gradle/wrapper/gradle-wrapper.properties index 3ae1e2f..9937dae 100644 --- a/playground-apps/app-dsl/gradle/wrapper/gradle-wrapper.properties +++ b/playground-apps/app-dsl/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/playground-apps/app-dsl/sync/work/build.gradle.kts b/playground-apps/app-dsl/sync/work/build.gradle.kts index 45af8cc..8db36c2 100644 --- a/playground-apps/app-dsl/sync/work/build.gradle.kts +++ b/playground-apps/app-dsl/sync/work/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.koin.compiler) } diff --git a/playground-apps/app-floor-2320/gradle/wrapper/gradle-wrapper.properties b/playground-apps/app-floor-2320/gradle/wrapper/gradle-wrapper.properties index 2a84e18..5dd3c01 100644 --- a/playground-apps/app-floor-2320/gradle/wrapper/gradle-wrapper.properties +++ b/playground-apps/app-floor-2320/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 39effda6f333e8b9ced02fe12b7efb58a9b4744f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=83=D1=80=D0=B0=D0=BA=D1=83=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=90=D0=B4=D0=B8=D0=BB=D0=B5=D1=82?= Date: Tue, 9 Jun 2026 16:44:48 +0600 Subject: [PATCH 5/5] docs: document Kotlin 2.4 compatibility --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4c5883e..f51ca0d 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ A native Kotlin Compiler Plugin for [Koin](https://insert-koin.io/) dependency i ```kotlin // build.gradle.kts plugins { - id("io.insert-koin.compiler.plugin") version "1.0.0" + id("io.insert-koin.compiler.plugin") version "1.0.1" } dependencies { @@ -90,7 +90,7 @@ koinCompiler { ## Compatibility - **Koin**: 4.2.0-RC1+ -- **Kotlin**: K2 compiler required (2.3.x+) +- **Kotlin**: K2 compiler required (2.3.20+), tested through 2.4.0 ## Documentation @@ -118,4 +118,4 @@ cd test-apps && ./gradlew :sample-app:jvmRun ## License -Apache 2.0 \ No newline at end of file +Apache 2.0