Merge pull request #34 from amzn/rwo/sample

Adopt pre-defined scopes in sample app
amzn · Sep 13, 2024 · 6672dc7 · 6672dc7
2 parents 807b66d + 7e9f4e1
commit 6672dc7
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 30 deletions.
diff --git a/sample/app/build.gradle b/sample/app/build.gradle
@@ -20,6 +20,7 @@ dependencies {
     kspIosSimulatorArm64 project(':compiler')
 
     commonMainImplementation project(':runtime')
+    commonMainImplementation project(':runtime-optional')
     commonMainImplementation libs.kotlin.inject.runtime
 
     commonMainImplementation project(':sample:lib')

diff --git a/...oidMain/kotlin/software/amazon/lastmile/kotlin/inject/anvil/sample/AndroidAppComponent.kt b/...oidMain/kotlin/software/amazon/lastmile/kotlin/inject/anvil/sample/AndroidAppComponent.kt
@@ -3,10 +3,12 @@ package software.amazon.lastmile.kotlin.inject.anvil.sample
 import android.app.Application
 import me.tatarka.inject.annotations.Component
 import me.tatarka.inject.annotations.Provides
+import software.amazon.lastmile.kotlin.inject.anvil.AppScope
 import software.amazon.lastmile.kotlin.inject.anvil.MergeComponent
+import software.amazon.lastmile.kotlin.inject.anvil.SingleIn
 
 /**
- * Concrete application component for Android using the scope [SingleInAppScope].
+ * Concrete application component for Android using the scope [SingleIn] [AppScope].
  * [AndroidAppComponentMerged] is a generated interface. Through this merged interface
  * [ApplicationIdProviderComponent], other contributed component interfaces and contributed
  * bindings such as from [AndroidApplicationIdProvider] are implemented.
@@ -15,8 +17,8 @@ import software.amazon.lastmile.kotlin.inject.anvil.MergeComponent
  * [Application] can be provided in the object graph.
  */
 @Component
-@MergeComponent
-@SingleInAppScope
+@MergeComponent(AppScope::class)
+@SingleIn(AppScope::class)
 abstract class AndroidAppComponent(
     /**
      * The Android application that is provided to this object graph.

diff --git a/...lin/software/amazon/lastmile/kotlin/inject/anvil/sample/ApplicationIdProviderComponent.kt b/...lin/software/amazon/lastmile/kotlin/inject/anvil/sample/ApplicationIdProviderComponent.kt
@@ -1,13 +1,13 @@
 package software.amazon.lastmile.kotlin.inject.anvil.sample
 
+import software.amazon.lastmile.kotlin.inject.anvil.AppScope
 import software.amazon.lastmile.kotlin.inject.anvil.ContributesTo
 
 /**
  * This component interface is added to the kotlin-inject component using the scope
- * [SingleInAppScope] automatically.
+ * [AppScope] automatically.
  */
-@ContributesTo
-@SingleInAppScope
+@ContributesTo(AppScope::class)
 interface ApplicationIdProviderComponent {
     /**
      * Provides the [ApplicationIdProvider] from the kotlin-inject object graph.

diff --git a/...orArm64Main/kotlin/software/amazon/lastmile/kotlin/inject/anvil/sample/IosAppComponent.kt b/...orArm64Main/kotlin/software/amazon/lastmile/kotlin/inject/anvil/sample/IosAppComponent.kt
@@ -3,10 +3,12 @@ package software.amazon.lastmile.kotlin.inject.anvil.sample
 import me.tatarka.inject.annotations.Component
 import me.tatarka.inject.annotations.Provides
 import platform.UIKit.UIApplication
+import software.amazon.lastmile.kotlin.inject.anvil.AppScope
 import software.amazon.lastmile.kotlin.inject.anvil.MergeComponent
+import software.amazon.lastmile.kotlin.inject.anvil.SingleIn
 
 /**
- * Concrete application component for iOS using the scope [SingleInAppScope].
+ * Concrete application component for iOS using the scope [SingleIn] [AppScope].
  * [IosAppComponentMerged] is a generated interface. Through this merged interface
  * [ApplicationIdProviderComponent], other contributed component interfaces and contributed
  * bindings such as from [IosApplicationIdProvider] are implemented.
@@ -15,8 +17,8 @@ import software.amazon.lastmile.kotlin.inject.anvil.MergeComponent
  * [UIApplication] can be provided in the object graph.
  */
 @Component
-@MergeComponent
-@SingleInAppScope
+@MergeComponent(AppScope::class)
+@SingleIn(AppScope::class)
 abstract class IosAppComponent(
     /**
      * The iOS application that is provided to this object graph.

diff --git a/sample/lib/build.gradle b/sample/lib/build.gradle
@@ -20,5 +20,6 @@ dependencies {
     kspIosSimulatorArm64 project(':compiler')
 
     commonMainImplementation project(':runtime')
+    commonMainImplementation project(':runtime-optional')
     commonMainImplementation libs.kotlin.inject.runtime
 }
diff --git a/...otlin/software/amazon/lastmile/kotlin/inject/anvil/sample/AndroidApplicationIdProvider.kt b/...otlin/software/amazon/lastmile/kotlin/inject/anvil/sample/AndroidApplicationIdProvider.kt
@@ -2,7 +2,9 @@ package software.amazon.lastmile.kotlin.inject.anvil.sample
 
 import android.app.Application
 import me.tatarka.inject.annotations.Inject
+import software.amazon.lastmile.kotlin.inject.anvil.AppScope
 import software.amazon.lastmile.kotlin.inject.anvil.ContributesBinding
+import software.amazon.lastmile.kotlin.inject.anvil.SingleIn
 
 /**
  * Android implementation for [ApplicationIdProvider] and provides the package name as application
@@ -12,8 +14,8 @@ import software.amazon.lastmile.kotlin.inject.anvil.ContributesBinding
  * inject [ApplicationIdProvider] through the [ContributesBinding] annotation.
  */
 @Inject
-@SingleInAppScope
-@ContributesBinding
+@SingleIn(AppScope::class)
+@ContributesBinding(AppScope::class)
 class AndroidApplicationIdProvider(
     application: Application,
 ) : ApplicationIdProvider {

diff --git a/...commonMain/kotlin/software/amazon/lastmile/kotlin/inject/anvil/sample/SingleInAppScope.kt b/...commonMain/kotlin/software/amazon/lastmile/kotlin/inject/anvil/sample/SingleInAppScope.kt
diff --git a/...in/kotlin/software/amazon/lastmile/kotlin/inject/anvil/sample/IosApplicationIdProvider.kt b/...in/kotlin/software/amazon/lastmile/kotlin/inject/anvil/sample/IosApplicationIdProvider.kt
@@ -2,7 +2,9 @@ package software.amazon.lastmile.kotlin.inject.anvil.sample
 
 import me.tatarka.inject.annotations.Inject
 import platform.UIKit.UIApplication
+import software.amazon.lastmile.kotlin.inject.anvil.AppScope
 import software.amazon.lastmile.kotlin.inject.anvil.ContributesBinding
+import software.amazon.lastmile.kotlin.inject.anvil.SingleIn
 
 /**
  * iOS implementation for [ApplicationIdProvider] and provides a fake string as application
@@ -12,8 +14,8 @@ import software.amazon.lastmile.kotlin.inject.anvil.ContributesBinding
  * inject [ApplicationIdProvider] through the [ContributesBinding] annotation.
  */
 @Inject
-@SingleInAppScope
-@ContributesBinding
+@SingleIn(AppScope::class)
+@ContributesBinding(AppScope::class)
 class IosApplicationIdProvider(
     application: UIApplication,
 ) : ApplicationIdProvider {