Upgrade App Platform in the Blueprint

Upgrade App Platform in the Blueprint project and replace deprecated functions.

Author: vRallev

blueprints/starter/app/src/androidMain/kotlin/software/amazon/app/platform/template/MainActivityViewModel.kt

@@ -4,7 +4,7 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import kotlinx.coroutines.flow.StateFlow
 import software.amazon.app.platform.scope.RootScopeProvider
-import software.amazon.app.platform.scope.di.diComponent
+import software.amazon.app.platform.scope.di.kotlinInjectComponent
 import software.amazon.app.platform.template.templates.AppTemplate
 import software.amazon.lastmile.kotlin.inject.anvil.AppScope
 import software.amazon.lastmile.kotlin.inject.anvil.ContributesTo
@@ -14,7 +14,8 @@ import software.amazon.lastmile.kotlin.inject.anvil.ContributesTo
  * use [application] to get access to the root scope.
  */
 class MainActivityViewModel(application: Application) : AndroidViewModel(application) {
-  private val component = (application as RootScopeProvider).rootScope.diComponent<Component>()
+  private val component =
+    (application as RootScopeProvider).rootScope.kotlinInjectComponent<Component>()
   private val templateProvider = component.templateProviderFactory.createTemplateProvider()
 
   /** The stream of templates that are rendered by [MainActivity]. */

blueprints/starter/app/src/commonMain/kotlin/software/amazon/app/platform/template/Application.kt

@@ -3,7 +3,7 @@ package software.amazon.app.platform.template
 import software.amazon.app.platform.scope.RootScopeProvider
 import software.amazon.app.platform.scope.Scope
 import software.amazon.app.platform.scope.coroutine.addCoroutineScopeScoped
-import software.amazon.app.platform.scope.di.addDiComponent
+import software.amazon.app.platform.scope.di.addKotlinInjectComponent
 import software.amazon.app.platform.scope.register
 
 /**
@@ -22,7 +22,7 @@ class Application : RootScopeProvider {
 
     _rootScope =
       Scope.buildRootScope {
-        addDiComponent(appComponent)
+        addKotlinInjectComponent(appComponent)
 
         addCoroutineScopeScoped(appComponent.appScopeCoroutineScopeScoped)
       }

blueprints/starter/app/src/desktopMain/kotlin/software/amazon/app/platform/template/DesktopApp.kt

@@ -8,7 +8,7 @@ import software.amazon.app.platform.renderer.ComposeRendererFactory
 import software.amazon.app.platform.renderer.getComposeRenderer
 import software.amazon.app.platform.scope.RootScopeProvider
 import software.amazon.app.platform.scope.Scope
-import software.amazon.app.platform.scope.di.diComponent
+import software.amazon.app.platform.scope.di.kotlinInjectComponent
 import software.amazon.lastmile.kotlin.inject.anvil.AppScope
 import software.amazon.lastmile.kotlin.inject.anvil.ContributesTo
 
@@ -18,13 +18,13 @@ import software.amazon.lastmile.kotlin.inject.anvil.ContributesTo
  */
 class DesktopApp(private val component: (RootScopeProvider) -> AppComponent) : RootScopeProvider {
 
+  private val application = Application().apply { create(component(this)) }
+
   override val rootScope: Scope
     get() = application.rootScope
 
-  private val application = Application().apply { create(component(this)) }
-
   private val templateProvider =
-    rootScope.diComponent<Component>().templateProviderFactory.createTemplateProvider()
+    rootScope.kotlinInjectComponent<Component>().templateProviderFactory.createTemplateProvider()
 
   /** Call this composable function to start rendering templates on the screen. */
   @Composable

blueprints/starter/app/src/iosMain/kotlin/software/amazon/app/platform/template/MainViewController.kt

@@ -9,7 +9,7 @@ import platform.UIKit.UIViewController
 import software.amazon.app.platform.renderer.ComposeRendererFactory
 import software.amazon.app.platform.renderer.Renderer
 import software.amazon.app.platform.scope.RootScopeProvider
-import software.amazon.app.platform.scope.di.diComponent
+import software.amazon.app.platform.scope.di.kotlinInjectComponent
 
 /**
  * This function is called from Swift to hook up the Compose Multiplatform UI.
@@ -24,7 +24,7 @@ fun mainViewController(rootScopeProvider: RootScopeProvider): UIViewController =
     // Create a single instance.
     val templateProvider = remember {
       rootScopeProvider.rootScope
-        .diComponent<IosAppComponent>()
+        .kotlinInjectComponent<IosAppComponent>()
         .templateProviderFactory
         .createTemplateProvider()
     }

blueprints/starter/app/src/wasmJsMain/kotlin/software/amazon/app/platform/template/Main.kt

@@ -9,7 +9,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.window.ComposeViewport
 import kotlinx.browser.document
 import software.amazon.app.platform.renderer.ComposeRendererFactory
-import software.amazon.app.platform.scope.di.diComponent
+import software.amazon.app.platform.scope.di.kotlinInjectComponent
 
 /** The entry point of our sample app. */
 @OptIn(ExperimentalComposeUiApi::class)
@@ -26,7 +26,7 @@ private fun AppPlatform() {
   // Create a single instance.
   val templateProvider = remember {
     application.rootScope
-      .diComponent<WasmJsAppComponent>()
+      .kotlinInjectComponent<WasmJsAppComponent>()
       .templateProviderFactory
       .createTemplateProvider()
   }

blueprints/starter/gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
 assertk = "0.28.1"
-app-platfrom = "0.0.5"
-agp = "8.12.1"
+app-platfrom = "0.0.6"
+agp = "8.12.2"
 android-compileSdk = "36"
 android-minSdk = "21"
 android-targetSdk = "36"
 androidx-activity-compose = "1.10.1"
-androidx-lifecycle = "2.9.2"
+androidx-lifecycle = "2.9.3"
 compose = "1.8.2"
-compose-hot-reload = "1.0.0-beta05"
+compose-hot-reload = "1.0.0-beta06"
 compose-multiplatform = "1.8.2"
 coroutines = "1.10.2"
 kotlin = "2.2.10"