From 532dd384bafccfe786f2e3252e88442e856b339a Mon Sep 17 00:00:00 2001 From: Ralf Wondratschek Date: Wed, 7 Oct 2026 23:18:04 -0700 Subject: [PATCH] Upgrade KTFMT to 0.65 Upgrade the standalone formatter from `0.64` to `0.65`, published on `2026-10-07`, so local formatting and CI use the latest release. Apply its required formatting to tracked Kotlin files, including the blueprints. Preserve program behavior, string contents, Google style, and the exclusion of compiler-test fixtures. The release fixes formatting that needed a second pass for trailing-comma line overflow and chained scoping-function calls. It adds trailing commas to single-item multiline lists, selected-range formatting, native executables, destructuring-entry `val`/`var` support, and stdin EditorConfig lookup. The existing runner continues to use full-file formatting through the bundled JAR. See the [official release notes](https://github.com/Kotlin/ktfmt/releases/tag/v0.65) and [release comparison](https://github.com/Kotlin/ktfmt/compare/v0.64...v0.65). Update the download URL to the upstream `Kotlin/ktfmt` repository. The formatter packages and Maven group moved to `org.jetbrains.kotlinx.ktfmt` and `org.jetbrains.kotlinx`; this repository invokes the executable JAR and has no formatter API imports to migrate. The formatter still targets Java 17. Its bundled Kotlin compiler and standard library move from `2.3.20` to `2.4.10`, and its unused JNA dependency is removed. App Platform's published dependencies and minimum platform versions are unchanged. No publicly discoverable `0.65` regression report was found as of `2026-10-07` in the [target-version issue search](https://github.com/Kotlin/ktfmt/issues?q=is%3Aissue+%220.65%22). Confidence is limited because the release is new. [Issue #705](https://github.com/Kotlin/ktfmt/issues/705) confirms the release and notes that the IntelliJ plugin update will follow. Existing [issue #692](https://github.com/Kotlin/ktfmt/issues/692) concerns indentation of comments in conditions. The repository's formatter declaration history shows upgrades and the move to the standalone runner, with no KTFMT rollback found. --- .../ListDetailDesktopHeadlessTest.kt | 4 +- .../platform/listdetail/TemplateProvider.kt | 2 +- .../listdetail/TestAndroidApplication.kt | 2 +- .../platform/listdetail/AndroidApplication.kt | 2 +- .../listdetail/CharacterDetailPresenter.kt | 4 +- .../listdetail/CharacterListPresenter.kt | 2 +- .../listdetail/CharacterListRenderer.kt | 2 +- .../listdetail/CharacterSharedElementKey.kt | 2 +- .../listdetail/PhoneListDetailPresenter.kt | 10 ++-- .../listdetail/TabletListDetailPresenter.kt | 2 +- .../listdetail/ListDetailPresenterImplTest.kt | 6 +-- .../DefaultBackstackRenderer.kt | 2 +- .../DefaultBackstackModel.kt | 2 +- .../listdetail/templates/AppTemplate.kt | 2 +- .../templates/AppTemplatePresenter.kt | 2 +- .../app/platform/template/TemplateProvider.kt | 2 +- .../platform/template/AndroidApplication.kt | 2 +- .../navigation/NavigationHeaderRenderer.kt | 2 +- .../navigation/FakeExampleRepository.kt | 2 +- .../template/templates/AppTemplate.kt | 2 +- .../buildsrc/AndroidInstrumentedTests.kt | 2 +- .../gradle/buildsrc/AppPlatformExtension.kt | 2 +- .../platform/gradle/buildsrc/KmpAppPlugin.kt | 2 +- .../app/platform/gradle/buildsrc/KmpPlugin.kt | 2 +- .../app/platform/gradle/buildsrc/Platform.kt | 4 +- .../app/platform/gradle/buildsrc/SdkPlugin.kt | 2 +- .../platform/inject/robot/ContributesRobot.kt | 2 +- .../platform/gradle/AppPlatformExtension.kt | 6 +-- .../ModuleStructureDependencyCheckTask.kt | 12 ++--- .../gradle/ModuleStructureNestingCheckTask.kt | 6 +-- .../gradle/AppPlatformExtensionTest.kt | 6 +-- .../ralf/app/platform/gradle/FakePlugins.kt | 2 +- ...uleStructureNestingCheckIntegrationTest.kt | 10 ++-- .../ModuleStructureNestingCheckTaskTest.kt | 4 +- .../gradle/ModuleStructurePluginTest.kt | 8 +-- gradle/libs.versions.toml | 2 +- .../software/ralf/app/platform/inject/Util.kt | 4 +- .../processor/ContributesBindingProcessor.kt | 8 +-- .../ContributesBindingScopedProcessor.kt | 10 ++-- .../processor/ContributesMockImplProcessor.kt | 16 +++--- .../processor/ContributesRealImplProcessor.kt | 14 +++--- .../processor/ContributesRendererProcessor.kt | 18 +++---- .../processor/ContributesRobotProcessor.kt | 12 ++--- .../app/platform/inject/CommonSourceCode.kt | 6 ++- .../ralf/app/platform/inject/Compilation.kt | 2 +- .../ContributesBindingProcessorTest.kt | 16 +++--- .../ContributesBindingScopedProcessorTest.kt | 24 +++++---- .../ContributesMockImplGeneratorTest.kt | 50 +++++++++---------- .../ContributesRealImplGeneratorTest.kt | 24 ++++----- .../ContributesRendererProcessorTest.kt | 38 +++++++------- .../ContributesRobotGeneratorTest.kt | 22 ++++---- .../AppScopeCoroutineScopeComponent.kt | 4 +- .../app/platform/scope/di/ComponentService.kt | 2 +- .../platform/scope/di/ComponentServiceTest.kt | 2 +- .../ralf/app/platform/ksp/ContextAware.kt | 4 +- ktfmt.sh | 2 +- .../software/ralf/app/platform/metro/Util.kt | 4 +- .../processor/ContributesRendererProcessor.kt | 16 +++--- .../processor/ContributesRobotProcessor.kt | 10 ++-- .../processor/ContributesScopedProcessor.kt | 16 +++--- .../app/platform/inject/metro/Compilation.kt | 2 +- .../ContributesRendererProcessorTest.kt | 42 +++++++++------- .../ContributesRobotGeneratorTest.kt | 18 +++---- .../ContributesScopedProcessorTest.kt | 32 ++++++------ ...MetroExtensionsPluginComponentRegistrar.kt | 2 +- .../platform/metro/compiler/fir/FirHelpers.kt | 4 +- .../renderer/ContributesRendererFir.kt | 6 +-- .../ContributesRendererIrExtension.kt | 4 +- .../renderer/ContributesRendererSupport.kt | 6 +-- .../compiler/robot/ContributesRobotFir.kt | 8 +-- .../compiler/robot/ContributesRobotIds.kt | 2 +- .../robot/ContributesRobotMetroExtension.kt | 2 +- .../compiler/scoped/ContributesScopedFir.kt | 10 ++-- .../compiler/support/UnusedRendererFactory.kt | 2 +- .../metro/AppScopeCoroutineScopeGraph.kt | 4 +- .../inject/metro/ContributesScoped.kt | 2 +- .../platform/scope/di/metro/MetroService.kt | 2 +- .../scope/di/metro/MetroServiceTest.kt | 2 +- .../nav3/PresenterBackstackScopeImpl.kt | 2 +- .../nav3/PresenterBackstackScopeTest.kt | 4 +- .../nav3/FakePresenterBackstackScope.kt | 4 +- .../TestPresenterBackstackScopePresenter.kt | 2 +- .../AndroidComposePresenterScopeFactory.kt | 4 +- .../compose/KotlinInjectInjectionTest.kt | 4 +- .../presenter/compose/MetroInjectionTest.kt | 4 +- .../DesktopComposePresenterScopeFactory.kt | 4 +- .../IosComposePresenterScopeFactory.kt | 4 +- .../LinuxComposePresenterScopeFactory.kt | 4 +- .../WasmJsComposePresenterScopeFactory.kt | 4 +- .../saveable/ReturningSaveableStateHolder.kt | 4 +- ...ommonBackGestureDispatcherPresenterTest.kt | 6 +-- .../ReturningSaveableStateHolderTest.kt | 2 +- .../compose/TestComposePresenterScope.kt | 2 +- .../TestBackGestureDispatcherPresenter.kt | 4 +- .../TestBackGestureDispatcherPresenterTest.kt | 6 +-- .../platform/presenter/template/Template.kt | 2 +- .../backstack/CrossSlideBackstackPresenter.kt | 2 +- .../backstack/CrossSlideBackstackRenderer.kt | 2 +- .../recipes/landing/LandingPresenter.kt | 2 +- .../recipes/template/RootPresenter.kt | 2 +- .../recipes/template/RootPresenterRenderer.kt | 2 +- .../renderer/AndroidRendererFactoryTest.kt | 2 +- .../RecyclerViewViewHolderRendererTest.kt | 4 +- .../BackGestureDispatcherPresenterAndroid.kt | 4 +- .../RecyclerViewViewHolderRenderer.kt | 2 +- .../app/platform/renderer/ViewRenderer.kt | 2 +- .../template/AndroidTemplateRenderer.kt | 2 +- ...dBackPressEventsToPresentersComposeTest.kt | 4 +- ...ComposeAndroidRendererFactoryDeviceTest.kt | 4 +- .../ComposeAndroidRendererFactoryTest.kt | 4 +- .../AndroidViewWithinComposeRenderer.kt | 4 +- .../renderer/ComposeAndroidRendererFactory.kt | 2 +- .../BackGestureDispatcherPresenterCompose.kt | 2 +- .../renderer/ComposeRendererFactory.kt | 4 +- .../text/PresenterBackedTextFieldState.kt | 2 +- .../renderer/ComposeRendererFactoryTest.kt | 6 +-- .../renderer/LocalRendererFactoryTest.kt | 4 +- .../platform/renderer/BaseRendererFactory.kt | 2 +- .../renderer/BaseRendererFactoryTest.kt | 6 +-- .../platform/robot/internal/RootScopeTest.kt | 2 +- .../ralf/app/platform/robot/WaiterTest.kt | 2 +- .../ralf/app/platform/robot/RobotTest.kt | 6 +-- .../app/platform/sample/TemplateProvider.kt | 2 +- .../ComposeSampleAppTemplateRenderer.kt | 2 +- .../sample/template/SampleAppTemplate.kt | 2 +- .../template/SampleAppTemplatePresenter.kt | 4 +- .../app/platform/sample/user/UserGraph.kt | 4 +- .../sample/user/UserPagePresenterImpl.kt | 2 +- .../sample/user/UserPagePresenterImplTest.kt | 2 +- .../software/ralf/app/platform/scope/Scope.kt | 2 +- .../scope/coroutine/CoroutineScopeScoped.kt | 2 +- .../scope/coroutine/RegistrationDispatcher.kt | 2 +- .../coroutine/CoroutineScopeScopedTest.kt | 4 +- .../scope/coroutine/ScopeRegistrationTest.kt | 20 ++++---- 134 files changed, 402 insertions(+), 394 deletions(-) diff --git a/blueprints/list-detail/app-framework/impl-ui-test-robots/src/desktopTest/kotlin/software/ralf/app/platform/listdetail/ListDetailDesktopHeadlessTest.kt b/blueprints/list-detail/app-framework/impl-ui-test-robots/src/desktopTest/kotlin/software/ralf/app/platform/listdetail/ListDetailDesktopHeadlessTest.kt index 17aa0f0f..c506d73f 100644 --- a/blueprints/list-detail/app-framework/impl-ui-test-robots/src/desktopTest/kotlin/software/ralf/app/platform/listdetail/ListDetailDesktopHeadlessTest.kt +++ b/blueprints/list-detail/app-framework/impl-ui-test-robots/src/desktopTest/kotlin/software/ralf/app/platform/listdetail/ListDetailDesktopHeadlessTest.kt @@ -68,7 +68,7 @@ class ListDetailDesktopHeadlessTest { } private suspend fun ReceiveTurbine.awaitPhoneBackstack( - size: Int + size: Int, ): DefaultBackstackModel { while (true) { val template = requireInstance(awaitItem()) @@ -83,7 +83,7 @@ class ListDetailDesktopHeadlessTest { } private suspend fun ReceiveTurbine.awaitTabletContent( - selectedCharacterId: String? = null + selectedCharacterId: String? = null, ): TabletListDetailPresenter.Model.Content { while (true) { val template = requireInstance(awaitItem()) diff --git a/blueprints/list-detail/app-framework/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/TemplateProvider.kt b/blueprints/list-detail/app-framework/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/TemplateProvider.kt index 1551f66b..b6fa0069 100644 --- a/blueprints/list-detail/app-framework/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/TemplateProvider.kt +++ b/blueprints/list-detail/app-framework/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/TemplateProvider.kt @@ -50,7 +50,7 @@ class TemplateProvider( /** Creates a provider with a fresh Compose presenter scope that it can cancel independently. */ fun createTemplateProvider(): TemplateProvider { return templateProviderFactory.create( - composePresenterScopeFactory.createComposePresenterScope() + composePresenterScopeFactory.createComposePresenterScope(), ) } } diff --git a/blueprints/list-detail/app/android/src/androidTest/kotlin/software/ralf/app/platform/listdetail/TestAndroidApplication.kt b/blueprints/list-detail/app/android/src/androidTest/kotlin/software/ralf/app/platform/listdetail/TestAndroidApplication.kt index c3a7eae0..a6ceee3f 100644 --- a/blueprints/list-detail/app/android/src/androidTest/kotlin/software/ralf/app/platform/listdetail/TestAndroidApplication.kt +++ b/blueprints/list-detail/app/android/src/androidTest/kotlin/software/ralf/app/platform/listdetail/TestAndroidApplication.kt @@ -5,7 +5,7 @@ import dev.zacsweers.metro.createGraphFactory /** Android test application that installs the graph containing integration-test robots. */ class TestAndroidApplication : AndroidApplication() { override fun metroGraph( - listDetailApplication: software.ralf.app.platform.listdetail.Application + listDetailApplication: software.ralf.app.platform.listdetail.Application, ): AppGraph { return createGraphFactory().create(this, listDetailApplication) } diff --git a/blueprints/list-detail/app/android/src/main/kotlin/software/ralf/app/platform/listdetail/AndroidApplication.kt b/blueprints/list-detail/app/android/src/main/kotlin/software/ralf/app/platform/listdetail/AndroidApplication.kt index 5fb7135f..55e71da3 100644 --- a/blueprints/list-detail/app/android/src/main/kotlin/software/ralf/app/platform/listdetail/AndroidApplication.kt +++ b/blueprints/list-detail/app/android/src/main/kotlin/software/ralf/app/platform/listdetail/AndroidApplication.kt @@ -19,7 +19,7 @@ open class AndroidApplication : Application(), RootScopeProvider { /** Creates the production graph. Tests can override this to install a test graph. */ protected open fun metroGraph( - listDetailApplication: software.ralf.app.platform.listdetail.Application + listDetailApplication: software.ralf.app.platform.listdetail.Application, ): AppGraph { return createGraphFactory().create(this, listDetailApplication) } diff --git a/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterDetailPresenter.kt b/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterDetailPresenter.kt index 7bddc373..5c29f9ef 100644 --- a/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterDetailPresenter.kt +++ b/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterDetailPresenter.kt @@ -56,13 +56,13 @@ class CharacterDetailPresenter( /** The requested character is present in the latest repository value. */ data class Available( /** Character rendered by the detail screen. */ - val character: Character + val character: Character, ) : State /** The requested character is no longer present in the repository. */ data class Missing( /** Identifier that could not be resolved. */ - val characterId: String + val characterId: String, ) : State } diff --git a/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterListPresenter.kt b/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterListPresenter.kt index abbe2243..5c8855f4 100644 --- a/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterListPresenter.kt +++ b/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterListPresenter.kt @@ -24,7 +24,7 @@ class CharacterListPresenter(private val repository: CharacterRepository) : /** Selection owned by the parent phone or tablet presenter. */ data class Input( /** Identifier highlighted by the list renderer, or `null` when nothing is selected. */ - val selectedCharacterId: String? + val selectedCharacterId: String?, ) /** diff --git a/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterListRenderer.kt b/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterListRenderer.kt index 4c501e22..de7bda09 100644 --- a/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterListRenderer.kt +++ b/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterListRenderer.kt @@ -114,7 +114,7 @@ class CharacterListRenderer : ComposeRenderer() { AppTheme.colorScheme.secondaryContainer } else { AppTheme.colorScheme.surface - } + }, ), modifier = Modifier.selectable(selected = selected, onClick = onClick) diff --git a/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterSharedElementKey.kt b/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterSharedElementKey.kt index b4dab1b6..0e8eb07c 100644 --- a/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterSharedElementKey.kt +++ b/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/CharacterSharedElementKey.kt @@ -55,7 +55,7 @@ internal fun Modifier.sharedCharacterBounds( sharedBounds( sharedContentState = rememberSharedContentState( - key = CharacterSharedElementKey(characterId = characterId, element = element) + key = CharacterSharedElementKey(characterId = characterId, element = element), ), animatedVisibilityScope = animatedVisibilityScope, ) diff --git a/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/PhoneListDetailPresenter.kt b/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/PhoneListDetailPresenter.kt index f4e0cfbd..56954b8e 100644 --- a/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/PhoneListDetailPresenter.kt +++ b/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/PhoneListDetailPresenter.kt @@ -43,12 +43,12 @@ class PhoneListDetailPresenter( @Composable private fun presentListModel( - selectionState: ListDetailSelectionState + selectionState: ListDetailSelectionState, ): CharacterListPresenter.Model { val backstackScope = LocalBackstackScope.requireNotNull() val listModel = listPresenter.present( - CharacterListPresenter.Input(selectedCharacterId = selectionState.selectedCharacterId) + CharacterListPresenter.Input(selectedCharacterId = selectionState.selectedCharacterId), ) return listModel.copy( @@ -58,16 +58,16 @@ class PhoneListDetailPresenter( detailPresenterFactory.createCharacterDetailPresenter( characterId = character.id, showBackButton = true, - ) + ), ) - } + }, ) } /** State supplied by the adaptive parent so selection survives layout changes. */ data class Input( /** Shared character selection state. */ - val selectionState: ListDetailSelectionState + val selectionState: ListDetailSelectionState, ) /** Delegates rendering to App Platform's presenter-backstack model. */ diff --git a/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/TabletListDetailPresenter.kt b/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/TabletListDetailPresenter.kt index aaa6975c..83201678 100644 --- a/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/TabletListDetailPresenter.kt +++ b/blueprints/list-detail/list-detail/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/TabletListDetailPresenter.kt @@ -64,7 +64,7 @@ class TabletListDetailPresenter( /** State supplied by the adaptive parent so selection survives layout changes. */ data class Input( /** Shared character selection state. */ - val selectionState: ListDetailSelectionState + val selectionState: ListDetailSelectionState, ) /** States understood by the tablet renderer. */ diff --git a/blueprints/list-detail/list-detail/impl/src/commonTest/kotlin/software/ralf/app/platform/listdetail/ListDetailPresenterImplTest.kt b/blueprints/list-detail/list-detail/impl/src/commonTest/kotlin/software/ralf/app/platform/listdetail/ListDetailPresenterImplTest.kt index 447f958d..7a6a0315 100644 --- a/blueprints/list-detail/list-detail/impl/src/commonTest/kotlin/software/ralf/app/platform/listdetail/ListDetailPresenterImplTest.kt +++ b/blueprints/list-detail/list-detail/impl/src/commonTest/kotlin/software/ralf/app/platform/listdetail/ListDetailPresenterImplTest.kt @@ -187,7 +187,7 @@ class ListDetailPresenterImplTest { } private fun detailPresenterFactory( - repository: CharacterRepository + repository: CharacterRepository, ): CharacterDetailPresenter.Factory { return object : CharacterDetailPresenter.Factory { override fun createCharacterDetailPresenter( @@ -230,7 +230,7 @@ class ListDetailPresenterImplTest { } private suspend fun ReceiveTurbine.awaitTabletModel( - selectedCharacterId: String? = null + selectedCharacterId: String? = null, ): TabletListDetailPresenter.Model { while (true) { val model = awaitItem().delegatedModel() @@ -245,7 +245,7 @@ class ListDetailPresenterImplTest { } private suspend fun ReceiveTurbine.awaitTabletContent( - selectedCharacterId: String? = null + selectedCharacterId: String? = null, ): TabletListDetailPresenter.Model.Content { while (true) { val model = awaitItem().delegatedModel() diff --git a/blueprints/list-detail/presenter-navigation/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/presenternavigation/DefaultBackstackRenderer.kt b/blueprints/list-detail/presenter-navigation/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/presenternavigation/DefaultBackstackRenderer.kt index 20dc51fb..bbf93b37 100644 --- a/blueprints/list-detail/presenter-navigation/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/presenternavigation/DefaultBackstackRenderer.kt +++ b/blueprints/list-detail/presenter-navigation/impl/src/commonMain/kotlin/software/ralf/app/platform/listdetail/presenternavigation/DefaultBackstackRenderer.kt @@ -24,7 +24,7 @@ class DefaultBackstackRenderer : PresenterBackstackRenderer + initialPresenter: ComposePresenter, ): DefaultBackstackModel { return presenterBackstack(initialPresenter) { backstack -> DefaultBackstackModel(backstack = backstack, onBack = { pop() }) diff --git a/blueprints/list-detail/templates/public/src/commonMain/kotlin/software/ralf/app/platform/listdetail/templates/AppTemplate.kt b/blueprints/list-detail/templates/public/src/commonMain/kotlin/software/ralf/app/platform/listdetail/templates/AppTemplate.kt index 60f5294c..387f5d7d 100644 --- a/blueprints/list-detail/templates/public/src/commonMain/kotlin/software/ralf/app/platform/listdetail/templates/AppTemplate.kt +++ b/blueprints/list-detail/templates/public/src/commonMain/kotlin/software/ralf/app/platform/listdetail/templates/AppTemplate.kt @@ -13,7 +13,7 @@ sealed interface AppTemplate : Template { /** Template that delegates the entire available window to one feature model. */ data class FullScreenTemplate( /** Feature model resolved through the platform's renderer factory. */ - val model: BaseModel + val model: BaseModel, ) : AppTemplate } diff --git a/blueprints/list-detail/templates/public/src/commonMain/kotlin/software/ralf/app/platform/listdetail/templates/AppTemplatePresenter.kt b/blueprints/list-detail/templates/public/src/commonMain/kotlin/software/ralf/app/platform/listdetail/templates/AppTemplatePresenter.kt index 06f5c63a..fa1ae010 100644 --- a/blueprints/list-detail/templates/public/src/commonMain/kotlin/software/ralf/app/platform/listdetail/templates/AppTemplatePresenter.kt +++ b/blueprints/list-detail/templates/public/src/commonMain/kotlin/software/ralf/app/platform/listdetail/templates/AppTemplatePresenter.kt @@ -23,7 +23,7 @@ class AppTemplatePresenter( @Composable override fun present(input: Unit): AppTemplate { return withCompositionLocal( - LocalBackGestureDispatcherPresenter provides backGestureDispatcherPresenter + LocalBackGestureDispatcherPresenter provides backGestureDispatcherPresenter, ) { rootPresenter.present(Unit).toAppTemplate() } diff --git a/blueprints/starter/app-framework/impl/src/commonMain/kotlin/software/ralf/app/platform/template/TemplateProvider.kt b/blueprints/starter/app-framework/impl/src/commonMain/kotlin/software/ralf/app/platform/template/TemplateProvider.kt index a074a715..51bd4940 100644 --- a/blueprints/starter/app-framework/impl/src/commonMain/kotlin/software/ralf/app/platform/template/TemplateProvider.kt +++ b/blueprints/starter/app-framework/impl/src/commonMain/kotlin/software/ralf/app/platform/template/TemplateProvider.kt @@ -62,7 +62,7 @@ class TemplateProvider( */ fun createTemplateProvider(): TemplateProvider { return templateProviderFactory.create( - composePresenterScopeFactory.createComposePresenterScope() + composePresenterScopeFactory.createComposePresenterScope(), ) } } diff --git a/blueprints/starter/app/android/src/main/kotlin/software/ralf/app/platform/template/AndroidApplication.kt b/blueprints/starter/app/android/src/main/kotlin/software/ralf/app/platform/template/AndroidApplication.kt index f7b7d735..e0f704fa 100644 --- a/blueprints/starter/app/android/src/main/kotlin/software/ralf/app/platform/template/AndroidApplication.kt +++ b/blueprints/starter/app/android/src/main/kotlin/software/ralf/app/platform/template/AndroidApplication.kt @@ -22,7 +22,7 @@ open class AndroidApplication : Application(), RootScopeProvider { /** Create the [AppGraph]. In UI tests we use a different instance. */ protected open fun metroGraph( - templateApplication: software.ralf.app.platform.template.Application + templateApplication: software.ralf.app.platform.template.Application, ): AppGraph { return createGraphFactory().create(this, templateApplication) } diff --git a/blueprints/starter/navigation/impl/src/commonMain/kotlin/software/ralf/app/platform/template/navigation/NavigationHeaderRenderer.kt b/blueprints/starter/navigation/impl/src/commonMain/kotlin/software/ralf/app/platform/template/navigation/NavigationHeaderRenderer.kt index 9bcf3b52..ad5a806b 100644 --- a/blueprints/starter/navigation/impl/src/commonMain/kotlin/software/ralf/app/platform/template/navigation/NavigationHeaderRenderer.kt +++ b/blueprints/starter/navigation/impl/src/commonMain/kotlin/software/ralf/app/platform/template/navigation/NavigationHeaderRenderer.kt @@ -62,7 +62,7 @@ class NavigationHeaderRenderer : ComposeRenderer() { Spacer( modifier = - Modifier.fillMaxWidth().height(1.dp).background(MaterialTheme.colorScheme.primary) + Modifier.fillMaxWidth().height(1.dp).background(MaterialTheme.colorScheme.primary), ) } } diff --git a/blueprints/starter/navigation/testing/src/commonMain/kotlin/software/ralf/app/platform/template/navigation/FakeExampleRepository.kt b/blueprints/starter/navigation/testing/src/commonMain/kotlin/software/ralf/app/platform/template/navigation/FakeExampleRepository.kt index 230dddc1..87521cf5 100644 --- a/blueprints/starter/navigation/testing/src/commonMain/kotlin/software/ralf/app/platform/template/navigation/FakeExampleRepository.kt +++ b/blueprints/starter/navigation/testing/src/commonMain/kotlin/software/ralf/app/platform/template/navigation/FakeExampleRepository.kt @@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.MutableStateFlow * This class is part of the `:testing` module and shared with other modules. */ class FakeExampleRepository( - override val exampleStateFlow: MutableStateFlow = MutableStateFlow(0) + override val exampleStateFlow: MutableStateFlow = MutableStateFlow(0), ) : ExampleRepository { override fun setExampleFlowValue(value: Int) { diff --git a/blueprints/starter/templates/public/src/commonMain/kotlin/software/ralf/app/platform/template/templates/AppTemplate.kt b/blueprints/starter/templates/public/src/commonMain/kotlin/software/ralf/app/platform/template/templates/AppTemplate.kt index 7b37640f..2844a918 100644 --- a/blueprints/starter/templates/public/src/commonMain/kotlin/software/ralf/app/platform/template/templates/AppTemplate.kt +++ b/blueprints/starter/templates/public/src/commonMain/kotlin/software/ralf/app/platform/template/templates/AppTemplate.kt @@ -8,7 +8,7 @@ sealed interface AppTemplate : Template { /** A template that hosts a single model, which should rendered as full-screen element. */ data class FullScreenTemplate( /** The model to be rendered fullscreen. */ - val model: BaseModel + val model: BaseModel, ) : AppTemplate data class HeaderDetailTemplate(val header: BaseModel, val detail: BaseModel) : AppTemplate diff --git a/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/AndroidInstrumentedTests.kt b/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/AndroidInstrumentedTests.kt index cccb6f55..a858fadb 100644 --- a/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/AndroidInstrumentedTests.kt +++ b/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/AndroidInstrumentedTests.kt @@ -8,7 +8,7 @@ internal const val ANDROID_TEST_EXECUTION = "ANDROIDX_TEST_ORCHESTRATOR" internal val ANDROID_TEST_INSTRUMENTATION_RUNNER_ARGUMENTS = mapOf("clearPackageData" to "true") internal fun Project.configureAppPlatformInstrumentedTests( - implementationConfigurationName: String + implementationConfigurationName: String, ) { releaseTask.configure { it.dependsOn("emulatorCheck") } diff --git a/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/AppPlatformExtension.kt b/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/AppPlatformExtension.kt index 5183e8b2..d47a846d 100644 --- a/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/AppPlatformExtension.kt +++ b/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/AppPlatformExtension.kt @@ -94,7 +94,7 @@ constructor(objects: ObjectFactory, private val project: Project) { .convention( project.provider { project.ci || project.gradle.taskGraph.hasTask("${project.path}:release") - } + }, ) public fun kotlinWarningsAsErrors(enabled: Boolean) { diff --git a/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/KmpAppPlugin.kt b/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/KmpAppPlugin.kt index 9fa9b6c4..79d7c17d 100644 --- a/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/KmpAppPlugin.kt +++ b/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/KmpAppPlugin.kt @@ -80,7 +80,7 @@ internal fun Project.allExportedDependencies(): Set { .filter { it.subprojects.isEmpty() } .filter { it.appOrNull == null } .filter { !it.isRobotsModule() && !it.isTestingModule() && !it.isAppModule() } - .map { dependencies.project(it.path) } + .map { dependencies.project(it.path) }, ) } diff --git a/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/KmpPlugin.kt b/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/KmpPlugin.kt index 1ada3a96..555873d0 100644 --- a/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/KmpPlugin.kt +++ b/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/KmpPlugin.kt @@ -192,7 +192,7 @@ public open class KmpPlugin : Plugin { implementation(libs.findLibrary("kotlin.inject.runtime").get().get().toString()) implementation(libs.findLibrary("kotlin.inject.anvil.runtime").get().get().toString()) implementation( - libs.findLibrary("kotlin.inject.anvil.runtime.optional").get().get().toString() + libs.findLibrary("kotlin.inject.anvil.runtime.optional").get().get().toString(), ) if (path != ":di-common:public" && path != ":kotlin-inject:public") { diff --git a/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/Platform.kt b/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/Platform.kt index eaed72c1..57a4e92e 100644 --- a/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/Platform.kt +++ b/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/Platform.kt @@ -93,14 +93,14 @@ internal sealed interface Platform { project.kmpExtension.sourceSets.getByName("desktopMain").dependencies { implementation( - "org.jetbrains.compose.desktop:desktop-jvm-${currentOsTarget()}:$composeVersion" + "org.jetbrains.compose.desktop:desktop-jvm-${currentOsTarget()}:$composeVersion", ) } project.kmpExtension.sourceSets.getByName("desktopTest").dependencies { implementation("org.jetbrains.compose.ui:ui-test-junit4:$composeVersion") implementation( - "org.jetbrains.compose.desktop:desktop-jvm-${currentOsTarget()}:$composeVersion" + "org.jetbrains.compose.desktop:desktop-jvm-${currentOsTarget()}:$composeVersion", ) } } diff --git a/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/SdkPlugin.kt b/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/SdkPlugin.kt index 6097cb64..f3e666f4 100644 --- a/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/SdkPlugin.kt +++ b/buildSrc/src/main/kotlin/software/ralf/app/platform/gradle/buildsrc/SdkPlugin.kt @@ -43,7 +43,7 @@ internal object SdkPlugin { "App Platform ${ artifactId.split('-') .joinToString(separator = " ", prefix = "", postfix = "") { it.capitalize() } - }" + }", ) } } diff --git a/di-common/public/src/commonMain/kotlin/software/ralf/app/platform/inject/robot/ContributesRobot.kt b/di-common/public/src/commonMain/kotlin/software/ralf/app/platform/inject/robot/ContributesRobot.kt index 925faef6..e0c674cc 100644 --- a/di-common/public/src/commonMain/kotlin/software/ralf/app/platform/inject/robot/ContributesRobot.kt +++ b/di-common/public/src/commonMain/kotlin/software/ralf/app/platform/inject/robot/ContributesRobot.kt @@ -30,5 +30,5 @@ import software.amazon.lastmile.kotlin.inject.anvil.extend.ContributingAnnotatio @ContributingAnnotation public annotation class ContributesRobot( /** The scope in which to include this contributed binding. */ - val scope: KClass<*> + val scope: KClass<*>, ) diff --git a/gradle-plugin/plugin/src/main/kotlin/software/ralf/app/platform/gradle/AppPlatformExtension.kt b/gradle-plugin/plugin/src/main/kotlin/software/ralf/app/platform/gradle/AppPlatformExtension.kt index 8b9879c8..98346899 100644 --- a/gradle-plugin/plugin/src/main/kotlin/software/ralf/app/platform/gradle/AppPlatformExtension.kt +++ b/gradle-plugin/plugin/src/main/kotlin/software/ralf/app/platform/gradle/AppPlatformExtension.kt @@ -271,11 +271,11 @@ private fun Project.enableKotlinInject() { implementation("$APP_PLATFORM_GROUP:kotlin-inject-public:$APP_PLATFORM_VERSION") implementation("$APP_PLATFORM_GROUP:kotlin-inject-contribute-public:$APP_PLATFORM_VERSION") implementation( - "software.amazon.lastmile.kotlin.inject.anvil:runtime:$KOTLIN_INJECT_ANVIL_VERSION" + "software.amazon.lastmile.kotlin.inject.anvil:runtime:$KOTLIN_INJECT_ANVIL_VERSION", ) implementation( "software.amazon.lastmile.kotlin.inject.anvil:runtime-optional:" + - KOTLIN_INJECT_ANVIL_VERSION + KOTLIN_INJECT_ANVIL_VERSION, ) } @@ -477,7 +477,7 @@ private fun Project.enableComposeUi() { implementation("org.jetbrains.compose.runtime:runtime:$COMPOSE_MULTIPLATFORM_VERSION") implementation( - "$APP_PLATFORM_GROUP:renderer-compose-multiplatform-public:$APP_PLATFORM_VERSION" + "$APP_PLATFORM_GROUP:renderer-compose-multiplatform-public:$APP_PLATFORM_VERSION", ) if (isRobotsModule()) { diff --git a/gradle-plugin/plugin/src/main/kotlin/software/ralf/app/platform/gradle/ModuleStructureDependencyCheckTask.kt b/gradle-plugin/plugin/src/main/kotlin/software/ralf/app/platform/gradle/ModuleStructureDependencyCheckTask.kt index a4cf6708..07560a3d 100644 --- a/gradle-plugin/plugin/src/main/kotlin/software/ralf/app/platform/gradle/ModuleStructureDependencyCheckTask.kt +++ b/gradle-plugin/plugin/src/main/kotlin/software/ralf/app/platform/gradle/ModuleStructureDependencyCheckTask.kt @@ -83,7 +83,7 @@ public abstract class ModuleStructureDependencyCheckTask : DefaultTask() { throw GradleException( ":public modules are only allowed to depend on other :public modules. " + "Remove the dependencies: ${forbiddenDependencies.joinToString()} " + - "from $modulePath." + "from $modulePath.", ) } } @@ -102,7 +102,7 @@ public abstract class ModuleStructureDependencyCheckTask : DefaultTask() { throw GradleException( "No module except for an app module is allowed to import an :impl module. " + "Remove the dependencies: ${forbiddenDependencies.joinToString()} " + - "from $modulePath." + "from $modulePath.", ) } } @@ -116,7 +116,7 @@ public abstract class ModuleStructureDependencyCheckTask : DefaultTask() { throw GradleException( "Testing modules should be added to the test compile classpath, otherwise " + "they're included in the final app. Remove the dependencies: " + - "${forbiddenDependencies.joinToString()} from $modulePath." + "${forbiddenDependencies.joinToString()} from $modulePath.", ) } } @@ -128,7 +128,7 @@ public abstract class ModuleStructureDependencyCheckTask : DefaultTask() { throw GradleException( "Robot modules should be added to the instrumented test compile classpath, " + "otherwise they're included in the final app. Remove the dependencies: " + - "${forbiddenDependencies.joinToString()} from $modulePath." + "${forbiddenDependencies.joinToString()} from $modulePath.", ) } } @@ -153,7 +153,7 @@ public abstract class ModuleStructureDependencyCheckTask : DefaultTask() { throw GradleException( "Internal modules can only be imported within the same library or by app " + "modules, but not from another library. Remove the dependencies: " + - "${forbiddenDependencies.joinToString()} from $modulePath." + "${forbiddenDependencies.joinToString()} from $modulePath.", ) } } @@ -207,7 +207,7 @@ public abstract class ModuleStructureDependencyCheckTask : DefaultTask() { ) task.modulePath = path task.allowLibraryImplToImplDependencies.set( - appPlatform.moduleStructureOptions().isLibraryImplToImplDependenciesAllowed() + appPlatform.moduleStructureOptions().isLibraryImplToImplDependenciesAllowed(), ) task.testFixtures.set(isTestFixtures) task.testCompilation.set(isTestCompilation) diff --git a/gradle-plugin/plugin/src/main/kotlin/software/ralf/app/platform/gradle/ModuleStructureNestingCheckTask.kt b/gradle-plugin/plugin/src/main/kotlin/software/ralf/app/platform/gradle/ModuleStructureNestingCheckTask.kt index 6d3e01c1..dc92b848 100644 --- a/gradle-plugin/plugin/src/main/kotlin/software/ralf/app/platform/gradle/ModuleStructureNestingCheckTask.kt +++ b/gradle-plugin/plugin/src/main/kotlin/software/ralf/app/platform/gradle/ModuleStructureNestingCheckTask.kt @@ -41,7 +41,7 @@ internal abstract class ModuleStructureNestingCheckTask : DefaultTask() { if (invalidExceptions.isNotEmpty()) { throw GradleException( "allowNestedLibrariesIn requires exact library paths. These paths do not identify " + - "libraries in the checked subtree: ${invalidExceptions.joinToString()}." + "libraries in the checked subtree: ${invalidExceptions.joinToString()}.", ) } @@ -61,14 +61,14 @@ internal abstract class ModuleStructureNestingCheckTask : DefaultTask() { "Library modules must be direct children of their library:\n" + violations.joinToString("\n") { " - $it" } + "\nMove nested projects outside the library, or configure allowNestedLibrariesIn " + - "in the appPlatform.enableModuleStructureNestingCheck block of the project running this check." + "in the appPlatform.enableModuleStructureNestingCheck block of the project running this check.", ) } } companion object { fun Project.registerModuleStructureNestingCheckTask( - options: ModuleStructureNestingCheckOptions + options: ModuleStructureNestingCheckOptions, ) { val checkTask = tasks.register( diff --git a/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/AppPlatformExtensionTest.kt b/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/AppPlatformExtensionTest.kt index 8ff001de..e0ae9731 100644 --- a/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/AppPlatformExtensionTest.kt +++ b/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/AppPlatformExtensionTest.kt @@ -31,7 +31,7 @@ class AppPlatformExtensionTest { options.enableDependencyCheck(false) options.enableTestDependencyCheck(false) options.allowLibraryImplToImplDependencies(true) - } + }, ) assertThat(extension.isModuleStructureEnabled().get()).isTrue() @@ -51,7 +51,7 @@ class AppPlatformExtensionTest { options.enableDependencyCheck(false) options.enableTestDependencyCheck(false) options.allowLibraryImplToImplDependencies(true) - } + }, ) assertThat(extension.moduleStructureOptions().isDependencyCheckEnabled().get()).isFalse() @@ -74,7 +74,7 @@ class AppPlatformExtensionTest { allowLibraryImplToImplDependencies true } """ - .trimIndent() + .trimIndent(), ) assertThat(extension.isModuleStructureEnabled().get()).isTrue() diff --git a/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/FakePlugins.kt b/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/FakePlugins.kt index 39643cc1..e885f9a6 100644 --- a/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/FakePlugins.kt +++ b/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/FakePlugins.kt @@ -122,7 +122,7 @@ private fun fake( type.cast( Proxy.newProxyInstance(type.classLoader, arrayOf(type)) { proxy, method, arguments -> invocation(proxy, method, arguments) - } + }, ) private fun Method.defaultReturnValue(): Any? = diff --git a/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/ModuleStructureNestingCheckIntegrationTest.kt b/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/ModuleStructureNestingCheckIntegrationTest.kt index 191d48bb..f783cfbb 100644 --- a/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/ModuleStructureNestingCheckIntegrationTest.kt +++ b/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/ModuleStructureNestingCheckIntegrationTest.kt @@ -57,7 +57,7 @@ class ModuleStructureNestingCheckIntegrationTest { allowNestedLibrariesIn([':legacy']) } """ - .trimIndent() + .trimIndent(), ) runner("checkModuleStructureNesting").build() @@ -78,7 +78,7 @@ class ModuleStructureNestingCheckIntegrationTest { } } """ - .trimIndent() + .trimIndent(), ) runner("checkModuleStructureNesting").build() @@ -209,7 +209,7 @@ class ModuleStructureNestingCheckIntegrationTest { allowNestedLibrariesIn(":abc") } """ - .trimIndent() + .trimIndent(), ) val result = runner(":abc:public:checkModuleStructureDependencies").buildAndFail() @@ -237,7 +237,7 @@ class ModuleStructureNestingCheckIntegrationTest { $options } """ - .trimIndent() + .trimIndent(), ) } @@ -258,7 +258,7 @@ class ModuleStructureNestingCheckIntegrationTest { dependsOn 'checkModuleStructureDependenciesFixture' } """ - .trimIndent() + .trimIndent(), ) } diff --git a/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/ModuleStructureNestingCheckTaskTest.kt b/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/ModuleStructureNestingCheckTaskTest.kt index b6e1a535..013db31e 100644 --- a/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/ModuleStructureNestingCheckTaskTest.kt +++ b/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/ModuleStructureNestingCheckTaskTest.kt @@ -35,7 +35,7 @@ class ModuleStructureNestingCheckTaskTest { "Library modules must be direct children of their library:\n" + " - :abc contains :abc:def:public, :abc:ghi:impl\n" + "Move nested projects outside the library, or configure allowNestedLibrariesIn " + - "in the appPlatform.enableModuleStructureNestingCheck block of the project running this check." + "in the appPlatform.enableModuleStructureNestingCheck block of the project running this check.", ) } @@ -113,7 +113,7 @@ class ModuleStructureNestingCheckTaskTest { assertFailure { task.checkLibraryNesting() } .hasMessage( "allowNestedLibrariesIn requires exact library paths. These paths do not identify " + - "libraries in the checked subtree: $path." + "libraries in the checked subtree: $path.", ) } } diff --git a/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/ModuleStructurePluginTest.kt b/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/ModuleStructurePluginTest.kt index 2ab1e2bc..d22337a7 100644 --- a/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/ModuleStructurePluginTest.kt +++ b/gradle-plugin/plugin/src/test/kotlin/software/ralf/app/platform/gradle/ModuleStructurePluginTest.kt @@ -107,7 +107,7 @@ class ModuleStructurePluginTest { project.dependencies.add("compileClasspath", "com.example:forbidden-impl:1.0") project.appPlatform.enableModuleStructure( - Action { options -> options.enableDependencyCheck(false) } + Action { options -> options.enableDependencyCheck(false) }, ) project.evaluate() @@ -124,7 +124,7 @@ class ModuleStructurePluginTest { project.appPlatform.enableModuleStructure(true) project.appPlatform.enableModuleStructure( - Action { options -> options.enableDependencyCheck(false) } + Action { options -> options.enableDependencyCheck(false) }, ) project.evaluate() @@ -141,7 +141,7 @@ class ModuleStructurePluginTest { project.plugins.apply("java-test-fixtures") project.appPlatform.enableModuleStructure( - Action { options -> options.enableTestDependencyCheck(false) } + Action { options -> options.enableTestDependencyCheck(false) }, ) project.evaluate() @@ -277,7 +277,7 @@ class ModuleStructurePluginTest { project.plugins.apply(AppPlatformPlugin::class.java) project.appPlatform.enableModuleStructure( - Action { options -> options.enableTestDependencyCheck(false) } + Action { options -> options.enableTestDependencyCheck(false) }, ) project.evaluate() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d1f7b84d..e9ac1b74 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -49,7 +49,7 @@ kotlin-hierarchy = "1.1" kotlin-inject = "0.9.0" kotlin-inject-anvil = "0.1.7" kotlin-poet = "2.4.0" -ktfmt = "0.64" +ktfmt = "0.65" ksp = "2.3.12" maven-publish = "0.37.0" metro = "1.4.5" diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/Util.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/Util.kt index f81694de..6d6397bf 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/Util.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/Util.kt @@ -16,10 +16,10 @@ internal const val OPEN_SOURCE_LOOKUP_PACKAGE = "amazon.lastmile.inject" internal const val APP_PLATFORM_LOOKUP_PACKAGE = "app.platform.inject" internal fun > Annotatable.Builder.addOriginAnnotation( - clazz: KSClassDeclaration + clazz: KSClassDeclaration, ): T = addAnnotation( AnnotationSpec.builder(Origin::class) .addMember("value = %T::class", clazz.toClassName()) - .build() + .build(), ) diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingProcessor.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingProcessor.kt index cf0915e6..a06b78c7 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingProcessor.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingProcessor.kt @@ -110,7 +110,7 @@ internal class ContributesBindingProcessor( FunSpec.builder( "provide${clazz.innerClassNames()}" + function.bindingMethodReturnType.simpleName + - multibindingSuffix + multibindingSuffix, ) .addAnnotation(Provides::class) .apply { @@ -122,16 +122,16 @@ internal class ContributesBindingProcessor( val parameterName = clazz.innerClassNames().decapitalize() addParameter( ParameterSpec.builder(name = parameterName, type = clazz.toClassName()) - .build() + .build(), ) addStatement("return $parameterName") } .returns(function.bindingMethodReturnType) .build() - } + }, ) - .build() + .build(), ) .build() diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingScopedProcessor.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingScopedProcessor.kt index 37ad247b..6854a98a 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingScopedProcessor.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingScopedProcessor.kt @@ -99,7 +99,7 @@ internal class ContributesBindingScopedProcessor( .addAnnotation( AnnotationSpec.builder(ContributesTo::class) .addMember("scope = %T::class", scope.type.toClassName()) - .build() + .build(), ) .addFunction( FunSpec.builder("provide${clazz.innerClassNames()}Scoped") @@ -108,20 +108,20 @@ internal class ContributesBindingScopedProcessor( .addAnnotation( AnnotationSpec.builder(ForScope::class) .addMember("scope = %T::class", scope.type.toClassName()) - .build() + .build(), ) .apply { val parameterName = clazz.innerClassNames().decapitalize() addParameter( - ParameterSpec.builder(name = parameterName, type = clazz.toClassName()).build() + ParameterSpec.builder(name = parameterName, type = clazz.toClassName()).build(), ) addStatement("return $parameterName") } .returns(scopedClassName) - .build() + .build(), ) - .build() + .build(), ) .build() diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesMockImplProcessor.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesMockImplProcessor.kt index 571fe24c..5d8afacf 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesMockImplProcessor.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesMockImplProcessor.kt @@ -91,7 +91,7 @@ internal class ContributesMockImplProcessor( .addAnnotation( AnnotationSpec.builder(ContributesTo::class) .addMember("%T::class", clazz.scope().type.toClassName()) - .build() + .build(), ) .addFunctions( annotations.map { annotation -> @@ -104,7 +104,7 @@ internal class ContributesMockImplProcessor( .addParameter( ParameterSpec.builder("mockMode", Boolean::class) .addAnnotation(MockMode::class) - .build() + .build(), ) .addParameter("mockImpl", LambdaTypeName.get(returnType = clazz.toClassName())) .addParameter( @@ -113,12 +113,12 @@ internal class ContributesMockImplProcessor( LambdaTypeName.get(returnType = boundType.toClassName()), ) .addAnnotation(RealImpl::class) - .build() + .build(), ) .returns(boundType.toClassName()) .addStatement("return if (mockMode) mockImpl() else realImpl()") .build() - } + }, ) .apply { if ( @@ -132,21 +132,21 @@ internal class ContributesMockImplProcessor( .addAnnotation( AnnotationSpec.builder(ForScope::class) .addMember("scope = %T::class", clazz.scope().type.toClassName()) - .build() + .build(), ) .addParameter( ParameterSpec.builder("mockMode", Boolean::class) .addAnnotation(MockMode::class) - .build() + .build(), ) .addParameter("mockImpl", LambdaTypeName.get(returnType = clazz.toClassName())) .returns(scopedClassName) .addStatement("return if (mockMode) mockImpl() else %T.NO_OP", scopedClassName) - .build() + .build(), ) } } - .build() + .build(), ) .build() diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesRealImplProcessor.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesRealImplProcessor.kt index 0713b3b8..de350ab4 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesRealImplProcessor.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesRealImplProcessor.kt @@ -88,7 +88,7 @@ internal class ContributesRealImplProcessor( .addAnnotation( AnnotationSpec.builder(ContributesTo::class) .addMember("%T::class", clazz.scope().type.toClassName()) - .build() + .build(), ) .addFunctions( annotations.map { annotation -> @@ -97,7 +97,7 @@ internal class ContributesRealImplProcessor( check(!boundType.isScoped(), clazz) { "Scoped cannot be used as bound type." } FunSpec.builder( - "provide${boundType.declaration.simpleName.asString()}" + "RealImpl" + "provide${boundType.declaration.simpleName.asString()}" + "RealImpl", ) .addAnnotation(Provides::class) .addAnnotation(RealImpl::class) @@ -105,7 +105,7 @@ internal class ContributesRealImplProcessor( .returns(boundType.toClassName()) .addStatement("return realImpl") .build() - } + }, ) .apply { if ( @@ -119,21 +119,21 @@ internal class ContributesRealImplProcessor( .addAnnotation( AnnotationSpec.builder(ForScope::class) .addMember("scope = %T::class", clazz.scope().type.toClassName()) - .build() + .build(), ) .addParameter( ParameterSpec.builder("mockMode", Boolean::class) .addAnnotation(MockMode::class) - .build() + .build(), ) .addParameter("realImpl", LambdaTypeName.get(returnType = clazz.toClassName())) .returns(scopedClassName) .addStatement("return if (mockMode) %T.NO_OP else realImpl()", scopedClassName) - .build() + .build(), ) } } - .build() + .build(), ) .build() diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesRendererProcessor.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesRendererProcessor.kt index 506635de..0068f5e0 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesRendererProcessor.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesRendererProcessor.kt @@ -152,7 +152,7 @@ internal class ContributesRendererProcessor( .addAnnotation( AnnotationSpec.builder(ContributesTo::class) .addMember("%T::class", rendererScope) - .build() + .build(), ) .apply { if (!clazz.hasInjectAnnotation()) { @@ -162,13 +162,13 @@ internal class ContributesRendererProcessor( .returns(clazz.toClassName()) .addParameters(clazz.constructorParameters().map { it.toParameterSpec() }) .addCode(clazz.constructorCall()) - .build() + .build(), ) } } .addFunctions(allModels.map { createModelBindingFunction(clazz, it) }.toList()) .addFunctions(allModels.map { createModelKeyFunction(clazz, it) }.toList()) - .build() + .build(), ) .build() @@ -201,7 +201,7 @@ internal class ContributesRendererProcessor( buildString { append( "Couldn't find BaseModel type for ${clazz.simpleName.asString()}. " + - "Consider adding an explicit parameter." + "Consider adding an explicit parameter.", ) if (implicitModelTypes.size > 1) { append("Found: ") @@ -227,8 +227,8 @@ internal class ContributesRendererProcessor( listOf( KClass::class.asClassName().parameterizedBy(WildcardTypeName.producerOf(baseModel)), LambdaTypeName.get(returnType = rendererWildcard), - ) - ) + ), + ), ) .addStatement("return %T::class·to·renderer", modelType.toClassName()) .build() @@ -244,7 +244,7 @@ internal class ContributesRendererProcessor( .addAnnotation( AnnotationSpec.builder(ForScope::class) .addMember("scope = %T::class", rendererScope) - .build() + .build(), ) .returns( Pair::class.asClassName() @@ -253,8 +253,8 @@ internal class ContributesRendererProcessor( KClass::class.asClassName().parameterizedBy(WildcardTypeName.producerOf(baseModel)), KClass::class.asClassName() .parameterizedBy(WildcardTypeName.producerOf(rendererWildcard)), - ) - ) + ), + ), ) .addStatement("return %T::class·to·%T::class", modelType.toClassName(), clazz.toClassName()) .build() diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesRobotProcessor.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesRobotProcessor.kt index ca94f174..6715e9be 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesRobotProcessor.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/inject/processor/ContributesRobotProcessor.kt @@ -100,7 +100,7 @@ internal class ContributesRobotProcessor( .addAnnotation( AnnotationSpec.builder(ContributesTo::class) .addMember("%T::class", clazz.scope().type.toClassName()) - .build() + .build(), ) .apply { if (!clazz.hasInjectAnnotation()) { @@ -110,7 +110,7 @@ internal class ContributesRobotProcessor( .returns(clazz.toClassName()) .addParameters(clazz.constructorParameters().map { it.toParameterSpec() }) .addCode(clazz.constructorCall()) - .build() + .build(), ) } } @@ -129,14 +129,14 @@ internal class ContributesRobotProcessor( KClass::class.asClassName() .parameterizedBy(WildcardTypeName.producerOf(robotClassName)), LambdaTypeName.get(returnType = robotClassName), - ) - ) + ), + ), ) .addStatement("return %T::class·to·robot", clazz.toClassName()) - .build() + .build(), ) .addProperty(name = clazz.innerClassNames().decapitalize(), type = clazz.toClassName()) - .build() + .build(), ) .build() diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/CommonSourceCode.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/CommonSourceCode.kt index 796f1565..4d0c25b9 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/CommonSourceCode.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/CommonSourceCode.kt @@ -18,7 +18,7 @@ internal val Class<*>.generatedComponent: Class<*> get() = classLoader.loadClass( "$OPEN_SOURCE_LOOKUP_PACKAGE." + - canonicalName.split(".").joinToString(separator = "") { it.capitalize() } + canonicalName.split(".").joinToString(separator = "") { it.capitalize() }, ) internal fun Class<*>.newComponent(vararg arguments: Any): T { @@ -26,7 +26,9 @@ internal fun Class<*>.newComponent(vararg arguments: Any): T { return classLoader .loadClass("$packageName.Inject$simpleName") .getDeclaredConstructor( - *arguments.map { arg -> arg::class.java.primitiveByWrapper ?: arg::class.java }.toTypedArray() + *arguments + .map { arg -> arg::class.java.primitiveByWrapper ?: arg::class.java } + .toTypedArray(), ) .newInstance(*arguments) as T } diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/Compilation.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/Compilation.kt index 508d4179..c7b9728b 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/Compilation.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/Compilation.kt @@ -111,7 +111,7 @@ class Compilation internal constructor(val kotlinCompilation: KotlinCompilation) inheritClassPath = true jvmTarget = JvmTarget.JVM_1_8.description verbose = false - } + }, ) } } diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingProcessorTest.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingProcessorTest.kt index 616f4fa0..7904c906 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingProcessorTest.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingProcessorTest.kt @@ -37,7 +37,7 @@ class ContributesBindingProcessorTest { @Inject @ContributesBinding(Unit::class) class Impl : Base - """ + """, ) { val generatedComponent = impl.generatedComponent @@ -68,7 +68,7 @@ class ContributesBindingProcessorTest { @ContributesBinding(Unit::class) class Inner : Base } - """ + """, ) { val generatedComponent = impl.inner.generatedComponent @@ -102,7 +102,7 @@ class ContributesBindingProcessorTest { @Inject @ContributesBinding(Unit::class) class Impl2 : Base2 - """ + """, ) { assertThat(impl.generatedComponent.declaredNonSyntheticMethods.single().returnType) .isEqualTo(base) @@ -152,7 +152,7 @@ class ContributesBindingProcessorTest { assertThat(messages) .contains( "The bound type could not be determined for Impl. " + - "There are multiple super types: Base, Base2." + "There are multiple super types: Base, Base2.", ) } } @@ -173,7 +173,7 @@ class ContributesBindingProcessorTest { @ContributesBinding(Unit::class, boundType = Base::class) @ContributesBinding(Unit::class, boundType = Base2::class) class Impl : Base, Base2 - """ + """, ) { val generatedComponent = impl.generatedComponent @@ -187,7 +187,7 @@ class ContributesBindingProcessorTest { } with( - generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideImplBase2" } + generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideImplBase2" }, ) { assertThat(parameters.single().type).isEqualTo(impl) assertThat(returnType).isEqualTo(base2) @@ -256,7 +256,7 @@ class ContributesBindingProcessorTest { @Inject @ContributesBinding(Unit::class, multibinding = true) class Impl : Base - """ + """, ) { val generatedComponent = impl.generatedComponent @@ -287,7 +287,7 @@ class ContributesBindingProcessorTest { @ContributesBinding(Unit::class, multibinding = false) @ContributesBinding(Unit::class, multibinding = true) class Impl : Base - """ + """, ) { val generatedComponent = impl.generatedComponent diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingScopedProcessorTest.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingScopedProcessorTest.kt index ca6aa120..6e020f53 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingScopedProcessorTest.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesBindingScopedProcessorTest.kt @@ -46,7 +46,7 @@ class ContributesBindingScopedProcessorTest { @SingleIn(AppScope::class) @ContributesBinding(AppScope::class) class Impl : Base, Scoped - """ + """, ) { val generatedComponent = impl.scopedComponent @@ -55,7 +55,7 @@ class ContributesBindingScopedProcessorTest { .isEqualTo(AppScope::class) with( - generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideImplScoped" } + generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideImplScoped" }, ) { assertThat(parameters.single().type).isEqualTo(impl) assertThat(returnType).isEqualTo(scoped) @@ -84,7 +84,7 @@ class ContributesBindingScopedProcessorTest { @ContributesBinding(Unit::class) class Inner : Base, Scoped } - """ + """, ) { val generatedComponent = impl.inner.scopedComponent @@ -95,7 +95,7 @@ class ContributesBindingScopedProcessorTest { with( generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideImplInnerScoped" - } + }, ) { assertThat(parameters.single().type).isEqualTo(impl.inner) assertThat(returnType).isEqualTo(scoped) @@ -126,12 +126,12 @@ class ContributesBindingScopedProcessorTest { @ContributesBinding(AppScope::class, boundType = Base::class) @ContributesBinding(AppScope::class, boundType = Base2::class) class Impl : Base, Base2, Scoped - """ + """, ) { val generatedComponent = impl.scopedComponent with( - generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideImplScoped" } + generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideImplScoped" }, ) { assertThat(parameters.single().type).isEqualTo(impl) assertThat(returnType).isEqualTo(scoped) @@ -158,7 +158,7 @@ class ContributesBindingScopedProcessorTest { @SingleIn(AppScope::class) @ContributesBinding(AppScope::class) class Impl : Scoped - """ + """, ) { val generatedComponent = impl.scopedComponent with(generatedComponent.declaredNonSyntheticMethods.single()) { @@ -199,7 +199,7 @@ class ContributesBindingScopedProcessorTest { @ContributesBinding(AppScope::class, boundType = Base::class) @ContributesBinding(AppScope::class, boundType = Scoped::class) class Impl2 : Base - """ + """, ) { with(impl.generatedComponent.declaredNonSyntheticMethods.single()) { assertThat(name).isEqualTo("provideImplBase") @@ -216,7 +216,9 @@ class ContributesBindingScopedProcessorTest { assertThat(this).isAnnotatedWith(Provides::class) } with( - impl2.scopedComponent.declaredNonSyntheticMethods.single { it.name == "provideImpl2Scoped" } + impl2.scopedComponent.declaredNonSyntheticMethods.single { + it.name == "provideImpl2Scoped" + }, ) { assertThat(parameters.single().type).isEqualTo(impl2) assertThat(returnType).isEqualTo(scoped) @@ -271,7 +273,7 @@ class ContributesBindingScopedProcessorTest { @ForScope(Unit::class) val scoped: Set } - """ + """, ) { val component = componentInterface.newComponent() @@ -308,7 +310,7 @@ class ContributesBindingScopedProcessorTest { canonicalName.substringAfter("$packageName.").split(".").joinToString(separator = "") { it.capitalize() } + - "ScopedComponent" + "ScopedComponent", ) private val JvmCompilationResult.componentInterface2: Class<*> diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesMockImplGeneratorTest.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesMockImplGeneratorTest.kt index 4222911e..a5d4bf1a 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesMockImplGeneratorTest.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesMockImplGeneratorTest.kt @@ -45,7 +45,7 @@ class ContributesMockImplGeneratorTest { @ContributesMockImpl(AppScope::class) class MockImpl : Base - """ + """, ) { val component = mockImpl.component @@ -63,7 +63,7 @@ class ContributesMockImplGeneratorTest { .filterIsInstance() .single() .upperBounds - .single() + .single(), ) .isEqualTo(base) assertThat(providesMethod.parameters[2].annotations.single().annotationClass) @@ -87,7 +87,7 @@ class ContributesMockImplGeneratorTest { @ContributesMockImpl(AppScope::class, boundType = Base::class) class MockImpl : Base - """ + """, ) { val component = mockImpl.component @@ -105,7 +105,7 @@ class ContributesMockImplGeneratorTest { .filterIsInstance() .single() .upperBounds - .single() + .single(), ) .isEqualTo(base) assertThat(providesMethod.parameters[2].annotations.single().annotationClass) @@ -131,7 +131,7 @@ class ContributesMockImplGeneratorTest { @ContributesMockImpl(AppScope::class) class Inner : Base } - """ + """, ) { val component = mockImpl.inner.component @@ -149,7 +149,7 @@ class ContributesMockImplGeneratorTest { .filterIsInstance() .single() .upperBounds - .single() + .single(), ) .isEqualTo(base) assertThat(providesMethod.parameters[2].annotations.single().annotationClass) @@ -173,7 +173,7 @@ class ContributesMockImplGeneratorTest { @ContributesMockImpl(AppScope::class) class MockImpl : Base() - """ + """, ) { assertThat(mockImpl.component).isNotNull() } @@ -194,7 +194,7 @@ class ContributesMockImplGeneratorTest { @ContributesMockImpl(AppScope::class, boundType = Base::class) @ContributesMockImpl(AppScope::class, boundType = Base2::class) class MockImpl : Base, Base2 - """ + """, ) { val component = mockImpl.component @@ -266,7 +266,7 @@ class ContributesMockImplGeneratorTest { ) { assertThat(messages) .contains( - "The bound type could not be determined for MockImpl. " + "There are no super types." + "The bound type could not be determined for MockImpl. " + "There are no super types.", ) } } @@ -285,7 +285,7 @@ class ContributesMockImplGeneratorTest { @ContributesMockImpl(AppScope::class, boundType = Base2::class) class MockImpl : Base - """ + """, ) { val component = mockImpl.component @@ -303,7 +303,7 @@ class ContributesMockImplGeneratorTest { .filterIsInstance() .single() .upperBounds - .single() + .single(), ) .isEqualTo(base2) assertThat(providesMethod.parameters[2].annotations.single().annotationClass) @@ -334,7 +334,7 @@ class ContributesMockImplGeneratorTest { assertThat(messages) .contains( "The bound type could not be determined for MockImpl. " + - "There are multiple super types: Base, Base2." + "There are multiple super types: Base, Base2.", ) } } @@ -353,7 +353,7 @@ class ContributesMockImplGeneratorTest { @ContributesMockImpl(AppScope::class) class MockImpl : Base, Scoped - """ + """, ) { val component = mockImpl.component @@ -371,7 +371,7 @@ class ContributesMockImplGeneratorTest { .filterIsInstance() .single() .upperBounds - .single() + .single(), ) .isEqualTo(base) assertThat(parameters[2].annotations.single().annotationClass).isEqualTo(RealImpl::class) @@ -409,7 +409,7 @@ class ContributesMockImplGeneratorTest { @ContributesMockImpl(AppScope::class, boundType = Base::class) @ContributesBinding(AppScope::class, boundType = Base2::class) class MockImpl : Base, Base2, Scoped - """ + """, ) { val component = mockImpl.component @@ -417,7 +417,7 @@ class ContributesMockImplGeneratorTest { .isNotNull() assertThat( - component.declaredNonSyntheticMethods.firstOrNull { it.name == "provideMockImplScoped" } + component.declaredNonSyntheticMethods.firstOrNull { it.name == "provideMockImplScoped" }, ) .isNull() } @@ -480,7 +480,7 @@ class ContributesMockImplGeneratorTest { ) : ComponentInterfaceMerged { abstract val base: Base } - """ + """, ) { val componentMockModeTrue = componentInterface.newComponent(true) val componentMockModeFalse = componentInterface.newComponent(false) @@ -491,7 +491,7 @@ class ContributesMockImplGeneratorTest { .declaredNonSyntheticMethods .single { it.name == "getBase" } .invoke(componentMockModeTrue)::class - .java + .java, ) .isEqualTo(mockImpl) @@ -501,7 +501,7 @@ class ContributesMockImplGeneratorTest { .declaredNonSyntheticMethods .single { it.name == "getBase" } .invoke(componentMockModeFalse)::class - .java + .java, ) .isEqualTo(realBaseImpl) } @@ -550,7 +550,7 @@ class ContributesMockImplGeneratorTest { @ForScope(AppScope::class) abstract val scoped: Set } - """ + """, ) { val componentMockModeTrue = componentInterface.newComponent(true) val componentMockModeFalse = componentInterface.newComponent(false) @@ -561,7 +561,7 @@ class ContributesMockImplGeneratorTest { .java .declaredNonSyntheticMethods .single { it.name == "getScoped" } - .invoke(componentMockModeTrue) as Set + .invoke(componentMockModeTrue) as Set, ) { assertThat(this).hasSize(2) assertThat(singleOrNull { mockImpl.isAssignableFrom(it.javaClass) }).isNotNull() @@ -574,7 +574,7 @@ class ContributesMockImplGeneratorTest { .java .declaredNonSyntheticMethods .single { it.name == "getScoped" } - .invoke(componentMockModeFalse) as Set + .invoke(componentMockModeFalse) as Set, ) { assertThat(this).hasSize(2) assertThat(singleOrNull { realBaseImpl.isAssignableFrom(it.javaClass) }).isNotNull() @@ -675,7 +675,7 @@ class ContributesMockImplGeneratorTest { } object TestScoped : Scoped - """ + """, ) { val component = componentInterface.newComponent() @@ -708,10 +708,10 @@ class ContributesMockImplGeneratorTest { classLoader.loadClass( "$APP_PLATFORM_LOOKUP_PACKAGE.$packageName." + canonicalName.substringAfter(packageName).substring(1).split(".").joinToString( - separator = "" + separator = "", ) { it.capitalize() } + - "MockImplComponent" + "MockImplComponent", ) } diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesRealImplGeneratorTest.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesRealImplGeneratorTest.kt index 5647738d..27a4ad93 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesRealImplGeneratorTest.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesRealImplGeneratorTest.kt @@ -40,7 +40,7 @@ class ContributesRealImplGeneratorTest { @ContributesRealImpl(AppScope::class) class RealImpl : Base - """ + """, ) { val component = realImpl.component @@ -71,7 +71,7 @@ class ContributesRealImplGeneratorTest { @ContributesRealImpl(AppScope::class) class Inner : Base } - """ + """, ) { val component = realImpl.inner.component @@ -102,7 +102,7 @@ class ContributesRealImplGeneratorTest { @ContributesRealImpl(AppScope::class, boundType = Base::class) @ContributesRealImpl(AppScope::class, boundType = Base2::class) class RealImpl : Base, Base2 - """ + """, ) { val component = realImpl.component @@ -186,7 +186,7 @@ class ContributesRealImplGeneratorTest { ) { assertThat(messages) .contains( - "The bound type could not be determined for RealImpl. " + "There are no super types." + "The bound type could not be determined for RealImpl. " + "There are no super types.", ) } } @@ -204,7 +204,7 @@ class ContributesRealImplGeneratorTest { @ContributesRealImpl(AppScope::class) class RealImpl : Base() - """ + """, ) { assertThat(realImpl.component).isNotNull() } @@ -224,7 +224,7 @@ class ContributesRealImplGeneratorTest { @ContributesRealImpl(AppScope::class, boundType = Base2::class) class RealImpl : Base - """ + """, ) { val component = realImpl.component @@ -261,7 +261,7 @@ class ContributesRealImplGeneratorTest { assertThat(messages) .contains( "The bound type could not be determined for RealImpl. " + - "There are multiple super types: Base, Base2." + "There are multiple super types: Base, Base2.", ) } } @@ -280,7 +280,7 @@ class ContributesRealImplGeneratorTest { @ContributesRealImpl(AppScope::class) class RealImpl : Base, Scoped - """ + """, ) { val component = realImpl.component @@ -324,7 +324,7 @@ class ContributesRealImplGeneratorTest { @ContributesRealImpl(AppScope::class, boundType = Base::class) @ContributesBinding(AppScope::class, boundType = Base2::class) class RealImpl : Base, Base2, Scoped - """ + """, ) { val component = realImpl.component @@ -337,7 +337,7 @@ class ContributesRealImplGeneratorTest { } assertThat( - component.declaredNonSyntheticMethods.firstOrNull { it.name == "provideRealImplScoped" } + component.declaredNonSyntheticMethods.firstOrNull { it.name == "provideRealImplScoped" }, ) .isNull() } @@ -376,10 +376,10 @@ class ContributesRealImplGeneratorTest { classLoader.loadClass( "$APP_PLATFORM_LOOKUP_PACKAGE.$packageName." + canonicalName.substringAfter(packageName).substring(1).split(".").joinToString( - separator = "" + separator = "", ) { it.capitalize() } + - "RealImplComponent" + "RealImplComponent", ) } diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesRendererProcessorTest.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesRendererProcessorTest.kt index 601ee79d..ff394ea3 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesRendererProcessorTest.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesRendererProcessorTest.kt @@ -61,7 +61,7 @@ class ContributesRendererProcessorTest { with( generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRenderer" - } + }, ) { assertThat(parameters).isEmpty() assertThat(returnType).isEqualTo(testRenderer) @@ -72,7 +72,7 @@ class ContributesRendererProcessorTest { with( generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRendererModel" - } + }, ) { assertThat(parameters.single().type.canonicalName) .isEqualTo("kotlin.jvm.functions.Function0") @@ -84,7 +84,7 @@ class ContributesRendererProcessorTest { with( generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRendererModelKey" - } + }, ) { assertThat(parameters).isEmpty() assertThat(returnType).isEqualTo(Pair::class.java) @@ -133,7 +133,7 @@ class ContributesRendererProcessorTest { with( generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRendererInner" - } + }, ) { assertThat(parameters).isEmpty() assertThat(returnType).isEqualTo(testRenderer.inner) @@ -144,7 +144,7 @@ class ContributesRendererProcessorTest { with( generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRendererInnerModel" - } + }, ) { assertThat(parameters.single().type.canonicalName) .isEqualTo("kotlin.jvm.functions.Function0") @@ -187,7 +187,7 @@ class ContributesRendererProcessorTest { with( generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRenderer" - } + }, ) { assertThat(parameters).isEmpty() assertThat(returnType).isEqualTo(testRenderer) @@ -198,7 +198,7 @@ class ContributesRendererProcessorTest { with( generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRendererPresenterModel" - } + }, ) { assertThat(parameters.single().type.canonicalName) .isEqualTo("kotlin.jvm.functions.Function0") @@ -255,7 +255,7 @@ class ContributesRendererProcessorTest { class TestRenderer : OtherRenderer { override fun render(model: Model) = Unit } - """ + """, ) { assertThat(testRenderer.modelType).isEqualTo(model) } @@ -283,7 +283,7 @@ class ContributesRendererProcessorTest { class TestRenderer : OtherRenderer4 { override fun render(model: Model) = Unit } - """ + """, ) { assertThat(testRenderer.modelType).isEqualTo(model) } @@ -314,7 +314,7 @@ class ContributesRendererProcessorTest { assertThat(messages) .contains( "Couldn't find BaseModel type for TestRenderer. Consider adding " + - "an explicit parameter.Found: software.ralf.test.Model1, software.ralf.test.Model2" + "an explicit parameter.Found: software.ralf.test.Model1, software.ralf.test.Model2", ) } } @@ -354,7 +354,7 @@ class ContributesRendererProcessorTest { with( generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRenderer" - } + }, ) { assertThat(parameters).isEmpty() assertThat(returnType).isEqualTo(testRenderer) @@ -429,7 +429,7 @@ class ContributesRendererProcessorTest { .newComponent() .modelToRendererMapping .values - .distinct() + .distinct(), ) .containsOnly(testRenderer.kotlin) } @@ -467,14 +467,14 @@ class ContributesRendererProcessorTest { it.name.startsWith("provideSoftwareRalfTestTestRendererPresenterModel") && !it.name.endsWith("Key") } - .map { it.name } + .map { it.name }, ) .containsOnly("provideSoftwareRalfTestTestRendererPresenterModel") assertThat( generatedComponent.declaredNonSyntheticMethods .filter { it.name.startsWith("provideSoftwareRalfTestTestRendererPresenterModelKey") } - .map { it.name } + .map { it.name }, ) .containsOnly("provideSoftwareRalfTestTestRendererPresenterModelKey") @@ -595,7 +595,7 @@ class ContributesRendererProcessorTest { .contains( "Source0.kt:15: Renderers should not be singletons in the " + "RendererScope. The RendererFactory will cache the Renderer when " + - "necessary. Remove the @SingleIn(RendererScope::class) annotation." + "necessary. Remove the @SingleIn(RendererScope::class) annotation.", ) } } @@ -625,7 +625,7 @@ class ContributesRendererProcessorTest { assertThat(messages) .contains( "It's redundant to use @Inject when using @ContributesRenderer " + - "for a Renderer with a zero-arg constructor." + "for a Renderer with a zero-arg constructor.", ) } } @@ -656,7 +656,7 @@ class ContributesRendererProcessorTest { with( generatedComponent.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRenderer" - } + }, ) { assertThat(parameters.single().type).isEqualTo(String::class.java) assertThat(returnType).isEqualTo(testRenderer) @@ -694,7 +694,7 @@ class ContributesRendererProcessorTest { .contains( "TestRenderer has multiple constructors. Annotate the constructor to use with " + "@Inject, or remove the extra constructors so @ContributesRenderer can generate " + - "a provider." + "a provider.", ) } } @@ -742,7 +742,7 @@ class ContributesRendererProcessorTest { classLoader.loadClass( "$APP_PLATFORM_LOOKUP_PACKAGE.$packageName." + canonicalName.substringAfter(packageName).substring(1).replace(".", "") + - "Component" + "Component", ) private val Class<*>.defaultImpl: Class<*> diff --git a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesRobotGeneratorTest.kt b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesRobotGeneratorTest.kt index 3fda8a56..9b8844b6 100644 --- a/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesRobotGeneratorTest.kt +++ b/kotlin-inject-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/processor/ContributesRobotGeneratorTest.kt @@ -61,7 +61,7 @@ class ContributesRobotGeneratorTest { } with( - robotComponent.declaredNonSyntheticMethods.single { it.name == "provideTestRobotIntoMap" } + robotComponent.declaredNonSyntheticMethods.single { it.name == "provideTestRobotIntoMap" }, ) { assertThat(parameters.single().type.canonicalName) .isEqualTo("kotlin.jvm.functions.Function0") @@ -99,12 +99,12 @@ class ContributesRobotGeneratorTest { assertThat(robotComponent.origin).isEqualTo(testRobot) assertThat( - robotComponent.declaredNonSyntheticMethods.singleOrNull { it.name == "provideTestRobot" } + robotComponent.declaredNonSyntheticMethods.singleOrNull { it.name == "provideTestRobot" }, ) .isNull() with( - robotComponent.declaredNonSyntheticMethods.single { it.name == "provideTestRobotIntoMap" } + robotComponent.declaredNonSyntheticMethods.single { it.name == "provideTestRobotIntoMap" }, ) { assertThat(parameters.single().type.canonicalName) .isEqualTo("kotlin.jvm.functions.Function0") @@ -142,7 +142,7 @@ class ContributesRobotGeneratorTest { val robotComponent = testRobot.component assertThat( - robotComponent.declaredNonSyntheticMethods.singleOrNull { it.name == "provideTestRobot" } + robotComponent.declaredNonSyntheticMethods.singleOrNull { it.name == "provideTestRobot" }, ) .isNull() @@ -177,7 +177,7 @@ class ContributesRobotGeneratorTest { val robotComponent = testRobot.component assertThat( - robotComponent.declaredNonSyntheticMethods.singleOrNull { it.name == "provideTestRobot" } + robotComponent.declaredNonSyntheticMethods.singleOrNull { it.name == "provideTestRobot" }, ) .isNull() @@ -208,7 +208,7 @@ class ContributesRobotGeneratorTest { assertThat(messages) .contains( "TestRobot has multiple constructors. Annotate the constructor to use with @Inject, " + - "or remove the extra constructors so @ContributesRobot can generate a provider." + "or remove the extra constructors so @ContributesRobot can generate a provider.", ) } } @@ -260,7 +260,7 @@ class ContributesRobotGeneratorTest { @ContributesRobot(AppScope::class) class TestRobot : BaseRobot2() - """ + """, ) { assertThat(testRobot.component).isNotNull() } @@ -287,7 +287,7 @@ class ContributesRobotGeneratorTest { assertThat(messages) .contains( "In order to use @ContributesRobot, TestRobot must implement " + - "software.ralf.app.platform.robot.Robot." + "software.ralf.app.platform.robot.Robot.", ) } } @@ -315,7 +315,7 @@ class ContributesRobotGeneratorTest { .contains( "It's not allowed allowed for a robot to be a singleton, because " + "the lifetime of the robot is scoped to the robot() factory function. " + - "Remove the @SingleIn annotation." + "Remove the @SingleIn annotation.", ) } } @@ -401,10 +401,10 @@ class ContributesRobotGeneratorTest { classLoader.loadClass( "$APP_PLATFORM_LOOKUP_PACKAGE.$packageName." + canonicalName.substringAfter(packageName).substring(1).split(".").joinToString( - separator = "" + separator = "", ) { it.capitalize() } + - "Component" + "Component", ) } diff --git a/kotlin-inject/impl/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/AppScopeCoroutineScopeComponent.kt b/kotlin-inject/impl/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/AppScopeCoroutineScopeComponent.kt index 9e36a5e2..d1e1ba4b 100644 --- a/kotlin-inject/impl/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/AppScopeCoroutineScopeComponent.kt +++ b/kotlin-inject/impl/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/AppScopeCoroutineScopeComponent.kt @@ -21,7 +21,7 @@ public interface AppScopeCoroutineScopeComponent { @SingleIn(AppScope::class) @ForScope(AppScope::class) public fun provideAppScopeCoroutineScopeScoped( - @IoCoroutineDispatcher dispatcher: CoroutineDispatcher + @IoCoroutineDispatcher dispatcher: CoroutineDispatcher, ): CoroutineScopeScoped { return CoroutineScopeScoped(dispatcher + SupervisorJob() + CoroutineName("AppScope")) } @@ -33,7 +33,7 @@ public interface AppScopeCoroutineScopeComponent { @Provides @ForScope(AppScope::class) public fun provideAppCoroutineScope( - @ForScope(AppScope::class) appScopeCoroutineScopeScoped: CoroutineScopeScoped + @ForScope(AppScope::class) appScopeCoroutineScopeScoped: CoroutineScopeScoped, ): CoroutineScope { return appScopeCoroutineScopeScoped.createChild() } diff --git a/kotlin-inject/public/src/commonMain/kotlin/software/ralf/app/platform/scope/di/ComponentService.kt b/kotlin-inject/public/src/commonMain/kotlin/software/ralf/app/platform/scope/di/ComponentService.kt index d6d2b8a5..8ddad28f 100644 --- a/kotlin-inject/public/src/commonMain/kotlin/software/ralf/app/platform/scope/di/ComponentService.kt +++ b/kotlin-inject/public/src/commonMain/kotlin/software/ralf/app/platform/scope/di/ComponentService.kt @@ -46,7 +46,7 @@ public inline fun Scope.kotlinInjectComponent(): T { throw NoSuchElementException( "Couldn't find component implementing ${T::class}. Inspected: " + "[${diComponents.joinToString { it.simpleName.toString() }}] (fully qualified " + - "names: [${diComponents.joinToString { it.toString().replace('\$', '.') }}])" + "names: [${diComponents.joinToString { it.toString().replace('\$', '.') }}])", ) } diff --git a/kotlin-inject/public/src/commonTest/kotlin/software/ralf/app/platform/scope/di/ComponentServiceTest.kt b/kotlin-inject/public/src/commonTest/kotlin/software/ralf/app/platform/scope/di/ComponentServiceTest.kt index 69680074..b80433f9 100644 --- a/kotlin-inject/public/src/commonTest/kotlin/software/ralf/app/platform/scope/di/ComponentServiceTest.kt +++ b/kotlin-inject/public/src/commonTest/kotlin/software/ralf/app/platform/scope/di/ComponentServiceTest.kt @@ -47,7 +47,7 @@ class ComponentServiceTest { "[class software.ralf.app.platform.scope.di.ComponentServiceTest." + "ChildComponentImpl$kotlinReflectWarning, class software.ralf.app." + "platform.scope.di.ComponentServiceTest.ParentComponentImpl" + - "$kotlinReflectWarning])" + "$kotlinReflectWarning])", ) } diff --git a/ksp-common/public/src/main/kotlin/software/ralf/app/platform/ksp/ContextAware.kt b/ksp-common/public/src/main/kotlin/software/ralf/app/platform/ksp/ContextAware.kt index 0ac1006f..31f8c8e7 100644 --- a/ksp-common/public/src/main/kotlin/software/ralf/app/platform/ksp/ContextAware.kt +++ b/ksp-common/public/src/main/kotlin/software/ralf/app/platform/ksp/ContextAware.kt @@ -113,7 +113,7 @@ public interface ContextAware { findAnnotations(annotation).single() public fun KSClassDeclaration.findAnnotations( - annotation: KClass + annotation: KClass, ): List { val fqName = annotation.requireQualifiedName() return annotations @@ -223,7 +223,7 @@ public interface ContextAware { } public fun KSClassDeclaration.findAnnotationsAtLeastOne( - annotation: KClass + annotation: KClass, ): List { return findAnnotations(annotation).also { check(it.isNotEmpty(), this) { diff --git a/ktfmt.sh b/ktfmt.sh index 9d887fee..438c5275 100755 --- a/ktfmt.sh +++ b/ktfmt.sh @@ -17,7 +17,7 @@ if [[ -z "${KTFMT_JAR:-}" ]]; then if [[ ! -f "$KTFMT_JAR" ]]; then curl -fsSL \ - "https://github.com/facebook/ktfmt/releases/download/v${KTFMT_VERSION}/ktfmt-${KTFMT_VERSION}-with-dependencies.jar" \ + "https://github.com/Kotlin/ktfmt/releases/download/v${KTFMT_VERSION}/ktfmt-${KTFMT_VERSION}-with-dependencies.jar" \ -o "$KTFMT_JAR" fi fi diff --git a/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/Util.kt b/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/Util.kt index cbc1e715..b2c3efa5 100644 --- a/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/Util.kt +++ b/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/Util.kt @@ -10,8 +10,8 @@ import dev.zacsweers.metro.Origin internal const val METRO_LOOKUP_PACKAGE = "app.platform.inject.metro" internal fun TypeSpec.Builder.addMetroOriginAnnotation( - clazz: KSClassDeclaration + clazz: KSClassDeclaration, ): TypeSpec.Builder = addAnnotation( - AnnotationSpec.builder(Origin::class).addMember("%T::class", clazz.toClassName()).build() + AnnotationSpec.builder(Origin::class).addMember("%T::class", clazz.toClassName()).build(), ) diff --git a/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/processor/ContributesRendererProcessor.kt b/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/processor/ContributesRendererProcessor.kt index 431a066c..4e208f79 100644 --- a/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/processor/ContributesRendererProcessor.kt +++ b/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/processor/ContributesRendererProcessor.kt @@ -158,7 +158,7 @@ internal class ContributesRendererProcessor( .addAnnotation( AnnotationSpec.builder(ContributesTo::class) .addMember("%T::class", rendererScope) - .build() + .build(), ) .apply { if (!clazz.hasInjectAnnotation()) { @@ -168,13 +168,13 @@ internal class ContributesRendererProcessor( .returns(clazz.toClassName()) .addParameters(clazz.constructorParameters().map { it.toParameterSpec() }) .addCode(clazz.constructorCall()) - .build() + .build(), ) } } .addFunctions(allModels.map { createModelBindingFunction(clazz, it) }.toList()) .addFunctions(allModels.map { createModelKeyFunction(clazz, it) }.toList()) - .build() + .build(), ) .build() @@ -207,7 +207,7 @@ internal class ContributesRendererProcessor( buildString { append( "Couldn't find BaseModel type for ${clazz.simpleName.asString()}. " + - "Consider adding an explicit parameter." + "Consider adding an explicit parameter.", ) if (implicitModelTypes.size > 1) { append("Found: ") @@ -227,7 +227,7 @@ internal class ContributesRendererProcessor( .addAnnotation(Provides::class) .addAnnotation(IntoMap::class) .addAnnotation( - AnnotationSpec.builder(rendererKey).addMember("%T::class", modelType.toClassName()).build() + AnnotationSpec.builder(rendererKey).addMember("%T::class", modelType.toClassName()).build(), ) .addParameter(name = "renderer", type = LambdaTypeName.get(returnType = clazz.toClassName())) .returns(rendererWildcard) @@ -243,15 +243,15 @@ internal class ContributesRendererProcessor( .addAnnotation(Provides::class) .addAnnotation(IntoMap::class) .addAnnotation( - AnnotationSpec.builder(rendererKey).addMember("%T::class", modelType.toClassName()).build() + AnnotationSpec.builder(rendererKey).addMember("%T::class", modelType.toClassName()).build(), ) .addAnnotation( AnnotationSpec.builder(ForScope::class) .addMember("scope = %T::class", rendererScope) - .build() + .build(), ) .returns( - KClass::class.asClassName().parameterizedBy(WildcardTypeName.producerOf(rendererWildcard)) + KClass::class.asClassName().parameterizedBy(WildcardTypeName.producerOf(rendererWildcard)), ) .addStatement("return %T::class", clazz.toClassName()) .build() diff --git a/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/processor/ContributesRobotProcessor.kt b/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/processor/ContributesRobotProcessor.kt index e7087f09..c13ae822 100644 --- a/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/processor/ContributesRobotProcessor.kt +++ b/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/processor/ContributesRobotProcessor.kt @@ -100,7 +100,7 @@ internal class ContributesRobotProcessor( .addAnnotation( AnnotationSpec.builder(ContributesTo::class) .addMember("%T::class", clazz.scope().type.toClassName()) - .build() + .build(), ) .apply { if (!clazz.hasInjectAnnotation()) { @@ -110,7 +110,7 @@ internal class ContributesRobotProcessor( .returns(clazz.toClassName()) .addParameters(clazz.constructorParameters().map { it.toParameterSpec() }) .addCode(clazz.constructorCall()) - .build() + .build(), ) } } @@ -121,7 +121,7 @@ internal class ContributesRobotProcessor( .addAnnotation( AnnotationSpec.builder(robotKey) .addMember("%T::class", clazz.toClassName()) - .build() + .build(), ) .addParameter( name = "robot", @@ -129,10 +129,10 @@ internal class ContributesRobotProcessor( ) .returns(robotClassName) .addStatement("return robot()") - .build() + .build(), ) .addProperty(name = clazz.innerClassNames().decapitalize(), type = clazz.toClassName()) - .build() + .build(), ) .build() diff --git a/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/processor/ContributesScopedProcessor.kt b/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/processor/ContributesScopedProcessor.kt index 64fa1671..6a904102 100644 --- a/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/processor/ContributesScopedProcessor.kt +++ b/metro-extensions/contribute/impl-code-generators/src/main/kotlin/software/ralf/app/platform/metro/processor/ContributesScopedProcessor.kt @@ -96,7 +96,7 @@ internal class ContributesScopedProcessor( .addAnnotation( AnnotationSpec.builder(ContributesTo::class) .addMember("%T::class", scopeClassName) - .build() + .build(), ) .apply { if (!clazz.hasInjectAnnotation()) { @@ -109,14 +109,14 @@ internal class ContributesScopedProcessor( clazz.annotations .filter { it.isMetroScopeAnnotation() } .map { it.toAnnotationSpec() } - .toList() + .toList(), ) .returns(clazz.toClassName()) .addParameters(clazz.constructorParameters().map { it.toParameterSpec() }) .addCode(clazz.constructorCall()) - .build() + .build(), ) - .build() + .build(), ) } } @@ -133,7 +133,7 @@ internal class ContributesScopedProcessor( .receiver(clazz.toClassName()) .build() } - .toList() + .toList(), ) .addProperty( PropertySpec.builder("bind${clazz.innerClassNames()}Scoped", scopedClassName) @@ -142,12 +142,12 @@ internal class ContributesScopedProcessor( .addAnnotation( AnnotationSpec.builder(ForScope::class) .addMember("%T::class", scopeClassName) - .build() + .build(), ) .receiver(clazz.toClassName()) - .build() + .build(), ) - .build() + .build(), ) .build() diff --git a/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/Compilation.kt b/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/Compilation.kt index 55c1b99b..5c154f49 100644 --- a/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/Compilation.kt +++ b/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/Compilation.kt @@ -128,7 +128,7 @@ class Compilation internal constructor(val kotlinCompilation: KotlinCompilation) inheritClassPath = true jvmTarget = JvmTarget.JVM_21.description verbose = false - } + }, ) } } diff --git a/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/processor/ContributesRendererProcessorTest.kt b/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/processor/ContributesRendererProcessorTest.kt index dc172cf9..bca8b7ea 100644 --- a/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/processor/ContributesRendererProcessorTest.kt +++ b/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/processor/ContributesRendererProcessorTest.kt @@ -63,7 +63,7 @@ class ContributesRendererProcessorTest { with( generatedGraph.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRenderer" - } + }, ) { assertThat(parameters).isEmpty() assertThat(returnType).isEqualTo(testRenderer) @@ -74,7 +74,7 @@ class ContributesRendererProcessorTest { with( generatedGraph.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRendererModel" - } + }, ) { assertThat(parameters.single().type).isEqualTo(Function0::class.java) assertThat(returnType).isEqualTo(Renderer::class.java) @@ -86,7 +86,7 @@ class ContributesRendererProcessorTest { with( generatedGraph.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRendererModelKey" - } + }, ) { assertThat(parameters).isEmpty() assertThat(returnType).isEqualTo(KClass::class.java) @@ -136,7 +136,7 @@ class ContributesRendererProcessorTest { with( generatedGraph.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRendererInner" - } + }, ) { assertThat(parameters).isEmpty() assertThat(returnType).isEqualTo(testRenderer.inner) @@ -147,7 +147,7 @@ class ContributesRendererProcessorTest { with( generatedGraph.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRendererInnerModel" - } + }, ) { assertThat(parameters.single().type).isEqualTo(Function0::class.java) assertThat(returnType).isEqualTo(Renderer::class.java) @@ -189,7 +189,7 @@ class ContributesRendererProcessorTest { with( generatedGraph.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRenderer" - } + }, ) { assertThat(parameters).isEmpty() assertThat(returnType).isEqualTo(testRenderer) @@ -200,7 +200,7 @@ class ContributesRendererProcessorTest { with( generatedGraph.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRendererPresenterModel" - } + }, ) { assertThat(parameters.single().type).isEqualTo(Function0::class.java) assertThat(returnType).isEqualTo(Renderer::class.java) @@ -256,7 +256,7 @@ class ContributesRendererProcessorTest { class TestRenderer : OtherRenderer { override fun render(model: Model) = Unit } - """ + """, ) { assertThat(testRenderer.modelType).isEqualTo(model) } @@ -284,7 +284,7 @@ class ContributesRendererProcessorTest { class TestRenderer : OtherRenderer4 { override fun render(model: Model) = Unit } - """ + """, ) { assertThat(testRenderer.modelType).isEqualTo(model) } @@ -315,7 +315,7 @@ class ContributesRendererProcessorTest { assertThat(messages) .contains( "Couldn't find BaseModel type for TestRenderer. Consider adding " + - "an explicit parameter.Found: software.ralf.test.Model1, software.ralf.test.Model2" + "an explicit parameter.Found: software.ralf.test.Model1, software.ralf.test.Model2", ) } } @@ -355,7 +355,7 @@ class ContributesRendererProcessorTest { with( generatedGraph.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRenderer" - } + }, ) { assertThat(parameters).isEmpty() assertThat(returnType).isEqualTo(testRenderer) @@ -426,7 +426,11 @@ class ContributesRendererProcessorTest { ) assertThat( - graphInterface.newMetroGraph().modelToRendererMapping.values.distinct() + graphInterface + .newMetroGraph() + .modelToRendererMapping + .values + .distinct(), ) .containsOnly(testRenderer.kotlin) } @@ -464,14 +468,14 @@ class ContributesRendererProcessorTest { it.name.startsWith("provideSoftwareRalfTestTestRendererPresenterModel") && !it.name.endsWith("Key") } - .map { it.name } + .map { it.name }, ) .containsOnly("provideSoftwareRalfTestTestRendererPresenterModel") assertThat( generatedGraph.declaredNonSyntheticMethods .filter { it.name.startsWith("provideSoftwareRalfTestTestRendererPresenterModelKey") } - .map { it.name } + .map { it.name }, ) .containsOnly("provideSoftwareRalfTestTestRendererPresenterModelKey") @@ -591,7 +595,7 @@ class ContributesRendererProcessorTest { .contains( "Source0.kt:15: Renderers should not be singletons in the " + "RendererScope. The RendererFactory will cache the Renderer when " + - "necessary. Remove the @SingleIn(RendererScope::class) annotation." + "necessary. Remove the @SingleIn(RendererScope::class) annotation.", ) } } @@ -621,7 +625,7 @@ class ContributesRendererProcessorTest { assertThat(messages) .contains( "It's redundant to use @Inject when using @ContributesRenderer " + - "for a Renderer with a zero-arg constructor." + "for a Renderer with a zero-arg constructor.", ) } } @@ -652,7 +656,7 @@ class ContributesRendererProcessorTest { with( generatedGraph.declaredNonSyntheticMethods.single { it.name == "provideSoftwareRalfTestTestRenderer" - } + }, ) { assertThat(parameters.single().type).isEqualTo(String::class.java) assertThat(returnType).isEqualTo(testRenderer) @@ -690,7 +694,7 @@ class ContributesRendererProcessorTest { .contains( "TestRenderer has multiple constructors. Annotate the constructor to use with " + "@Inject, or remove the extra constructors so @ContributesRenderer can generate " + - "a provider." + "a provider.", ) } } @@ -746,7 +750,7 @@ class ContributesRendererProcessorTest { classLoader.loadClass( "$METRO_LOOKUP_PACKAGE.$packageName." + canonicalName.substringAfter(packageName).substring(1).replace(".", "") + - "Graph" + "Graph", ) private val Class<*>.modelType: KClass<*> diff --git a/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/processor/ContributesRobotGeneratorTest.kt b/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/processor/ContributesRobotGeneratorTest.kt index 7a624d0f..456dcd22 100644 --- a/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/processor/ContributesRobotGeneratorTest.kt +++ b/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/processor/ContributesRobotGeneratorTest.kt @@ -96,7 +96,7 @@ class ContributesRobotGeneratorTest { .isEqualTo(AppScope::class) assertThat( - robotGraph.declaredNonSyntheticMethods.singleOrNull { it.name == "provideTestRobot" } + robotGraph.declaredNonSyntheticMethods.singleOrNull { it.name == "provideTestRobot" }, ) .isNull() @@ -137,7 +137,7 @@ class ContributesRobotGeneratorTest { val robotGraph = testRobot.graph assertThat( - robotGraph.declaredNonSyntheticMethods.singleOrNull { it.name == "provideTestRobot" } + robotGraph.declaredNonSyntheticMethods.singleOrNull { it.name == "provideTestRobot" }, ) .isNull() @@ -172,7 +172,7 @@ class ContributesRobotGeneratorTest { val robotGraph = testRobot.graph assertThat( - robotGraph.declaredNonSyntheticMethods.singleOrNull { it.name == "provideTestRobot" } + robotGraph.declaredNonSyntheticMethods.singleOrNull { it.name == "provideTestRobot" }, ) .isNull() @@ -203,7 +203,7 @@ class ContributesRobotGeneratorTest { assertThat(messages) .contains( "TestRobot has multiple constructors. Annotate the constructor to use with @Inject, " + - "or remove the extra constructors so @ContributesRobot can generate a provider." + "or remove the extra constructors so @ContributesRobot can generate a provider.", ) } } @@ -255,7 +255,7 @@ class ContributesRobotGeneratorTest { @ContributesRobot(AppScope::class) class TestRobot : BaseRobot2() - """ + """, ) { assertThat(testRobot.graph).isNotNull() } @@ -282,7 +282,7 @@ class ContributesRobotGeneratorTest { assertThat(messages) .contains( "In order to use @ContributesRobot, TestRobot must implement " + - "software.ralf.app.platform.robot.Robot." + "software.ralf.app.platform.robot.Robot.", ) } } @@ -310,7 +310,7 @@ class ContributesRobotGeneratorTest { .contains( "It's not allowed allowed for a robot to be a singleton, because " + "the lifetime of the robot is scoped to the robot() factory function. " + - "Remove the @SingleIn annotation." + "Remove the @SingleIn annotation.", ) } } @@ -403,10 +403,10 @@ class ContributesRobotGeneratorTest { classLoader.loadClass( "$METRO_LOOKUP_PACKAGE.$packageName." + canonicalName.substringAfter(packageName).substring(1).split(".").joinToString( - separator = "" + separator = "", ) { it.capitalize() } + - "Graph" + "Graph", ) } diff --git a/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/processor/ContributesScopedProcessorTest.kt b/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/processor/ContributesScopedProcessorTest.kt index 1d5e6859..9d80afb3 100644 --- a/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/processor/ContributesScopedProcessorTest.kt +++ b/metro-extensions/contribute/impl-code-generators/src/test/kotlin/software/ralf/app/platform/inject/metro/processor/ContributesScopedProcessorTest.kt @@ -63,7 +63,7 @@ class ContributesScopedProcessorTest { fun create(): GraphInterface = createGraph() } } - """ + """, ) { val scopedGraph = testClass.graph @@ -100,7 +100,7 @@ class ContributesScopedProcessorTest { graphInterface.declaredNonSyntheticMethods .single { it.name == "getSuperTypeInstance" } .invoke(graph)::class - .java + .java, ) .isEqualTo(testClass) } @@ -126,7 +126,7 @@ class ContributesScopedProcessorTest { @ContributesScoped(AppScope::class) class Inner : SuperType, Scoped } - """ + """, ) { val scopedGraph = testClass.inner.graph @@ -139,7 +139,7 @@ class ContributesScopedProcessorTest { } with( - scopedGraph.declaredNonSyntheticMethods.single { it.name == "getBindTestClassInnerScoped" } + scopedGraph.declaredNonSyntheticMethods.single { it.name == "getBindTestClassInnerScoped" }, ) { assertThat(parameters.single().type).isEqualTo(testClass.inner) assertThat(returnType).isEqualTo(Scoped::class.java) @@ -187,7 +187,7 @@ class ContributesScopedProcessorTest { fun create(): GraphInterface = createGraph() } } - """ + """, ) { val scopedGraph = testClass.graph @@ -212,7 +212,7 @@ class ContributesScopedProcessorTest { assertThat( graphInterface.declaredNonSyntheticMethods .single { it.name == "getSuperTypeInstance" } - .invoke(graph) + .invoke(graph), ) .isEqualTo(scopedInstance) } @@ -262,7 +262,7 @@ class ContributesScopedProcessorTest { fun create(): GraphInterface = createGraph() } } - """ + """, ) { val scopedGraph = testClass.graph @@ -298,7 +298,7 @@ class ContributesScopedProcessorTest { @SingleIn(AppScope::class) @ContributesScoped(AppScope::class) class TestClass : Scoped - """ + """, ) { val scopedGraph = testClass.graph @@ -334,7 +334,7 @@ class ContributesScopedProcessorTest { ) { assertThat(messages) .contains( - "In order to use @ContributesScoped, TestClass must implement software.ralf.app.platform.scope.Scoped." + "In order to use @ContributesScoped, TestClass must implement software.ralf.app.platform.scope.Scoped.", ) } } @@ -359,7 +359,7 @@ class ContributesScopedProcessorTest { ) { assertThat(messages) .contains( - "In order to use @ContributesScoped, TestClass must implement software.ralf.app.platform.scope.Scoped." + "In order to use @ContributesScoped, TestClass must implement software.ralf.app.platform.scope.Scoped.", ) } } @@ -388,7 +388,7 @@ class ContributesScopedProcessorTest { ) { assertThat(messages) .contains( - "In order to use @ContributesScoped, TestClass is allowed to have only one other super type besides Scoped." + "In order to use @ContributesScoped, TestClass is allowed to have only one other super type besides Scoped.", ) } } @@ -412,7 +412,7 @@ class ContributesScopedProcessorTest { @SingleIn(AppScope::class) @ContributesScoped(AppScope::class) class TestClass : SuperType2 - """ + """, ) { assertThat(testClass.graph).isNotNull() } @@ -442,7 +442,7 @@ class ContributesScopedProcessorTest { assertThat(messages) .contains( "TestClass has multiple constructors. Annotate the constructor to use with @Inject, " + - "or remove the extra constructors so @ContributesScoped can generate a provider." + "or remove the extra constructors so @ContributesScoped can generate a provider.", ) } } @@ -473,7 +473,7 @@ class ContributesScopedProcessorTest { "TestClass implements Scoped, but uses @ContributesBinding instead of " + "@ContributesScoped. When implementing Scoped the annotation @ContributesScoped " + "must be used instead of @ContributesBinding to bind both super types correctly. " + - "It's not necessary to use @ContributesBinding." + "It's not necessary to use @ContributesBinding.", ) } } @@ -530,10 +530,10 @@ class ContributesScopedProcessorTest { classLoader.loadClass( "$METRO_LOOKUP_PACKAGE.$packageName." + canonicalName.substringAfter(packageName).substring(1).split(".").joinToString( - separator = "" + separator = "", ) { it.capitalize() } + - "Graph" + "Graph", ) } diff --git a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/AppPlatformMetroExtensionsPluginComponentRegistrar.kt b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/AppPlatformMetroExtensionsPluginComponentRegistrar.kt index e48abb5d..8c7c5516 100644 --- a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/AppPlatformMetroExtensionsPluginComponentRegistrar.kt +++ b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/AppPlatformMetroExtensionsPluginComponentRegistrar.kt @@ -20,7 +20,7 @@ public class AppPlatformMetroExtensionsPluginComponentRegistrar : CompilerPlugin } catch (throwable: Throwable) { System.err.println( "[APP PLATFORM] Unable to load Kotlin compiler compatibility support; " + - "skipping compiler extensions." + "skipping compiler extensions.", ) throwable.printStackTrace() return diff --git a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/fir/FirHelpers.kt b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/fir/FirHelpers.kt index 1de42066..9c08b3b8 100644 --- a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/fir/FirHelpers.kt +++ b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/fir/FirHelpers.kt @@ -278,7 +278,7 @@ internal fun buildClassExpression( original = null, mapping = linkedMapOf( - qualifier to buildSyntheticClassLiteralParameter(classType, classSymbol, session) + qualifier to buildSyntheticClassLiteralParameter(classType, classSymbol, session), ), ) } @@ -311,7 +311,7 @@ internal fun buildClassExpression( classType = classType, containingSymbol = classSymbol, session = session, - ) + ), ), ) } diff --git a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/renderer/ContributesRendererFir.kt b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/renderer/ContributesRendererFir.kt index 1bed5020..fac1c85e 100644 --- a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/renderer/ContributesRendererFir.kt +++ b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/renderer/ContributesRendererFir.kt @@ -235,7 +235,7 @@ internal constructor( } private fun generatedRendererContributionOwner( - classSymbol: FirClassSymbol<*> + classSymbol: FirClassSymbol<*>, ): FirRegularClassSymbol? { if (classSymbol.classId.shortClassName != ContributesRendererIds.NESTED_INTERFACE_NAME) { return null @@ -250,7 +250,7 @@ internal constructor( } private fun generatedRendererProviderCompanionOwner( - classSymbol: FirClassSymbol<*> + classSymbol: FirClassSymbol<*>, ): FirRegularClassSymbol? { if (classSymbol.classId.shortClassName != SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT) { return null @@ -351,7 +351,7 @@ internal constructor( constructor.parameters, generatedParameters, ) - } + }, ) } } diff --git a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/renderer/ContributesRendererIrExtension.kt b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/renderer/ContributesRendererIrExtension.kt index 925f574b..2c73f541 100644 --- a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/renderer/ContributesRendererIrExtension.kt +++ b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/renderer/ContributesRendererIrExtension.kt @@ -70,7 +70,7 @@ internal class ContributesRendererIrExtension(private val compatContext: CompatC IrGenerationExtension { override fun generate(moduleFragment: IrModuleFragment, pluginContext: IrPluginContext) { moduleFragment.transformChildrenVoid( - ContributesRendererIrTransformer(pluginContext, compatContext) + ContributesRendererIrTransformer(pluginContext, compatContext), ) } } @@ -139,7 +139,7 @@ private class ContributesRendererIrTransformer( pluginContext.irBuiltIns.kClassClass.typeWith(ownerClassSymbol.defaultType), ownerClassSymbol, ownerClassSymbol.defaultType, - ) + ), ) } } diff --git a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/renderer/ContributesRendererSupport.kt b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/renderer/ContributesRendererSupport.kt index 165e55b7..74a85cef 100644 --- a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/renderer/ContributesRendererSupport.kt +++ b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/renderer/ContributesRendererSupport.kt @@ -94,13 +94,13 @@ internal fun resolveRendererModelType( buildString { append( "Couldn't find BaseModel type for ${classSymbol.name.asString()}. Consider adding " + - "an explicit parameter." + "an explicit parameter.", ) if (implicitModelTypes.size > 1) { append("Found: ") append(implicitModelTypes.joinToString { it.classId.asSingleFqName().asString() }) } - } + }, ) } } @@ -351,7 +351,7 @@ private fun findDirectSealedInheritorsInSource( @OptIn(DirectDeclarationsAccess::class) private fun collectRegularClasses( - declarations: List + declarations: List, ): Sequence { return declarations.asSequence().flatMap { declaration -> val regularClass = declaration as? FirRegularClass ?: return@flatMap emptySequence() diff --git a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/robot/ContributesRobotFir.kt b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/robot/ContributesRobotFir.kt index 1739fddb..a3b7bb31 100644 --- a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/robot/ContributesRobotFir.kt +++ b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/robot/ContributesRobotFir.kt @@ -122,7 +122,7 @@ internal constructor( ContributionHint( contributingClassId = classSymbol.classId.createNestedClassId( - ContributesRobotIds.NESTED_ROBOT_GRAPH_INTERFACE_NAME + ContributesRobotIds.NESTED_ROBOT_GRAPH_INTERFACE_NAME, ), scope = scopeClassId, ), @@ -276,7 +276,7 @@ internal constructor( } private fun generatedRobotContributionOwner( - classSymbol: FirClassSymbol<*> + classSymbol: FirClassSymbol<*>, ): FirRegularClassSymbol? { if (classSymbol.classId.shortClassName != ContributesRobotIds.NESTED_INTERFACE_NAME) { return null @@ -291,7 +291,7 @@ internal constructor( } private fun generatedRobotProviderCompanionOwner( - classSymbol: FirClassSymbol<*> + classSymbol: FirClassSymbol<*>, ): FirRegularClassSymbol? { if (classSymbol.classId.shortClassName != SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT) { return null @@ -364,7 +364,7 @@ internal constructor( constructor.parameters, generatedParameters, ) - } + }, ) } } diff --git a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/robot/ContributesRobotIds.kt b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/robot/ContributesRobotIds.kt index 59819c89..fbaaa8e8 100644 --- a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/robot/ContributesRobotIds.kt +++ b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/robot/ContributesRobotIds.kt @@ -22,7 +22,7 @@ internal object ContributesRobotIds { fun generatedRobotPropertyName(contributingClassId: ClassId): Name { return Name.identifier( - generatedClassNamePrefix(contributingClassId).replaceFirstChar { char -> char.lowercase() } + generatedClassNamePrefix(contributingClassId).replaceFirstChar { char -> char.lowercase() }, ) } } diff --git a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/robot/ContributesRobotMetroExtension.kt b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/robot/ContributesRobotMetroExtension.kt index 1e62cdb4..038c90e7 100644 --- a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/robot/ContributesRobotMetroExtension.kt +++ b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/robot/ContributesRobotMetroExtension.kt @@ -56,7 +56,7 @@ public class ContributesRobotMetroExtension(private val session: FirSession) : ?: return@flatMap emptyList() val robotGraphContributionClassId = parentSymbol.classId.createNestedClassId( - ContributesRobotIds.NESTED_ROBOT_GRAPH_INTERFACE_NAME + ContributesRobotIds.NESTED_ROBOT_GRAPH_INTERFACE_NAME, ) val robotGraphContributionSymbol = session.symbolProvider.getClassLikeSymbolByClassId(robotGraphContributionClassId) diff --git a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/scoped/ContributesScopedFir.kt b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/scoped/ContributesScopedFir.kt index 3cde203a..06b59085 100644 --- a/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/scoped/ContributesScopedFir.kt +++ b/metro-extensions/contribute/impl-compiler-plugin/src/main/kotlin/software/ralf/app/platform/metro/compiler/scoped/ContributesScopedFir.kt @@ -249,7 +249,7 @@ internal constructor( } private fun generatedScopedContributionOwner( - classSymbol: FirClassSymbol<*> + classSymbol: FirClassSymbol<*>, ): FirRegularClassSymbol? { if (classSymbol.classId.shortClassName != ContributesScopedIds.NESTED_INTERFACE_NAME) { return null @@ -265,7 +265,7 @@ internal constructor( } private fun generatedScopedProviderCompanionOwner( - classSymbol: FirClassSymbol<*> + classSymbol: FirClassSymbol<*>, ): FirRegularClassSymbol? { if (classSymbol.classId.shortClassName != SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT) { return null @@ -363,7 +363,7 @@ internal constructor( constructor.parameters, generatedParameters, ) - } + }, ) } } @@ -404,7 +404,7 @@ internal constructor( argument = scopeArg, containingSymbol = functionSymbol, session = session, - ) + ), ) }, ) @@ -417,7 +417,7 @@ internal constructor( returnType: ConeKotlinType, additionalAnnotations: MutableList.( - FirNamedFunctionSymbol + FirNamedFunctionSymbol, ) -> Unit = {}, ): FirFunction { diff --git a/metro-extensions/contribute/impl-compiler-plugin/src/test/kotlin/software/ralf/app/platform/metro/compiler/support/UnusedRendererFactory.kt b/metro-extensions/contribute/impl-compiler-plugin/src/test/kotlin/software/ralf/app/platform/metro/compiler/support/UnusedRendererFactory.kt index a93eeabb..c0c3e603 100644 --- a/metro-extensions/contribute/impl-compiler-plugin/src/test/kotlin/software/ralf/app/platform/metro/compiler/support/UnusedRendererFactory.kt +++ b/metro-extensions/contribute/impl-compiler-plugin/src/test/kotlin/software/ralf/app/platform/metro/compiler/support/UnusedRendererFactory.kt @@ -6,7 +6,7 @@ import software.ralf.app.platform.renderer.RendererFactory object UnusedRendererFactory : RendererFactory { override fun createRenderer( - modelType: kotlin.reflect.KClass + modelType: kotlin.reflect.KClass, ): Renderer { error("unused") } diff --git a/metro/impl/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/metro/AppScopeCoroutineScopeGraph.kt b/metro/impl/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/metro/AppScopeCoroutineScopeGraph.kt index 0b411e46..13cf657d 100644 --- a/metro/impl/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/metro/AppScopeCoroutineScopeGraph.kt +++ b/metro/impl/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/metro/AppScopeCoroutineScopeGraph.kt @@ -25,7 +25,7 @@ public object AppScopeCoroutineScopeGraph { @SingleIn(AppScope::class) @ForScope(AppScope::class) public fun provideAppScopeCoroutineScopeScoped( - @IoCoroutineDispatcher dispatcher: CoroutineDispatcher + @IoCoroutineDispatcher dispatcher: CoroutineDispatcher, ): CoroutineScopeScoped { return CoroutineScopeScoped(dispatcher + SupervisorJob() + CoroutineName("AppScope")) } @@ -37,7 +37,7 @@ public object AppScopeCoroutineScopeGraph { @Provides @ForScope(AppScope::class) public fun provideAppCoroutineScope( - @ForScope(AppScope::class) appScopeCoroutineScopeScoped: CoroutineScopeScoped + @ForScope(AppScope::class) appScopeCoroutineScopeScoped: CoroutineScopeScoped, ): CoroutineScope { return appScopeCoroutineScopeScoped.createChild() } diff --git a/metro/public/src/commonMain/kotlin/software/ralf/app/platform/inject/metro/ContributesScoped.kt b/metro/public/src/commonMain/kotlin/software/ralf/app/platform/inject/metro/ContributesScoped.kt index bf43416b..0b35a719 100644 --- a/metro/public/src/commonMain/kotlin/software/ralf/app/platform/inject/metro/ContributesScoped.kt +++ b/metro/public/src/commonMain/kotlin/software/ralf/app/platform/inject/metro/ContributesScoped.kt @@ -36,5 +36,5 @@ import software.ralf.app.platform.scope.Scoped @Target(CLASS) public annotation class ContributesScoped( /** The scope in which to include this contributed binding. */ - val scope: KClass<*> + val scope: KClass<*>, ) diff --git a/metro/public/src/commonMain/kotlin/software/ralf/app/platform/scope/di/metro/MetroService.kt b/metro/public/src/commonMain/kotlin/software/ralf/app/platform/scope/di/metro/MetroService.kt index 8474aa49..43b1071f 100644 --- a/metro/public/src/commonMain/kotlin/software/ralf/app/platform/scope/di/metro/MetroService.kt +++ b/metro/public/src/commonMain/kotlin/software/ralf/app/platform/scope/di/metro/MetroService.kt @@ -38,7 +38,7 @@ public inline fun Scope.metroDependencyGraph(): T { throw NoSuchElementException( "Couldn't find dependency graph implementing ${T::class}. Inspected: " + "[${diGraphs.joinToString { it.simpleName.toString() }}] (fully qualified " + - "names: [${diGraphs.joinToString { it.toString().replace('\$', '.') }}])" + "names: [${diGraphs.joinToString { it.toString().replace('\$', '.') }}])", ) } diff --git a/metro/public/src/commonTest/kotlin/software/ralf/app/platform/scope/di/metro/MetroServiceTest.kt b/metro/public/src/commonTest/kotlin/software/ralf/app/platform/scope/di/metro/MetroServiceTest.kt index 80ad577c..f37bddfa 100644 --- a/metro/public/src/commonTest/kotlin/software/ralf/app/platform/scope/di/metro/MetroServiceTest.kt +++ b/metro/public/src/commonTest/kotlin/software/ralf/app/platform/scope/di/metro/MetroServiceTest.kt @@ -47,7 +47,7 @@ class MetroServiceTest { "[class software.ralf.app.platform.scope.di.metro.MetroServiceTest." + "ChildGraphImpl$kotlinReflectWarning, class software.ralf.app." + "platform.scope.di.metro.MetroServiceTest.ParentGraphImpl" + - "$kotlinReflectWarning])" + "$kotlinReflectWarning])", ) } diff --git a/presenter-backstack-nav3/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/backstack/nav3/PresenterBackstackScopeImpl.kt b/presenter-backstack-nav3/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/backstack/nav3/PresenterBackstackScopeImpl.kt index 7a25d212..aed3102e 100644 --- a/presenter-backstack-nav3/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/backstack/nav3/PresenterBackstackScopeImpl.kt +++ b/presenter-backstack-nav3/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/backstack/nav3/PresenterBackstackScopeImpl.kt @@ -18,7 +18,7 @@ internal class PresenterBackstackScopeImpl(initial: ComposePresenter = diff --git a/presenter-backstack-nav3/public/src/commonTest/kotlin/software/ralf/app/platform/presenter/backstack/nav3/PresenterBackstackScopeTest.kt b/presenter-backstack-nav3/public/src/commonTest/kotlin/software/ralf/app/platform/presenter/backstack/nav3/PresenterBackstackScopeTest.kt index feb46fad..f7cd6a45 100644 --- a/presenter-backstack-nav3/public/src/commonTest/kotlin/software/ralf/app/platform/presenter/backstack/nav3/PresenterBackstackScopeTest.kt +++ b/presenter-backstack-nav3/public/src/commonTest/kotlin/software/ralf/app/platform/presenter/backstack/nav3/PresenterBackstackScopeTest.kt @@ -130,7 +130,7 @@ class PresenterBackstackScopeTest { } private fun createScopeSnapshotPresenter( - initialPresenter: ComposePresenter + initialPresenter: ComposePresenter, ): ComposePresenter { return object : ComposePresenter { @Composable @@ -149,7 +149,7 @@ class PresenterBackstackScopeTest { } private fun createPresenterBackstackModelPresenter( - initialPresenter: ComposePresenter + initialPresenter: ComposePresenter, ): ComposePresenter { return object : ComposePresenter { @Composable diff --git a/presenter-backstack-nav3/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/backstack/nav3/FakePresenterBackstackScope.kt b/presenter-backstack-nav3/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/backstack/nav3/FakePresenterBackstackScope.kt index 63ef0bdd..b260500e 100644 --- a/presenter-backstack-nav3/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/backstack/nav3/FakePresenterBackstackScope.kt +++ b/presenter-backstack-nav3/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/backstack/nav3/FakePresenterBackstackScope.kt @@ -72,11 +72,11 @@ public class FakePresenterBackstackScope( override fun present(input: Unit): BaseModel { return object : BaseModel {} } - } + }, ) : PresenterBackstackScope { private val _recordedBackstackChanges: MutableStateFlow> = MutableStateFlow( - listOf(BackstackChangeImpl(backstack = listOf(rootPresenter), action = Action.PUSH)) + listOf(BackstackChangeImpl(backstack = listOf(rootPresenter), action = Action.PUSH)), ) private val _lastBackstackChange = diff --git a/presenter-backstack-nav3/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/backstack/nav3/TestPresenterBackstackScopePresenter.kt b/presenter-backstack-nav3/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/backstack/nav3/TestPresenterBackstackScopePresenter.kt index 57d69dfa..38549137 100644 --- a/presenter-backstack-nav3/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/backstack/nav3/TestPresenterBackstackScopePresenter.kt +++ b/presenter-backstack-nav3/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/backstack/nav3/TestPresenterBackstackScopePresenter.kt @@ -54,7 +54,7 @@ import software.ralf.app.platform.presenter.compose.ComposePresenter @ExperimentalAppPlatform public fun ComposePresenter .withPresenterBackstackScope( - scope: PresenterBackstackScope = FakePresenterBackstackScope() + scope: PresenterBackstackScope = FakePresenterBackstackScope(), ): ComposePresenter { val delegate = this return object : ComposePresenter { diff --git a/presenter-compose/impl/src/androidMain/kotlin/software/ralf/app/platform/presenter/compose/AndroidComposePresenterScopeFactory.kt b/presenter-compose/impl/src/androidMain/kotlin/software/ralf/app/platform/presenter/compose/AndroidComposePresenterScopeFactory.kt index ad3fc19a..4d517d61 100644 --- a/presenter-compose/impl/src/androidMain/kotlin/software/ralf/app/platform/presenter/compose/AndroidComposePresenterScopeFactory.kt +++ b/presenter-compose/impl/src/androidMain/kotlin/software/ralf/app/platform/presenter/compose/AndroidComposePresenterScopeFactory.kt @@ -34,7 +34,7 @@ public interface AndroidComposePresenterScopeFactoryComponent { @KiProvides @KiSingleIn(KiAppScope::class) public fun provideAndroidComposePresenterScopeFactory( - @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope + @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope, ): ComposePresenterScopeFactory = AndroidComposePresenterScopeFactory(coroutineScopeFactory) } @@ -46,6 +46,6 @@ public object AndroidComposePresenterScopeFactoryGraph { @MetroProvides @MetroSingleIn(MetroAppScope::class) public fun provideAndroidComposePresenterScopeFactory( - @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope + @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope, ): ComposePresenterScopeFactory = AndroidComposePresenterScopeFactory { coroutineScopeFactory() } } diff --git a/presenter-compose/impl/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/KotlinInjectInjectionTest.kt b/presenter-compose/impl/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/KotlinInjectInjectionTest.kt index e23504c7..9d71a08e 100644 --- a/presenter-compose/impl/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/KotlinInjectInjectionTest.kt +++ b/presenter-compose/impl/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/KotlinInjectInjectionTest.kt @@ -56,14 +56,14 @@ abstract class KotlinInjectTestComponent( @Provides fun provideComposePresenterScopeFactory( - factory: KotlinInjectTestComposePresenterScopeFactory + factory: KotlinInjectTestComposePresenterScopeFactory, ): ComposePresenterScopeFactory = factory } @Inject @SingleIn(AppScope::class) class KotlinInjectTestComposePresenterScopeFactory( - @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope + @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope, ) : ComposePresenterScopeFactory by DefaultComposePresenterScopeFactory( coroutineScopeFactory = coroutineScopeFactory, diff --git a/presenter-compose/impl/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/MetroInjectionTest.kt b/presenter-compose/impl/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/MetroInjectionTest.kt index bbcd8c0b..4b06aa17 100644 --- a/presenter-compose/impl/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/MetroInjectionTest.kt +++ b/presenter-compose/impl/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/MetroInjectionTest.kt @@ -41,7 +41,7 @@ interface MetroTestComponent { @DependencyGraph.Factory fun interface Factory { fun create( - @Provides @PresenterCoroutineScope coroutineScope: CoroutineScope + @Provides @PresenterCoroutineScope coroutineScope: CoroutineScope, ): MetroTestComponent } @@ -53,7 +53,7 @@ interface MetroTestComponent { @Inject @SingleIn(AppScope::class) class MetroTestComposePresenterScopeFactory( - @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope + @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope, ) : ComposePresenterScopeFactory by DefaultComposePresenterScopeFactory( coroutineScopeFactory = { coroutineScopeFactory() }, diff --git a/presenter-compose/impl/src/desktopMain/kotlin/software/ralf/app/platform/presenter/compose/DesktopComposePresenterScopeFactory.kt b/presenter-compose/impl/src/desktopMain/kotlin/software/ralf/app/platform/presenter/compose/DesktopComposePresenterScopeFactory.kt index ea0d0238..7345ec5f 100644 --- a/presenter-compose/impl/src/desktopMain/kotlin/software/ralf/app/platform/presenter/compose/DesktopComposePresenterScopeFactory.kt +++ b/presenter-compose/impl/src/desktopMain/kotlin/software/ralf/app/platform/presenter/compose/DesktopComposePresenterScopeFactory.kt @@ -32,7 +32,7 @@ public interface DesktopComposePresenterScopeFactoryComponent { @KiProvides @KiSingleIn(KiAppScope::class) public fun provideDesktopComposePresenterScopeFactory( - @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope + @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope, ): ComposePresenterScopeFactory = DesktopComposePresenterScopeFactory(coroutineScopeFactory) } @@ -44,6 +44,6 @@ public object DesktopComposePresenterScopeFactoryGraph { @MetroProvides @MetroSingleIn(MetroAppScope::class) public fun provideDesktopComposePresenterScopeFactory( - @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope + @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope, ): ComposePresenterScopeFactory = DesktopComposePresenterScopeFactory { coroutineScopeFactory() } } diff --git a/presenter-compose/impl/src/iosMain/kotlin/software/ralf/app/platform/presenter/compose/IosComposePresenterScopeFactory.kt b/presenter-compose/impl/src/iosMain/kotlin/software/ralf/app/platform/presenter/compose/IosComposePresenterScopeFactory.kt index d64878ce..ca17a603 100644 --- a/presenter-compose/impl/src/iosMain/kotlin/software/ralf/app/platform/presenter/compose/IosComposePresenterScopeFactory.kt +++ b/presenter-compose/impl/src/iosMain/kotlin/software/ralf/app/platform/presenter/compose/IosComposePresenterScopeFactory.kt @@ -32,7 +32,7 @@ public interface IosComposePresenterScopeFactoryComponent { @KiProvides @KiSingleIn(KiAppScope::class) public fun provideIosComposePresenterScopeFactory( - @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope + @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope, ): ComposePresenterScopeFactory = IosComposePresenterScopeFactory(coroutineScopeFactory) } @@ -44,6 +44,6 @@ public object IosComposePresenterScopeFactoryGraph { @MetroProvides @MetroSingleIn(MetroAppScope::class) public fun provideIosComposePresenterScopeFactory( - @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope + @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope, ): ComposePresenterScopeFactory = IosComposePresenterScopeFactory { coroutineScopeFactory() } } diff --git a/presenter-compose/impl/src/linuxMain/kotlin/software/ralf/app/platform/presenter/compose/LinuxComposePresenterScopeFactory.kt b/presenter-compose/impl/src/linuxMain/kotlin/software/ralf/app/platform/presenter/compose/LinuxComposePresenterScopeFactory.kt index 74944065..32d8099d 100644 --- a/presenter-compose/impl/src/linuxMain/kotlin/software/ralf/app/platform/presenter/compose/LinuxComposePresenterScopeFactory.kt +++ b/presenter-compose/impl/src/linuxMain/kotlin/software/ralf/app/platform/presenter/compose/LinuxComposePresenterScopeFactory.kt @@ -30,7 +30,7 @@ public interface LinuxComposePresenterScopeFactoryComponent { @KiProvides @KiSingleIn(KiAppScope::class) public fun provideLinuxComposePresenterScopeFactory( - @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope + @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope, ): ComposePresenterScopeFactory = LinuxComposePresenterScopeFactory(coroutineScopeFactory) } @@ -42,6 +42,6 @@ public object LinuxComposePresenterScopeFactoryGraph { @MetroProvides @MetroSingleIn(MetroAppScope::class) public fun provideLinuxComposePresenterScopeFactory( - @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope + @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope, ): ComposePresenterScopeFactory = LinuxComposePresenterScopeFactory { coroutineScopeFactory() } } diff --git a/presenter-compose/impl/src/wasmJsMain/kotlin/software/ralf/app/platform/presenter/compose/WasmJsComposePresenterScopeFactory.kt b/presenter-compose/impl/src/wasmJsMain/kotlin/software/ralf/app/platform/presenter/compose/WasmJsComposePresenterScopeFactory.kt index 96d23a29..6545487d 100644 --- a/presenter-compose/impl/src/wasmJsMain/kotlin/software/ralf/app/platform/presenter/compose/WasmJsComposePresenterScopeFactory.kt +++ b/presenter-compose/impl/src/wasmJsMain/kotlin/software/ralf/app/platform/presenter/compose/WasmJsComposePresenterScopeFactory.kt @@ -32,7 +32,7 @@ public interface WasmJsComposePresenterScopeFactoryComponent { @KiProvides @KiSingleIn(KiAppScope::class) public fun provideWasmJsComposePresenterScopeFactory( - @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope + @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope, ): ComposePresenterScopeFactory = WasmJsComposePresenterScopeFactory(coroutineScopeFactory) } @@ -44,6 +44,6 @@ public object WasmJsComposePresenterScopeFactoryGraph { @MetroProvides @MetroSingleIn(MetroAppScope::class) public fun provideWasmJsComposePresenterScopeFactory( - @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope + @PresenterCoroutineScope coroutineScopeFactory: () -> CoroutineScope, ): ComposePresenterScopeFactory = WasmJsComposePresenterScopeFactory { coroutineScopeFactory() } } diff --git a/presenter-compose/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/saveable/ReturningSaveableStateHolder.kt b/presenter-compose/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/saveable/ReturningSaveableStateHolder.kt index 1ae9d256..4d325482 100644 --- a/presenter-compose/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/saveable/ReturningSaveableStateHolder.kt +++ b/presenter-compose/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/saveable/ReturningSaveableStateHolder.kt @@ -100,7 +100,7 @@ public fun rememberReturningSaveableStateHolder(): ReturningSaveableStateHolder @OptIn(ExperimentalAppPlatform::class) private class ReturningSaveableStateHolderImpl( - private val savedStates: MutableMap>> = mutableMapOf() + private val savedStates: MutableMap>> = mutableMapOf(), ) : ReturningSaveableStateHolder { private val registries = mutableScatterMapOf() var parentSaveableStateRegistry: SaveableStateRegistry? = null @@ -115,7 +115,7 @@ private class ReturningSaveableStateHolderImpl( "which can be stored inside the Bundle." } ReturningSaveableStateRegistryWrapper( - base = SaveableStateRegistry(restoredValues = savedStates[key], canBeSaved) + base = SaveableStateRegistry(restoredValues = savedStates[key], canBeSaved), ) } val model = diff --git a/presenter-compose/public/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/backgesture/CommonBackGestureDispatcherPresenterTest.kt b/presenter-compose/public/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/backgesture/CommonBackGestureDispatcherPresenterTest.kt index 77a5113b..4d5d7586 100644 --- a/presenter-compose/public/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/backgesture/CommonBackGestureDispatcherPresenterTest.kt +++ b/presenter-compose/public/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/backgesture/CommonBackGestureDispatcherPresenterTest.kt @@ -72,7 +72,7 @@ class CommonBackGestureDispatcherPresenterTest { assertThat(awaitItem().lastEvent).isNull() dispatcher.onPredictiveBack( - flowOf(BackEventPresenter(1f, 1f, 1f, BackEventPresenter.EDGE_RIGHT)) + flowOf(BackEventPresenter(1f, 1f, 1f, BackEventPresenter.EDGE_RIGHT)), ) assertThat(awaitItem().lastEvent?.touchX).isEqualTo(1f) } @@ -138,7 +138,7 @@ class CommonBackGestureDispatcherPresenterTest { .messageContains( "Couldn't find the BackGestureDispatcherPresenter in the presenter hierarchy. " + "Did you register the BackGestureDispatcherPresenter instance as composition local? " + - "See LocalBackGestureDispatcherPresenter for more details." + "See LocalBackGestureDispatcherPresenter for more details.", ) } @@ -211,7 +211,7 @@ class CommonBackGestureDispatcherPresenterTest { assertFailure { dispatcher.onPredictiveBack(emptyFlow()) } .messageContains( "No back gesture listener was registered or they were all disabled. Check " + - "`listenerCount` before invoking this function." + "`listenerCount` before invoking this function.", ) } } diff --git a/presenter-compose/public/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/saveable/ReturningSaveableStateHolderTest.kt b/presenter-compose/public/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/saveable/ReturningSaveableStateHolderTest.kt index 7f042368..881a168e 100644 --- a/presenter-compose/public/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/saveable/ReturningSaveableStateHolderTest.kt +++ b/presenter-compose/public/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/saveable/ReturningSaveableStateHolderTest.kt @@ -91,7 +91,7 @@ class ReturningSaveableStateHolderTest { var savedValues: Map>? = null SaveablePresenter(key = MutableStateFlow("first"), parentRegistry = firstParentRegistry).test( - this + this, ) { val firstInitial = awaitItem() firstInitial.increment() diff --git a/presenter-compose/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/TestComposePresenterScope.kt b/presenter-compose/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/TestComposePresenterScope.kt index 681f73e3..dd59bb22 100644 --- a/presenter-compose/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/TestComposePresenterScope.kt +++ b/presenter-compose/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/TestComposePresenterScope.kt @@ -15,7 +15,7 @@ import kotlinx.coroutines.test.TestScope * @param coroutineContext a [CoroutineContext] to override any element of coroutine scope. */ public fun TestScope.composePresenterScope( - coroutineContext: CoroutineContext = EmptyCoroutineContext + coroutineContext: CoroutineContext = EmptyCoroutineContext, ): ComposePresenterScope { val scope = backgroundScope + CoroutineName("TestComposePresenterScope") + coroutineContext diff --git a/presenter-compose/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/backgesture/TestBackGestureDispatcherPresenter.kt b/presenter-compose/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/backgesture/TestBackGestureDispatcherPresenter.kt index 85ed4994..f9eeb8be 100644 --- a/presenter-compose/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/backgesture/TestBackGestureDispatcherPresenter.kt +++ b/presenter-compose/testing/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/backgesture/TestBackGestureDispatcherPresenter.kt @@ -39,7 +39,7 @@ private class TestBackGestureDispatcherPresenter ComposePresenter .withBackGestureDispatcher( - backEvents: SharedFlow = MutableSharedFlow() + backEvents: SharedFlow = MutableSharedFlow(), ): ComposePresenter = TestBackGestureDispatcherPresenter(this, backEvents.map { emptyFlow() }) @@ -52,5 +52,5 @@ public fun ComposePresenter */ public fun ComposePresenter .withBackGestureDispatcher( - backEvents: SharedFlow> + backEvents: SharedFlow>, ): ComposePresenter = TestBackGestureDispatcherPresenter(this, backEvents) diff --git a/presenter-compose/testing/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/backgesture/TestBackGestureDispatcherPresenterTest.kt b/presenter-compose/testing/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/backgesture/TestBackGestureDispatcherPresenterTest.kt index 0400576d..268679c8 100644 --- a/presenter-compose/testing/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/backgesture/TestBackGestureDispatcherPresenterTest.kt +++ b/presenter-compose/testing/src/commonTest/kotlin/software/ralf/app/platform/presenter/compose/backgesture/TestBackGestureDispatcherPresenterTest.kt @@ -38,7 +38,7 @@ class TestBackGestureDispatcherPresenterTest { assertFailure { presenter.test(this) {} } .messageContains( - "Couldn't find the BackGestureDispatcherPresenter in the presenter hierarchy." + "Couldn't find the BackGestureDispatcherPresenter in the presenter hierarchy.", ) } @@ -117,7 +117,7 @@ class TestBackGestureDispatcherPresenterTest { emit(BackEventPresenter(1f, 1f, 1f, BackEventPresenter.EDGE_LEFT)) delay(1.seconds) emit(BackEventPresenter(1f, 1f, 1f, BackEventPresenter.EDGE_LEFT)) - } + }, ) assertThat(awaitItem()).isEqualTo(Model(eventCount = 1, doneCount = 0)) @@ -130,7 +130,7 @@ class TestBackGestureDispatcherPresenterTest { flowOf( BackEventPresenter(1f, 1f, 1f, BackEventPresenter.EDGE_LEFT), BackEventPresenter(1f, 1f, 1f, BackEventPresenter.EDGE_LEFT), - ) + ), ) assertThat(awaitItem()).isEqualTo(Model(eventCount = 3, doneCount = 1)) assertThat(awaitItem()).isEqualTo(Model(eventCount = 4, doneCount = 1)) diff --git a/presenter/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/template/Template.kt b/presenter/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/template/Template.kt index d73bee61..68c83570 100644 --- a/presenter/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/template/Template.kt +++ b/presenter/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/template/Template.kt @@ -52,7 +52,7 @@ public interface Template : BaseModel * used. */ public inline fun BaseModel.toTemplate( - defaultTemplate: (BaseModel) -> T + defaultTemplate: (BaseModel) -> T, ): T { var model = this while (model is ModelDelegate) { diff --git a/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/backstack/CrossSlideBackstackPresenter.kt b/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/backstack/CrossSlideBackstackPresenter.kt index bcb7674a..ba27516f 100644 --- a/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/backstack/CrossSlideBackstackPresenter.kt +++ b/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/backstack/CrossSlideBackstackPresenter.kt @@ -19,7 +19,7 @@ import software.ralf.app.platform.recipes.backstack.CrossSlideBackstackPresenter * as an element. */ class CrossSlideBackstackPresenter( - private val initialPresenter: ComposePresenter + private val initialPresenter: ComposePresenter, ) : ComposePresenter { @Composable override fun present(input: Unit): Model { diff --git a/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/backstack/CrossSlideBackstackRenderer.kt b/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/backstack/CrossSlideBackstackRenderer.kt index b060838a..a7fb2ea1 100644 --- a/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/backstack/CrossSlideBackstackRenderer.kt +++ b/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/backstack/CrossSlideBackstackRenderer.kt @@ -49,7 +49,7 @@ class CrossSlideBackstackRenderer : } private fun AnimatedContentTransitionScope>.crossSlideTransition( - direction: AnimatedContentTransitionScope.SlideDirection + direction: AnimatedContentTransitionScope.SlideDirection, ): ContentTransform { return slideIntoContainer(direction, tween()) togetherWith slideOutOfContainer(direction, tween()) diff --git a/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/landing/LandingPresenter.kt b/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/landing/LandingPresenter.kt index e23afad4..36a378c0 100644 --- a/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/landing/LandingPresenter.kt +++ b/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/landing/LandingPresenter.kt @@ -41,7 +41,7 @@ class LandingPresenter : ComposePresenter { /** The state of the landing screen. */ data class Model( /** Callback to send events back to the presenter. */ - val onEvent: (Event) -> Unit + val onEvent: (Event) -> Unit, ) : BaseModel /** All events that [LandingPresenter] can process. */ diff --git a/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/template/RootPresenter.kt b/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/template/RootPresenter.kt index 050d4ca2..ae63cde5 100644 --- a/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/template/RootPresenter.kt +++ b/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/template/RootPresenter.kt @@ -25,7 +25,7 @@ class RootPresenter( @Composable override fun present(input: Unit): RecipesAppTemplate { return withCompositionLocal( - LocalBackGestureDispatcherPresenter provides backGestureDispatcherPresenter + LocalBackGestureDispatcherPresenter provides backGestureDispatcherPresenter, ) { val backstackPresenter = remember { CrossSlideBackstackPresenter(landingPresenter) } val backstackModel = backstackPresenter.present(Unit) diff --git a/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/template/RootPresenterRenderer.kt b/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/template/RootPresenterRenderer.kt index c9fe58c3..9e153fb8 100644 --- a/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/template/RootPresenterRenderer.kt +++ b/recipes/common/impl/src/commonMain/kotlin/software/ralf/app/platform/recipes/template/RootPresenterRenderer.kt @@ -40,7 +40,7 @@ import software.ralf.app.platform.renderer.Render @Inject @ContributesRenderer class RootPresenterRenderer( - private val backGestureDispatcherPresenter: BackGestureDispatcherPresenter + private val backGestureDispatcherPresenter: BackGestureDispatcherPresenter, ) : ComposeRenderer() { @Composable override fun Compose(model: RecipesAppTemplate, modifier: Modifier) { diff --git a/renderer-android-view/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/renderer/AndroidRendererFactoryTest.kt b/renderer-android-view/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/renderer/AndroidRendererFactoryTest.kt index 1566b8c2..3b805e4c 100644 --- a/renderer-android-view/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/renderer/AndroidRendererFactoryTest.kt +++ b/renderer-android-view/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/renderer/AndroidRendererFactoryTest.kt @@ -194,7 +194,7 @@ class AndroidRendererFactoryTest { "No renderer was provided for class " + "software.ralf.app.platform.renderer.AndroidRendererFactoryTest" + "\$TestModel (Kotlin reflection is not available). " + - "Did you add @ContributesRenderer?" + "Did you add @ContributesRenderer?", ) } } diff --git a/renderer-android-view/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/renderer/RecyclerViewViewHolderRendererTest.kt b/renderer-android-view/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/renderer/RecyclerViewViewHolderRendererTest.kt index dabd2389..ed2f7568 100644 --- a/renderer-android-view/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/renderer/RecyclerViewViewHolderRendererTest.kt +++ b/renderer-android-view/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/renderer/RecyclerViewViewHolderRendererTest.kt @@ -164,7 +164,7 @@ class RecyclerViewViewHolderRendererTest { } override fun getVerticalSnapPreference(): Int = SNAP_TO_START - } + }, ) } @@ -174,7 +174,7 @@ class RecyclerViewViewHolderRendererTest { @Suppress("UNCHECKED_CAST") private fun RecyclerView.viewHolderRenderer( - adapterPosition: Int + adapterPosition: Int, ): TestRecyclerViewViewHolderRenderer { val viewHolder = findViewHolderForAdapterPosition(adapterPosition) diff --git a/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/presenter/compose/backgesture/BackGestureDispatcherPresenterAndroid.kt b/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/presenter/compose/backgesture/BackGestureDispatcherPresenterAndroid.kt index 2948181e..fbafa5e1 100644 --- a/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/presenter/compose/backgesture/BackGestureDispatcherPresenterAndroid.kt +++ b/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/presenter/compose/backgesture/BackGestureDispatcherPresenterAndroid.kt @@ -37,7 +37,7 @@ import kotlinx.coroutines.launch * ``` */ public fun BackGestureDispatcherPresenter.forwardBackPressEventsToPresenters( - onBackPressedDispatcherOwner: OnBackPressedDispatcherOwner + onBackPressedDispatcherOwner: OnBackPressedDispatcherOwner, ) { // Later if needed we can consider limiting this to the STARTED lifecycle if needed with // repeatOnLifecycle API. For now we forward events until the lifecycle changes to DESTROYED. @@ -130,7 +130,7 @@ private class BackGestureForwarder( progress = it.progress, swipeEdge = it.swipeEdge, ) - } + }, ) } } diff --git a/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/RecyclerViewViewHolderRenderer.kt b/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/RecyclerViewViewHolderRenderer.kt index 101b3d42..e4e833ba 100644 --- a/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/RecyclerViewViewHolderRenderer.kt +++ b/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/RecyclerViewViewHolderRenderer.kt @@ -92,7 +92,7 @@ public abstract class RecyclerViewViewHolderRenderer : // memory will be reclaimed when the RecyclerView is removed from the view hierarchy. @Suppress("UseCheckOrError") throw IllegalStateException( - "A RecyclerViewViewHolderRenderer should only be reused with the same parent view." + "A RecyclerViewViewHolderRenderer should only be reused with the same parent view.", ) } } diff --git a/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/ViewRenderer.kt b/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/ViewRenderer.kt index 6e15e319..441ae8e2 100644 --- a/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/ViewRenderer.kt +++ b/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/ViewRenderer.kt @@ -271,7 +271,7 @@ public abstract class ViewRenderer : BaseAndroidViewRende block(this@doOnDestroy) } } - } + }, ) } } diff --git a/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/template/AndroidTemplateRenderer.kt b/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/template/AndroidTemplateRenderer.kt index 39e25550..1cf7c422 100644 --- a/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/template/AndroidTemplateRenderer.kt +++ b/renderer-android-view/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/template/AndroidTemplateRenderer.kt @@ -16,7 +16,7 @@ import software.ralf.app.platform.renderer.getRenderer * container (read `ViewGroup`) gets hidden and the new container (read `ViewGroup`) gets shown. */ public abstract class AndroidTemplateRenderer( - private val rendererFactory: RendererFactory + private val rendererFactory: RendererFactory, ) : ViewRenderer() { protected inner class Container( diff --git a/renderer-compose-multiplatform/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/presenter/compose/backgesture/ForwardBackPressEventsToPresentersComposeTest.kt b/renderer-compose-multiplatform/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/presenter/compose/backgesture/ForwardBackPressEventsToPresentersComposeTest.kt index f3f2692a..72fa2b60 100644 --- a/renderer-compose-multiplatform/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/presenter/compose/backgesture/ForwardBackPressEventsToPresentersComposeTest.kt +++ b/renderer-compose-multiplatform/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/presenter/compose/backgesture/ForwardBackPressEventsToPresentersComposeTest.kt @@ -69,12 +69,12 @@ class ForwardBackPressEventsToPresentersComposeTest { } private class TestPresenter( - private val backGestureDispatcherPresenter: BackGestureDispatcherPresenter + private val backGestureDispatcherPresenter: BackGestureDispatcherPresenter, ) : ComposePresenter { @Composable override fun present(input: Unit): Model { return withCompositionLocal( - LocalBackGestureDispatcherPresenter provides backGestureDispatcherPresenter + LocalBackGestureDispatcherPresenter provides backGestureDispatcherPresenter, ) { var backPressCount by remember { mutableIntStateOf(0) } diff --git a/renderer-compose-multiplatform/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/renderer/ComposeAndroidRendererFactoryDeviceTest.kt b/renderer-compose-multiplatform/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/renderer/ComposeAndroidRendererFactoryDeviceTest.kt index 287634db..f7ce8ab3 100644 --- a/renderer-compose-multiplatform/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/renderer/ComposeAndroidRendererFactoryDeviceTest.kt +++ b/renderer-compose-multiplatform/public/src/androidDeviceTest/kotlin/software/ralf/app/platform/renderer/ComposeAndroidRendererFactoryDeviceTest.kt @@ -195,7 +195,7 @@ class ComposeAndroidRendererFactoryDeviceTest { factory.getRenderer(viewModel).render(viewModel) } .messageContains( - "Tried to call render() on an AndroidViewRenderer without a parent view." + "Tried to call render() on an AndroidViewRenderer without a parent view.", ) } } @@ -452,7 +452,7 @@ class ComposeAndroidRendererFactoryDeviceTest { } private inner class TestRendererGraph( - private val rendererFactoryProvider: () -> RendererFactory + private val rendererFactoryProvider: () -> RendererFactory, ) : RendererGraph { override val rendererFactory: RendererFactory get() = rendererFactoryProvider() diff --git a/renderer-compose-multiplatform/public/src/androidHostTest/kotlin/software/ralf/app/platform/renderer/ComposeAndroidRendererFactoryTest.kt b/renderer-compose-multiplatform/public/src/androidHostTest/kotlin/software/ralf/app/platform/renderer/ComposeAndroidRendererFactoryTest.kt index e72513db..a3bb8ed4 100644 --- a/renderer-compose-multiplatform/public/src/androidHostTest/kotlin/software/ralf/app/platform/renderer/ComposeAndroidRendererFactoryTest.kt +++ b/renderer-compose-multiplatform/public/src/androidHostTest/kotlin/software/ralf/app/platform/renderer/ComposeAndroidRendererFactoryTest.kt @@ -43,7 +43,7 @@ class ComposeAndroidRendererFactoryTest { .isInstanceOf() .messageContains( "Unsupported renderer type class software.ralf.app.platform." + - "renderer.ComposeAndroidRendererFactoryTest\$UnsupportedRenderer" + "renderer.ComposeAndroidRendererFactoryTest\$UnsupportedRenderer", ) } @@ -75,7 +75,7 @@ class ComposeAndroidRendererFactoryTest { ) } } - } + }, ) } return object : RootScopeProvider { diff --git a/renderer-compose-multiplatform/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/AndroidViewWithinComposeRenderer.kt b/renderer-compose-multiplatform/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/AndroidViewWithinComposeRenderer.kt index 6aaecf9e..ad0ac44f 100644 --- a/renderer-compose-multiplatform/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/AndroidViewWithinComposeRenderer.kt +++ b/renderer-compose-multiplatform/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/AndroidViewWithinComposeRenderer.kt @@ -14,7 +14,7 @@ import software.ralf.app.platform.presenter.BaseModel * embedded within the Compose hierarchy. */ internal class AndroidViewWithinComposeRenderer( - private val androidRenderer: BaseAndroidViewRenderer + private val androidRenderer: BaseAndroidViewRenderer, ) : BaseAndroidViewRenderer, BaseComposeRenderer { private var composeContainer: ViewGroup? = null @@ -51,7 +51,7 @@ internal class AndroidViewWithinComposeRenderer( composeContainer = it init(context as Activity, it) } - } + }, ) { render(model) } diff --git a/renderer-compose-multiplatform/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/ComposeAndroidRendererFactory.kt b/renderer-compose-multiplatform/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/ComposeAndroidRendererFactory.kt index c18cdd13..54537d57 100644 --- a/renderer-compose-multiplatform/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/ComposeAndroidRendererFactory.kt +++ b/renderer-compose-multiplatform/public/src/androidMain/kotlin/software/ralf/app/platform/renderer/ComposeAndroidRendererFactory.kt @@ -62,7 +62,7 @@ public sealed interface ComposeAndroidRendererFactory : RendererFactory { * ``` */ public fun createForComposeUi( - rootScopeProvider: RootScopeProvider + rootScopeProvider: RootScopeProvider, ): ComposeAndroidRendererFactory = ComposeAndroidRendererFactoryComposeUi(rootScopeProvider) /** diff --git a/renderer-compose-multiplatform/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/backgesture/BackGestureDispatcherPresenterCompose.kt b/renderer-compose-multiplatform/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/backgesture/BackGestureDispatcherPresenterCompose.kt index 829720d4..2ee8032a 100644 --- a/renderer-compose-multiplatform/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/backgesture/BackGestureDispatcherPresenterCompose.kt +++ b/renderer-compose-multiplatform/public/src/commonMain/kotlin/software/ralf/app/platform/presenter/compose/backgesture/BackGestureDispatcherPresenterCompose.kt @@ -86,7 +86,7 @@ public fun BackGestureDispatcherPresenter.ForwardBackPressEventsToPresenters() { touchY = event.touchY, progress = event.progress, swipeEdge = event.swipeEdge, - ) + ), ) } } diff --git a/renderer-compose-multiplatform/public/src/commonMain/kotlin/software/ralf/app/platform/renderer/ComposeRendererFactory.kt b/renderer-compose-multiplatform/public/src/commonMain/kotlin/software/ralf/app/platform/renderer/ComposeRendererFactory.kt index 0a1e4d8e..65ffa8eb 100644 --- a/renderer-compose-multiplatform/public/src/commonMain/kotlin/software/ralf/app/platform/renderer/ComposeRendererFactory.kt +++ b/renderer-compose-multiplatform/public/src/commonMain/kotlin/software/ralf/app/platform/renderer/ComposeRendererFactory.kt @@ -27,7 +27,7 @@ public class ComposeRendererFactory(rootScopeProvider: RootScopeProvider) : } private fun Renderer.asComposeRenderer( - modelType: KClass + modelType: KClass, ): ComposeRenderer { check(this is ComposeRenderer) { "Expected a ComposeRenderer for model type $modelType, " + @@ -42,7 +42,7 @@ public class ComposeRendererFactory(rootScopeProvider: RootScopeProvider) : * to call from another [BaseComposeRenderer] to embed a child renderer. */ public fun RendererFactory.createComposeRenderer( - modelType: KClass + modelType: KClass, ): BaseComposeRenderer = createRenderer(modelType).asBaseComposeRenderer() /** diff --git a/renderer-compose-multiplatform/public/src/commonMain/kotlin/software/ralf/app/platform/renderer/text/PresenterBackedTextFieldState.kt b/renderer-compose-multiplatform/public/src/commonMain/kotlin/software/ralf/app/platform/renderer/text/PresenterBackedTextFieldState.kt index a300cec0..8219b21c 100644 --- a/renderer-compose-multiplatform/public/src/commonMain/kotlin/software/ralf/app/platform/renderer/text/PresenterBackedTextFieldState.kt +++ b/renderer-compose-multiplatform/public/src/commonMain/kotlin/software/ralf/app/platform/renderer/text/PresenterBackedTextFieldState.kt @@ -44,7 +44,7 @@ import software.ralf.app.platform.presenter.compose.text.PresenterTextFieldState @ExperimentalAppPlatform @Composable public fun rememberPresenterBackedTextFieldState( - presenterState: PresenterTextFieldState + presenterState: PresenterTextFieldState, ): TextFieldState { val presenterText = presenterState.value val presenterTextState by rememberUpdatedState(presenterState) diff --git a/renderer-compose-multiplatform/public/src/desktopTest/kotlin/software/ralf/app/platform/renderer/ComposeRendererFactoryTest.kt b/renderer-compose-multiplatform/public/src/desktopTest/kotlin/software/ralf/app/platform/renderer/ComposeRendererFactoryTest.kt index 1f87dd1b..022e26b1 100644 --- a/renderer-compose-multiplatform/public/src/desktopTest/kotlin/software/ralf/app/platform/renderer/ComposeRendererFactoryTest.kt +++ b/renderer-compose-multiplatform/public/src/desktopTest/kotlin/software/ralf/app/platform/renderer/ComposeRendererFactoryTest.kt @@ -50,10 +50,10 @@ class ComposeRendererFactoryTest { messageContains( "The renderer class software.ralf.app.platform.renderer." + - "ComposeRendererFactoryTest\$AndroidRenderer" + "ComposeRendererFactoryTest\$AndroidRenderer", ) messageContains( - "For Android View and Compose UI interop use ComposeAndroidRendererFactory." + "For Android View and Compose UI interop use ComposeAndroidRendererFactory.", ) } } @@ -80,7 +80,7 @@ class ComposeRendererFactoryTest { ) } } - } + }, ) } return object : RootScopeProvider { diff --git a/renderer-compose-multiplatform/public/src/desktopTest/kotlin/software/ralf/app/platform/renderer/LocalRendererFactoryTest.kt b/renderer-compose-multiplatform/public/src/desktopTest/kotlin/software/ralf/app/platform/renderer/LocalRendererFactoryTest.kt index d4fb77ef..20a6d5f1 100644 --- a/renderer-compose-multiplatform/public/src/desktopTest/kotlin/software/ralf/app/platform/renderer/LocalRendererFactoryTest.kt +++ b/renderer-compose-multiplatform/public/src/desktopTest/kotlin/software/ralf/app/platform/renderer/LocalRendererFactoryTest.kt @@ -183,13 +183,13 @@ class LocalRendererFactoryTest { TextModel::class to TextRenderer::class, ) } - } + }, ) } return ComposeRendererFactory( object : RootScopeProvider { override val rootScope: Scope = scope - } + }, ) } diff --git a/renderer/public/src/commonMain/kotlin/software/ralf/app/platform/renderer/BaseRendererFactory.kt b/renderer/public/src/commonMain/kotlin/software/ralf/app/platform/renderer/BaseRendererFactory.kt index 666ed268..6714c156 100644 --- a/renderer/public/src/commonMain/kotlin/software/ralf/app/platform/renderer/BaseRendererFactory.kt +++ b/renderer/public/src/commonMain/kotlin/software/ralf/app/platform/renderer/BaseRendererFactory.kt @@ -56,7 +56,7 @@ public open class BaseRendererFactory(rootScopeProvider: RootScopeProvider) : Re @Suppress("NOTHING_TO_INLINE") private inline fun errorMessageForMissingRenderer( - modelType: KClass + modelType: KClass, ): String { return "No renderer was provided for $modelType. Did you add @ContributesRenderer?" } diff --git a/renderer/public/src/commonTest/kotlin/software/ralf/app/platform/renderer/BaseRendererFactoryTest.kt b/renderer/public/src/commonTest/kotlin/software/ralf/app/platform/renderer/BaseRendererFactoryTest.kt index b138072c..25636c0f 100644 --- a/renderer/public/src/commonTest/kotlin/software/ralf/app/platform/renderer/BaseRendererFactoryTest.kt +++ b/renderer/public/src/commonTest/kotlin/software/ralf/app/platform/renderer/BaseRendererFactoryTest.kt @@ -160,7 +160,7 @@ class BaseRendererFactoryTest { Map, KClass>> = kotlinInjectModelToRendererMapping } - } + }, ) } @@ -177,11 +177,11 @@ class BaseRendererFactoryTest { Map, KClass>> = metroModelToRendererMapping } - } + }, ) } } - } + }, ) private data class TestModel(val value: Int) : BaseModel diff --git a/robot-internal/public/src/commonTest/kotlin/software/ralf/app/platform/robot/internal/RootScopeTest.kt b/robot-internal/public/src/commonTest/kotlin/software/ralf/app/platform/robot/internal/RootScopeTest.kt index 373bec92..d91701dd 100644 --- a/robot-internal/public/src/commonTest/kotlin/software/ralf/app/platform/robot/internal/RootScopeTest.kt +++ b/robot-internal/public/src/commonTest/kotlin/software/ralf/app/platform/robot/internal/RootScopeTest.kt @@ -35,7 +35,7 @@ class RootScopeTest { assertThat(throwable.message.toString()) .contains( "The root scope could not be found. Consider overriding the " + - "RootScopeProvider through RobotInternals." + "RootScopeProvider through RobotInternals.", ) } diff --git a/robot/public/src/androidHostTest/kotlin/software/ralf/app/platform/robot/WaiterTest.kt b/robot/public/src/androidHostTest/kotlin/software/ralf/app/platform/robot/WaiterTest.kt index 2e5a690d..eb43687a 100644 --- a/robot/public/src/androidHostTest/kotlin/software/ralf/app/platform/robot/WaiterTest.kt +++ b/robot/public/src/androidHostTest/kotlin/software/ralf/app/platform/robot/WaiterTest.kt @@ -357,7 +357,7 @@ class WaiterTest { } } .messageContains( - "Waiting for 'Wait for suspended result' never succeeded and the value is null." + "Waiting for 'Wait for suspended result' never succeeded and the value is null.", ) } diff --git a/robot/public/src/commonTest/kotlin/software/ralf/app/platform/robot/RobotTest.kt b/robot/public/src/commonTest/kotlin/software/ralf/app/platform/robot/RobotTest.kt index c67d268e..7bac60d4 100644 --- a/robot/public/src/commonTest/kotlin/software/ralf/app/platform/robot/RobotTest.kt +++ b/robot/public/src/commonTest/kotlin/software/ralf/app/platform/robot/RobotTest.kt @@ -28,7 +28,7 @@ class RobotTest { assertThat(message) .contains( "Could not find Robot of type class software.ralf.app.platform." + - "robot.RobotTest.KiTestRobot" + "robot.RobotTest.KiTestRobot", ) assertThat(message).contains("Did you forget to add the @ContributesRobot annotation?") } @@ -53,7 +53,7 @@ class RobotTest { object : RobotComponent { override val robots: Map, () -> Robot> = mapOf(KiTestRobot::class to { KiTestRobot() }) - } + }, ) } @@ -158,7 +158,7 @@ class RobotTest { exception.message?.replace("RobotTest\$ChildTestRobot", "RobotTest.ChildTestRobot").toString() assertThat(message) .contains( - "Found Robot of type class software.ralf.app.platform.robot.RobotTest.ChildTestRobot" + "Found Robot of type class software.ralf.app.platform.robot.RobotTest.ChildTestRobot", ) assertThat(message).contains("child-1 and child-2") } diff --git a/sample/app-framework/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/TemplateProvider.kt b/sample/app-framework/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/TemplateProvider.kt index a3c04827..c89b5669 100644 --- a/sample/app-framework/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/TemplateProvider.kt +++ b/sample/app-framework/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/TemplateProvider.kt @@ -67,7 +67,7 @@ class TemplateProvider( */ fun createTemplateProvider(): TemplateProvider { return templateProviderFactory.create( - composePresenterScopeFactory.createComposePresenterScope() + composePresenterScopeFactory.createComposePresenterScope(), ) } } diff --git a/sample/templates/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/template/ComposeSampleAppTemplateRenderer.kt b/sample/templates/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/template/ComposeSampleAppTemplateRenderer.kt index 453aea14..c54066c1 100644 --- a/sample/templates/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/template/ComposeSampleAppTemplateRenderer.kt +++ b/sample/templates/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/template/ComposeSampleAppTemplateRenderer.kt @@ -24,7 +24,7 @@ import software.ralf.app.platform.sample.template.animation.LocalSharedTransitio @OptIn(ExperimentalSharedTransitionApi::class) @ContributesRenderer class ComposeSampleAppTemplateRenderer( - private val backGestureDispatcherPresenter: BackGestureDispatcherPresenter + private val backGestureDispatcherPresenter: BackGestureDispatcherPresenter, ) : ComposeRenderer() { @Composable diff --git a/sample/templates/public/src/commonMain/kotlin/software/ralf/app/platform/sample/template/SampleAppTemplate.kt b/sample/templates/public/src/commonMain/kotlin/software/ralf/app/platform/sample/template/SampleAppTemplate.kt index e49b9860..c206eb7b 100644 --- a/sample/templates/public/src/commonMain/kotlin/software/ralf/app/platform/sample/template/SampleAppTemplate.kt +++ b/sample/templates/public/src/commonMain/kotlin/software/ralf/app/platform/sample/template/SampleAppTemplate.kt @@ -10,7 +10,7 @@ sealed interface SampleAppTemplate : Template, AnimationContentKey { /** A template that hosts a single model, which should rendered as full-screen element. */ data class FullScreenTemplate( /** The model to be rendered fullscreen. */ - val model: BaseModel + val model: BaseModel, ) : SampleAppTemplate { override val contentKey: Int get() = model.contentKey diff --git a/sample/templates/public/src/commonMain/kotlin/software/ralf/app/platform/sample/template/SampleAppTemplatePresenter.kt b/sample/templates/public/src/commonMain/kotlin/software/ralf/app/platform/sample/template/SampleAppTemplatePresenter.kt index 8d41595f..375c20a0 100644 --- a/sample/templates/public/src/commonMain/kotlin/software/ralf/app/platform/sample/template/SampleAppTemplatePresenter.kt +++ b/sample/templates/public/src/commonMain/kotlin/software/ralf/app/platform/sample/template/SampleAppTemplatePresenter.kt @@ -26,7 +26,7 @@ class SampleAppTemplatePresenter( @Composable override fun present(input: Unit): SampleAppTemplate { return withCompositionLocal( - LocalBackGestureDispatcherPresenter provides backGestureDispatcherPresenter + LocalBackGestureDispatcherPresenter provides backGestureDispatcherPresenter, ) { rootPresenter.present(Unit).toTemplate { SampleAppTemplate.FullScreenTemplate(it) @@ -44,7 +44,7 @@ class SampleAppTemplatePresenter( * [SampleAppTemplate] directly or making its [BaseModel] type implement [ModelDelegate]. */ fun createSampleAppTemplatePresenter( - rootPresenter: ComposePresenter + rootPresenter: ComposePresenter, ): SampleAppTemplatePresenter } } diff --git a/sample/user/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/user/UserGraph.kt b/sample/user/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/user/UserGraph.kt index 45e98d28..9716c66b 100644 --- a/sample/user/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/user/UserGraph.kt +++ b/sample/user/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/user/UserGraph.kt @@ -46,7 +46,7 @@ interface UserGraph { @SingleIn(UserScope::class) @ForScope(UserScope::class) fun provideUserScopeCoroutineScopeScoped( - @IoCoroutineDispatcher dispatcher: CoroutineDispatcher + @IoCoroutineDispatcher dispatcher: CoroutineDispatcher, ): CoroutineScopeScoped { return CoroutineScopeScoped(dispatcher + SupervisorJob() + CoroutineName("UserScope")) } @@ -58,7 +58,7 @@ interface UserGraph { @Provides @ForScope(UserScope::class) fun provideUserCoroutineScope( - @ForScope(UserScope::class) userScopeCoroutineScopeScoped: CoroutineScopeScoped + @ForScope(UserScope::class) userScopeCoroutineScopeScoped: CoroutineScopeScoped, ): CoroutineScope { return userScopeCoroutineScopeScoped.createChild() } diff --git a/sample/user/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/user/UserPagePresenterImpl.kt b/sample/user/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/user/UserPagePresenterImpl.kt index 81b3f2dd..ce3c4d57 100644 --- a/sample/user/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/user/UserPagePresenterImpl.kt +++ b/sample/user/impl/src/commonMain/kotlin/software/ralf/app/platform/sample/user/UserPagePresenterImpl.kt @@ -34,7 +34,7 @@ class UserPagePresenterImpl( val listModel = userPageListPresenter.present(UserPageListPresenter.Input(user)) val detailModel = userPageDetailPresenter.present( - UserPageDetailPresenter.Input(user, selectedAttribute = listModel.selectedIndex) + UserPageDetailPresenter.Input(user, selectedAttribute = listModel.selectedIndex), ) return ModelImpl(listModel = listModel, detailModel = detailModel) diff --git a/sample/user/impl/src/commonTest/kotlin/software/ralf/app/platform/sample/user/UserPagePresenterImplTest.kt b/sample/user/impl/src/commonTest/kotlin/software/ralf/app/platform/sample/user/UserPagePresenterImplTest.kt index 0cfb0a55..a59617aa 100644 --- a/sample/user/impl/src/commonTest/kotlin/software/ralf/app/platform/sample/user/UserPagePresenterImplTest.kt +++ b/sample/user/impl/src/commonTest/kotlin/software/ralf/app/platform/sample/user/UserPagePresenterImplTest.kt @@ -39,7 +39,7 @@ class UserPagePresenterImplTest { .isEqualTo(FakeUser.fakeAttribute1.value) (model.listModel as UserPageListPresenter.Model).onEvent( - UserPageListPresenter.Event.ItemSelected(1) + UserPageListPresenter.Event.ItemSelected(1), ) } diff --git a/scope/public/src/commonMain/kotlin/software/ralf/app/platform/scope/Scope.kt b/scope/public/src/commonMain/kotlin/software/ralf/app/platform/scope/Scope.kt index 29f3a5df..81df5de2 100644 --- a/scope/public/src/commonMain/kotlin/software/ralf/app/platform/scope/Scope.kt +++ b/scope/public/src/commonMain/kotlin/software/ralf/app/platform/scope/Scope.kt @@ -170,6 +170,6 @@ public fun Scope.onExit(block: () -> Unit) { override fun onExitScope() { block() } - } + }, ) } diff --git a/scope/public/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/CoroutineScopeScoped.kt b/scope/public/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/CoroutineScopeScoped.kt index 935d4e04..7403ab99 100644 --- a/scope/public/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/CoroutineScopeScoped.kt +++ b/scope/public/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/CoroutineScopeScoped.kt @@ -37,7 +37,7 @@ public class CoroutineScopeScoped(coroutineContext: CoroutineContext) : Coroutin * this scope or its other children. */ public fun createChild( - coroutineContext: CoroutineContext = EmptyCoroutineContext + coroutineContext: CoroutineContext = EmptyCoroutineContext, ): CoroutineScope { val name = coroutineContext[CoroutineName] ?: CoroutineName(parentName.name + "-child") val childContext = this.coroutineContext + coroutineContext diff --git a/scope/public/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/RegistrationDispatcher.kt b/scope/public/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/RegistrationDispatcher.kt index dab61c0d..8121d048 100644 --- a/scope/public/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/RegistrationDispatcher.kt +++ b/scope/public/src/commonMain/kotlin/software/ralf/app/platform/scope/coroutine/RegistrationDispatcher.kt @@ -44,7 +44,7 @@ private constructor( .startCoroutine( Continuation(delegate) { it.getOrThrow() - } + }, ) } } diff --git a/scope/public/src/commonTest/kotlin/software/ralf/app/platform/scope/coroutine/CoroutineScopeScopedTest.kt b/scope/public/src/commonTest/kotlin/software/ralf/app/platform/scope/coroutine/CoroutineScopeScopedTest.kt index 0b69f5ad..acc32627 100644 --- a/scope/public/src/commonTest/kotlin/software/ralf/app/platform/scope/coroutine/CoroutineScopeScopedTest.kt +++ b/scope/public/src/commonTest/kotlin/software/ralf/app/platform/scope/coroutine/CoroutineScopeScopedTest.kt @@ -119,7 +119,7 @@ class CoroutineScopeScopedTest { override fun onExitScope() { exitScopeOrder += "first" } - } + }, ) scope.register(coroutineScope) @@ -129,7 +129,7 @@ class CoroutineScopeScopedTest { override fun onExitScope() { exitScopeOrder += "third" } - } + }, ) scope.destroy() diff --git a/scope/public/src/commonTest/kotlin/software/ralf/app/platform/scope/coroutine/ScopeRegistrationTest.kt b/scope/public/src/commonTest/kotlin/software/ralf/app/platform/scope/coroutine/ScopeRegistrationTest.kt index 3f5addc3..b20c629b 100644 --- a/scope/public/src/commonTest/kotlin/software/ralf/app/platform/scope/coroutine/ScopeRegistrationTest.kt +++ b/scope/public/src/commonTest/kotlin/software/ralf/app/platform/scope/coroutine/ScopeRegistrationTest.kt @@ -57,7 +57,7 @@ class ScopeRegistrationTest { assertThat(events).isEmpty() events += "last callback" }, - ) + ), ) assertThat(events) @@ -87,7 +87,7 @@ class ScopeRegistrationTest { runCurrent() assertThat(ran).isFalse() }, - ) + ), ) runCurrent() @@ -126,7 +126,7 @@ class ScopeRegistrationTest { events += "outer callback" }, scoped { events += "last callback" }, - ) + ), ) assertThat(events).containsExactly("outer callback", "last callback", "coroutine") @@ -160,8 +160,8 @@ class ScopeRegistrationTest { canceled = current.launch { events += "canceled" } canceled.cancel() current.launch { events += "sibling" } - } - ) + }, + ), ) assertThat(events).containsExactly("sibling") @@ -184,8 +184,8 @@ class ScopeRegistrationTest { withTimeoutOrNull(100.milliseconds) { delay(200.milliseconds) } events += "timeout" } - } - ) + }, + ), ) runCurrent() @@ -218,8 +218,8 @@ class ScopeRegistrationTest { current.launch(start = CoroutineStart.UNDISPATCHED) { bypassed++ } assertThat(count).isEqualTo(0) assertThat(bypassed).isEqualTo(3) - } - ) + }, + ), ) assertThat(count).isEqualTo(10_000) @@ -244,7 +244,7 @@ class ScopeRegistrationTest { } private fun TestScope.coroutines( - context: CoroutineContext = UnconfinedTestDispatcher(testScheduler) + context: CoroutineContext = UnconfinedTestDispatcher(testScheduler), ): CoroutineScopeScoped = CoroutineScopeScoped(Job() + CoroutineName("test") + context) private fun scoped(onEnter: (Scope) -> Unit): Scoped =