diff --git a/.github/workflows/build-pipeline.yml b/.github/workflows/build-pipeline.yml
index 5db0ab3..45e12e9 100644
--- a/.github/workflows/build-pipeline.yml
+++ b/.github/workflows/build-pipeline.yml
@@ -4,10 +4,10 @@ on: [ push, pull_request ]
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'zulu'
@@ -15,7 +15,7 @@ jobs:
         run: |
           . ./.github/configureSonarAnalysis.sh
       - name: Build and check library
-        uses: christopherfrieler/gradle-wrapper-action@0.3.0
+        uses: christopherfrieler/gradle-wrapper-action@v0.5.0
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         with:
@@ -33,10 +33,10 @@ jobs:
   deploy:
     if: startsWith(github.ref, 'refs/tags/')
     needs: ['build']
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'zulu'
@@ -46,7 +46,7 @@ jobs:
           SIGNING_KEY_BASE64: ${{ secrets.SIGNING_KEY_BASE64 }}
         run: echo $SIGNING_KEY_BASE64 | base64 -d > "$SIGNING_KEY_ID.gpg"
       - name: Deploy to mavencentral
-        uses: christopherfrieler/gradle-wrapper-action@0.3.0
+        uses: christopherfrieler/gradle-wrapper-action@v0.5.0
         env:
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
           SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
@@ -54,9 +54,9 @@ jobs:
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
         with:
-          arguments: publishToSonatype closeAndReleaseSonatypeStagingRepository
+          arguments: publishToSonatype closeAndReleaseSonatypeStagingRepositories
       - name: Prepare release info
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.ref }}
           name: ${{ github.ref }}
diff --git a/android-beans/build.gradle.kts b/android-beans/build.gradle.kts
index 1107913..c5dcf36 100644
--- a/android-beans/build.gradle.kts
+++ b/android-beans/build.gradle.kts
@@ -3,8 +3,8 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl
 plugins {
 	id("com.android.library")
     id("kotlin-android")
-    id("org.jetbrains.dokka") version "1.8.20"
-    id("org.gradle.jacoco")
+    id("org.jetbrains.dokka") version "2.0.0"
+    id("jacoco")
 	id("maven-publish")
 	id("signing")
 }
@@ -21,8 +21,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    compileSdk = 33
-    buildToolsVersion = "34.0.0"
+    compileSdk = 34
+    buildToolsVersion = "36.0.0"
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11.toString()
     }
@@ -57,21 +57,22 @@ android {
 dependencies {
     api(kotlin("stdlib"))
     api(kotlin("reflect"))
-    implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
 
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
+    coreLibraryDesugaring(libs.android.tools.desugar.jdk.libs)
 
-    testImplementation(platform("org.junit:junit-bom:5.10.0"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.26.1")
-    testImplementation("org.mockito.kotlin:mockito-kotlin:5.1.0")
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter)
+    testImplementation(libs.assertk.jvm)
+    testImplementation(libs.mockito.kotlin)
 
-    testImplementation("org.junit.vintage:junit-vintage-engine")
-    testImplementation("org.robolectric:robolectric:4.10.3")
+    testImplementation(libs.junit.vintage.engine)
+    testImplementation(libs.robolectric)
 }
 
 val kdocJar by tasks.registering(Jar::class) {
-    dependsOn(tasks.dokkaHtml)
+    dependsOn(tasks.dokkaGenerate)
     from("${layout.buildDirectory}/dokka")
     archiveClassifier.set("kdoc")
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/AndroidInfrastructureBeansProviderTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/AndroidInfrastructureBeansProviderTest.kt
index d3035c4..8279efd 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/AndroidInfrastructureBeansProviderTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/AndroidInfrastructureBeansProviderTest.kt
@@ -11,6 +11,7 @@ import assertk.assertThat
 import assertk.assertions.containsOnly
 import assertk.assertions.isEmpty
 import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever
@@ -26,7 +27,7 @@ class AndroidInfrastructureBeansProviderTest {
 
 		val bean = androidInfrastructureBeansProvider.lookUpOptionalBean("PackageManager", PackageManager::class)
 
-		assertThat(bean).isSameAs(packageManager)
+		assertThat(bean).isSameInstanceAs(packageManager)
 	}
 
 	@Test
@@ -36,7 +37,7 @@ class AndroidInfrastructureBeansProviderTest {
 
 		val bean = androidInfrastructureBeansProvider.lookUpOptionalBean("Resources", Resources::class)
 
-		assertThat(bean).isSameAs(resources)
+		assertThat(bean).isSameInstanceAs(resources)
 	}
 
 	@Test
@@ -46,7 +47,7 @@ class AndroidInfrastructureBeansProviderTest {
 
 		val bean = androidInfrastructureBeansProvider.lookUpOptionalBean("AssetManager", AssetManager::class)
 
-		assertThat(bean).isSameAs(assetManager)
+		assertThat(bean).isSameInstanceAs(assetManager)
 	}
 
 	@Test
@@ -56,7 +57,7 @@ class AndroidInfrastructureBeansProviderTest {
 
 		val bean = androidInfrastructureBeansProvider.lookUpOptionalBean("ContentResolver", ContentResolver::class)
 
-		assertThat(bean).isSameAs(contentResolver)
+		assertThat(bean).isSameInstanceAs(contentResolver)
 	}
 
 	@Test
@@ -67,7 +68,7 @@ class AndroidInfrastructureBeansProviderTest {
 
 		val bean = androidInfrastructureBeansProvider.lookUpOptionalBean(Context.LAYOUT_INFLATER_SERVICE, LayoutInflater::class)
 
-		assertThat(bean).isSameAs(layoutInflater)
+		assertThat(bean).isSameInstanceAs(layoutInflater)
 	}
 
 	@Test
@@ -77,7 +78,7 @@ class AndroidInfrastructureBeansProviderTest {
 
 		val bean = androidInfrastructureBeansProvider.lookUpOptionalBean(PackageManager::class)
 
-		assertThat(bean).isSameAs(packageManager)
+		assertThat(bean).isSameInstanceAs(packageManager)
 	}
 
 	@Test
@@ -87,7 +88,7 @@ class AndroidInfrastructureBeansProviderTest {
 
 		val bean = androidInfrastructureBeansProvider.lookUpOptionalBean(Resources::class)
 
-		assertThat(bean).isSameAs(resources)
+		assertThat(bean).isSameInstanceAs(resources)
 	}
 
 	@Test
@@ -97,7 +98,7 @@ class AndroidInfrastructureBeansProviderTest {
 
 		val bean = androidInfrastructureBeansProvider.lookUpOptionalBean(AssetManager::class)
 
-		assertThat(bean).isSameAs(assetManager)
+		assertThat(bean).isSameInstanceAs(assetManager)
 	}
 
 	@Test
@@ -107,7 +108,7 @@ class AndroidInfrastructureBeansProviderTest {
 
 		val bean = androidInfrastructureBeansProvider.lookUpOptionalBean(ContentResolver::class)
 
-		assertThat(bean).isSameAs(contentResolver)
+		assertThat(bean).isSameInstanceAs(contentResolver)
 	}
 
 	@Test
@@ -118,7 +119,7 @@ class AndroidInfrastructureBeansProviderTest {
 
 		val bean = androidInfrastructureBeansProvider.lookUpOptionalBean(LayoutInflater::class)
 
-		assertThat(bean).isSameAs(layoutInflater)
+		assertThat(bean).isSameInstanceAs(layoutInflater)
 	}
 
 	@Test
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanConfigurationsBeansCollectorTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanConfigurationsBeansCollectorTest.kt
index 4a5bdcd..46c5788 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanConfigurationsBeansCollectorTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanConfigurationsBeansCollectorTest.kt
@@ -4,6 +4,7 @@ import assertk.assertThat
 import assertk.assertions.hasSize
 import assertk.assertions.isNull
 import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.inOrder
@@ -100,7 +101,7 @@ class BeanConfigurationsBeansCollectorTest {
 
 		val bean = beanConfigurationsBeansCollector.lookUpBean("bean", BeanConfigurationsBeansCollectorTest::class)
 
-		assertThat(bean).isSameAs(this)
+		assertThat(bean).isSameInstanceAs(this)
 	}
 
 	@Test
@@ -111,7 +112,7 @@ class BeanConfigurationsBeansCollectorTest {
 		}
 		whenever(beanDefinition.produceBean(beanConfigurationsBeansCollector)).thenAnswer {
 			val dependency = beanConfigurationsBeansCollector.lookUpOptionalBean("bean", BeanConfigurationsBeansCollectorTest::class)
-			assertThat(dependency).isSameAs(this)
+			assertThat(dependency).isSameInstanceAs(this)
 			Any()
 		}
 		whenever(anotherBeanDefinition.getName()).thenReturn("bean")
@@ -152,7 +153,7 @@ class BeanConfigurationsBeansCollectorTest {
 
 		val bean = beanConfigurationsBeansCollector.lookUpOptionalBean(BeanConfigurationsBeansCollectorTest::class)
 
-		assertThat(bean).isSameAs(this)
+		assertThat(bean).isSameInstanceAs(this)
 	}
 
 	@Test
@@ -164,7 +165,7 @@ class BeanConfigurationsBeansCollectorTest {
 		}
 		whenever(beanDefinition.produceBean(beanConfigurationsBeansCollector)).thenAnswer {
 			val dependency = beanConfigurationsBeansCollector.lookUpOptionalBean(BeanConfigurationsBeansCollectorTest::class)
-			assertThat(dependency).isSameAs(this)
+			assertThat(dependency).isSameInstanceAs(this)
 			Any()
 		}
 		whenever(anotherBeanDefinition.canProduce(BeanConfigurationsBeansCollectorTest::class)).thenReturn(true)
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanDefinitionTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanDefinitionTest.kt
index 45445b9..57dc23e 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanDefinitionTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanDefinitionTest.kt
@@ -1,10 +1,7 @@
 package rocks.frieler.android.beans
 
 import assertk.assertThat
-import assertk.assertions.isEqualTo
-import assertk.assertions.isFalse
-import assertk.assertions.isSameAs
-import assertk.assertions.isTrue
+import assertk.assertions.*
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
@@ -51,6 +48,6 @@ class BeanDefinitionTest {
 		val bean = beanDefinition.produceBean(dependencyProvider)
 
 		verify(beanCreator).invoke(dependencyProvider)
-		assertThat(bean).isSameAs(this)
+		assertThat(bean).isSameInstanceAs(this)
 	}
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanDependenciesResolutionTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanDependenciesResolutionTest.kt
index c563d38..c2b4658 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanDependenciesResolutionTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanDependenciesResolutionTest.kt
@@ -1,11 +1,7 @@
 package rocks.frieler.android.beans
 
 import assertk.assertThat
-import assertk.assertions.containsAll
-import assertk.assertions.containsExactly
-import assertk.assertions.containsOnly
-import assertk.assertions.isNotNull
-import assertk.assertions.isSameAs
+import assertk.assertions.*
 import org.junit.jupiter.api.Test
 import rocks.frieler.android.beans.scopes.singleton.lazyInstantiatedBean
 
@@ -36,7 +32,7 @@ class BeanDependenciesResolutionTest {
 		assertThat(bean).isNotNull()
 		val beanWithDependency = beanRegistry.lookUpBean(BeanWithDependency::class)
 		assertThat(beanWithDependency).isNotNull()
-		assertThat(beanWithDependency.dependency).isSameAs(bean)
+		assertThat(beanWithDependency.dependency).isSameInstanceAs(bean)
 	}
 
 	@Test
@@ -69,10 +65,10 @@ class BeanDependenciesResolutionTest {
 		assertThat(bean).isNotNull()
 		val anotherBean = beanRegistry.lookUpBean("anotherBean", BeanWithDependency::class)
 		assertThat(anotherBean).isNotNull()
-		assertThat(anotherBean.dependency).isSameAs(bean)
+		assertThat(anotherBean.dependency).isSameInstanceAs(bean)
 		val yetAnotherBean = beanRegistry.lookUpBean("yetAnotherBean", BeanWithDependency::class)
 		assertThat(yetAnotherBean).isNotNull()
-		assertThat(yetAnotherBean.dependency).isSameAs(anotherBean)
+		assertThat(yetAnotherBean.dependency).isSameInstanceAs(anotherBean)
 	}
 
 	@Test
@@ -133,7 +129,7 @@ class BeanDependenciesResolutionTest {
 
 		val beanWithDependencies = beanRegistry.lookUpBean(BeanWithDependencies::class)
 		assertThat(beanWithDependencies).isNotNull()
-		assertThat(beanWithDependencies.dependencies).containsAll(bean, anotherBean)
+		assertThat(beanWithDependencies.dependencies).containsAtLeast(bean, anotherBean)
 	}
 
 	@Test
@@ -156,7 +152,7 @@ class BeanDependenciesResolutionTest {
 
 		val beanWithDependency = beanRegistry.lookUpBean(BeanWithDependency::class)
 		assertThat(beanWithDependency).isNotNull()
-		assertThat(beanWithDependency.dependency).isSameAs(bean)
+		assertThat(beanWithDependency.dependency).isSameInstanceAs(bean)
 	}
 }
 
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanRegistryTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanRegistryTest.kt
index 454bf40..a09fdec 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanRegistryTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeanRegistryTest.kt
@@ -1,12 +1,7 @@
 package rocks.frieler.android.beans
 
 import assertk.assertThat
-import assertk.assertions.containsOnly
-import assertk.assertions.isEqualTo
-import assertk.assertions.isIn
-import assertk.assertions.isNotEqualTo
-import assertk.assertions.isNull
-import assertk.assertions.isSameAs
+import assertk.assertions.*
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.any
@@ -57,7 +52,7 @@ class BeanRegistryTest {
         beanRegistry.registerBean(name, registeredBean)
         val bean = beanRegistry.lookUpOptionalBean(name, Any::class)
 
-        assertThat(bean).isSameAs(registeredBean)
+        assertThat(bean).isSameInstanceAs(registeredBean)
     }
 
     @Test
@@ -68,7 +63,7 @@ class BeanRegistryTest {
 
         val bean = beanRegistryWithParent.lookUpOptionalBean(name, Any::class)
 
-        assertThat(bean).isSameAs(inheritedBean)
+        assertThat(bean).isSameInstanceAs(inheritedBean)
     }
 
     @Test
@@ -86,7 +81,7 @@ class BeanRegistryTest {
         beanRegistry.registerBean("bean", registeredBean)
         val bean = beanRegistry.lookUpOptionalBean(Any::class)
 
-		assertThat(bean).isSameAs(registeredBean)
+        assertThat(bean).isSameInstanceAs(registeredBean)
     }
 
     @Test
@@ -108,7 +103,7 @@ class BeanRegistryTest {
 
         val bean = beanRegistryWithParent.lookUpOptionalBean(Any::class)
 
-        assertThat(bean).isSameAs(inheritedBean)
+        assertThat(bean).isSameInstanceAs(inheritedBean)
     }
 
     @Test
@@ -139,7 +134,7 @@ class BeanRegistryTest {
 
         val generatedName = beanRegistry.registerBean(bean)
 
-        assertThat(beanRegistry.lookUpBean(generatedName, Any::class)).isSameAs(bean)
+        assertThat(beanRegistry.lookUpBean(generatedName, Any::class)).isSameInstanceAs(bean)
     }
 
     @Test
@@ -151,8 +146,8 @@ class BeanRegistryTest {
         val generatedNameForBean2 = beanRegistry.registerBean(bean2)
 
         assertThat(generatedNameForBean2).isNotEqualTo(generatedNameForBean1)
-        assertThat(beanRegistry.lookUpBean(generatedNameForBean1, Any::class)).isSameAs(bean1)
-		assertThat(beanRegistry.lookUpBean(generatedNameForBean2, Any::class)).isSameAs(bean2)
+        assertThat(beanRegistry.lookUpBean(generatedNameForBean1, Any::class)).isSameInstanceAs(bean1)
+        assertThat(beanRegistry.lookUpBean(generatedNameForBean2, Any::class)).isSameInstanceAs(bean2)
     }
 
     /* tests for bean-scopes: */
@@ -220,7 +215,7 @@ class BeanRegistryTest {
         beanRegistry.registerBean(name, factoryBean)
         val bean = beanRegistry.lookUpOptionalBean(name, factoryBean.beanType)
 
-        assertThat(bean).isSameAs(scopedBean)
+        assertThat(bean).isSameInstanceAs(scopedBean)
     }
 
     @Test
@@ -238,7 +233,7 @@ class BeanRegistryTest {
         beanRegistry.registerBean(name, factoryBean)
         val bean = beanRegistry.lookUpOptionalBean(factoryBean.beanType)
 
-        assertThat(bean).isSameAs(this)
+        assertThat(bean).isSameInstanceAs(this)
     }
 
     @Test
@@ -279,7 +274,7 @@ class BeanRegistryTest {
         beanRegistry.registerBean(name, singletonFactory)
         val beanInstance = beanRegistry.lookUpBean(name, BeanRegistryTest::class)
 
-        assertThat(beanInstance).isSameAs(this)
+        assertThat(beanInstance).isSameInstanceAs(this)
     }
 
     @Test
@@ -290,7 +285,7 @@ class BeanRegistryTest {
         beanRegistry.registerBean(name, prototype)
         val beanInstance = beanRegistry.lookUpBean(name, BeanRegistryTest::class)
 
-		assertThat(beanInstance).isSameAs(this)
+        assertThat(beanInstance).isSameInstanceAs(this)
     }
 
     /* tests for post-processing: */
@@ -306,7 +301,7 @@ class BeanRegistryTest {
         beanRegistry.registerBean("bean", originalBean)
 
 		verify(beanPostProcessor).postProcessBean("bean", originalBean)
-        assertThat(beanRegistry.lookUpBean("bean", Any::class)).isSameAs(replacementBean)
+        assertThat(beanRegistry.lookUpBean("bean", Any::class)).isSameInstanceAs(replacementBean)
     }
 
     @Test
@@ -319,7 +314,7 @@ class BeanRegistryTest {
         beanRegistry.registerBean(beanPostProcessor)
 
 		verify(beanPostProcessor).postProcessBean("bean", originalBean)
-		assertThat(beanRegistry.lookUpBean("bean", Any::class)).isSameAs(replacementBean)
+        assertThat(beanRegistry.lookUpBean("bean", Any::class)).isSameInstanceAs(replacementBean)
     }
 
     @Test
@@ -343,6 +338,6 @@ class BeanRegistryTest {
 		val finalBean = beanRegistry.lookUpBean(name, Any::class)
 
         verify(beanPostProcessor).postProcessBean(name, originalBean)
-		assertThat(finalBean).isSameAs(replacementBean)
+        assertThat(finalBean).isSameInstanceAs(replacementBean)
     }
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeansOfTypeConsumerTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeansOfTypeConsumerTest.kt
index bb12c52..eef232f 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeansOfTypeConsumerTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeansOfTypeConsumerTest.kt
@@ -2,6 +2,7 @@ package rocks.frieler.android.beans
 
 import assertk.assertThat
 import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
@@ -19,7 +20,7 @@ class BeansOfTypeConsumerTest {
         val processedBean = beansOfTypeConsumer.postProcessBean("bean", originalBean)
 
         verifyNoInteractions(consumer)
-        assertThat(processedBean).isSameAs(originalBean)
+        assertThat(processedBean).isSameInstanceAs(originalBean)
     }
 
     @Test
@@ -27,7 +28,7 @@ class BeansOfTypeConsumerTest {
         val processedBean = beansOfTypeConsumer.postProcessBean("bean", this)
 
         verify(consumer)(this)
-        assertThat(processedBean).isSameAs(this)
+        assertThat(processedBean).isSameInstanceAs(this)
     }
 
     @Test
@@ -38,6 +39,6 @@ class BeansOfTypeConsumerTest {
         val processedBean = beansOfTypeConsumer.postProcessBean("bean", this)
 
         verify(consumer).accept(this)
-        assertThat(processedBean).isSameAs(this)
+        assertThat(processedBean).isSameInstanceAs(this)
     }
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeansProviderTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeansProviderTest.kt
index a2fd8f8..76059db 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeansProviderTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeansProviderTest.kt
@@ -4,11 +4,7 @@ import assertk.Assert
 import assertk.all
 import assertk.assertFailure
 import assertk.assertThat
-import assertk.assertions.hasClass
-import assertk.assertions.isEqualTo
-import assertk.assertions.isNull
-import assertk.assertions.isSameAs
-import assertk.assertions.prop
+import assertk.assertions.*
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito.spy
 import org.mockito.kotlin.whenever
@@ -27,7 +23,7 @@ class BeansProviderTest {
 
 		val bean = beansProvider.lookUpBean("name", BeansProviderTest::class)
 
-		assertThat(bean).isSameAs(this)
+		assertThat(bean).isSameInstanceAs(this)
 	}
 
 	@Test
@@ -56,7 +52,7 @@ class BeansProviderTest {
 
 		val bean = beansProvider.lookUpBean(BeansProviderTest::class)
 
-		assertThat(bean).isSameAs(this)
+		assertThat(bean).isSameInstanceAs(this)
 	}
 
 	@Test
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeansTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeansTest.kt
index 65bdbfd..6b3626a 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeansTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/BeansTest.kt
@@ -2,10 +2,7 @@ package rocks.frieler.android.beans
 
 import assertk.assertFailure
 import assertk.assertThat
-import assertk.assertions.containsExactly
-import assertk.assertions.hasClass
-import assertk.assertions.isNull
-import assertk.assertions.isSameAs
+import assertk.assertions.*
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.mock
@@ -26,7 +23,7 @@ class BeansTest {
 
         val retrievedBean = Beans.lookUpBean(type = Any::class)
 
-        assertThat(retrievedBean).isSameAs(bean)
+        assertThat(retrievedBean).isSameInstanceAs(bean)
     }
 
     @Test
@@ -45,7 +42,7 @@ class BeansTest {
 
         val retrievedBean: Any? = Beans.lookUpBean()
 
-        assertThat(retrievedBean).isSameAs(bean)
+        assertThat(retrievedBean).isSameInstanceAs(bean)
     }
 
     @Test
@@ -56,7 +53,7 @@ class BeansTest {
 
         val retrievedBean = Beans.lookUpBean(name, Any::class)
 
-        assertThat(retrievedBean).isSameAs(bean)
+        assertThat(retrievedBean).isSameInstanceAs(bean)
     }
 
     @Test
@@ -77,7 +74,7 @@ class BeansTest {
 
         val retrievedBean: Any? = Beans.lookUpBean(name)
 
-        assertThat(retrievedBean).isSameAs(bean)
+        assertThat(retrievedBean).isSameInstanceAs(bean)
     }
 
     @Test
@@ -87,7 +84,7 @@ class BeansTest {
 
         val retrievedBean = Beans.lookUpOptionalBean(type = Any::class)
 
-        assertThat(retrievedBean).isSameAs(bean)
+        assertThat(retrievedBean).isSameInstanceAs(bean)
     }
 
     @Test
@@ -106,7 +103,7 @@ class BeansTest {
 
         val retrievedBean: Any? = Beans.lookUpOptionalBean()
 
-        assertThat(retrievedBean).isSameAs(bean)
+        assertThat(retrievedBean).isSameInstanceAs(bean)
     }
 
     @Test
@@ -117,7 +114,7 @@ class BeansTest {
 
         val retrievedBean = Beans.lookUpOptionalBean(name, Any::class)
 
-        assertThat(retrievedBean).isSameAs(bean)
+        assertThat(retrievedBean).isSameInstanceAs(bean)
     }
 
     @Test
@@ -138,7 +135,7 @@ class BeansTest {
 
         val retrievedBean: Any? = Beans.lookUpOptionalBean(name)
 
-        assertThat(retrievedBean).isSameAs(bean)
+        assertThat(retrievedBean).isSameInstanceAs(bean)
     }
 
     @Test
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/DeclarativeBeanConfigurationTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/DeclarativeBeanConfigurationTest.kt
index 087514e..cdcf180 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/DeclarativeBeanConfigurationTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/DeclarativeBeanConfigurationTest.kt
@@ -1,12 +1,7 @@
 package rocks.frieler.android.beans
 
 import assertk.assertThat
-import assertk.assertions.contains
-import assertk.assertions.hasSize
-import assertk.assertions.isEqualTo
-import assertk.assertions.isInstanceOf
-import assertk.assertions.isNull
-import assertk.assertions.isSameAs
+import assertk.assertions.*
 import org.mockito.kotlin.mock
 import org.junit.jupiter.api.Test
 
@@ -48,9 +43,9 @@ class DeclarativeBeanConfigurationTest {
 
 		assertThat(beanDefinitions).hasSize(2)
 		assertThat(beanDefinitions[0].getName()).isNull()
-		assertThat(beanDefinitions[0].produceBean(dependencyProvider)).isSameAs(this)
+		assertThat(beanDefinitions[0].produceBean(dependencyProvider)).isSameInstanceAs(this)
 		assertThat(beanDefinitions[1].getName()).isEqualTo("named_bean")
-		assertThat(beanDefinitions[1].produceBean(dependencyProvider)).isSameAs(this)
+		assertThat(beanDefinitions[1].produceBean(dependencyProvider)).isSameInstanceAs(this)
 	}
 
 	@Test
@@ -67,7 +62,7 @@ class DeclarativeBeanConfigurationTest {
 		val beanDefinitions = aBeanConfiguration.getBeanDefinitions()
 
 		assertThat(beanDefinitions).hasSize(1)
-		assertThat(beanDefinitions[0].produceBean(dependencyProvider)).isSameAs(this)
+		assertThat(beanDefinitions[0].produceBean(dependencyProvider)).isSameInstanceAs(this)
 	}
 
 	@Test
@@ -84,7 +79,7 @@ class DeclarativeBeanConfigurationTest {
 		assertThat(beanDefinitions).hasSize(1)
 		assertThat(beanDefinitions[0].getName()).isEqualTo("bean")
 		assertThat(beanDefinitions[0].getType()).isEqualTo(Any::class)
-		assertThat(beanDefinitions[0].produceBean(dependencyProvider)).isSameAs(this)
+		assertThat(beanDefinitions[0].produceBean(dependencyProvider)).isSameInstanceAs(this)
 	}
 
 	@Test
@@ -104,6 +99,6 @@ class DeclarativeBeanConfigurationTest {
 		assertThat(beanDefinitions).hasSize(1)
 		assertThat(beanDefinitions[0].getName()).isEqualTo("bean")
 		assertThat(beanDefinitions[0].getType()).isEqualTo(Any::class)
-		assertThat(beanDefinitions[0].produceBean(dependencyProvider)).isSameAs(this)
+		assertThat(beanDefinitions[0].produceBean(dependencyProvider)).isSameInstanceAs(this)
 	}
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/GenericScopedFactoryBeanTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/GenericScopedFactoryBeanTest.kt
index 31704d5..c2829f0 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/GenericScopedFactoryBeanTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/GenericScopedFactoryBeanTest.kt
@@ -3,6 +3,7 @@ package rocks.frieler.android.beans.scopes
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
@@ -33,6 +34,6 @@ class GenericScopedFactoryBeanTest {
         val producedBean = factoryBean.produceBean(beansProvider)
 
         verify(producer).invoke(beansProvider)
-        assertThat(producedBean).isSameAs(this)
+        assertThat(producedBean).isSameInstanceAs(this)
     }
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/ScopedFactoryBeanDecoratorTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/ScopedFactoryBeanDecoratorTest.kt
index 8d4e982..ecd193a 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/ScopedFactoryBeanDecoratorTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/ScopedFactoryBeanDecoratorTest.kt
@@ -3,6 +3,7 @@ package rocks.frieler.android.beans.scopes
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.inOrder
 import org.mockito.kotlin.mock
@@ -41,7 +42,7 @@ class ScopedFactoryBeanDecoratorTest {
         val bean = decoratedFactoryBean.produceBean(dependencies)
 
         verify(scopedFactoryBean).produceBean(dependencies)
-        assertThat(bean).isSameAs(this)
+        assertThat(bean).isSameInstanceAs(this)
     }
 
     @Test
@@ -59,6 +60,6 @@ class ScopedFactoryBeanDecoratorTest {
             verify(scopedFactoryBean).produceBean(dependencies)
             verify(postProcessing).invoke(bean)
         }
-        assertThat(finalBean).isSameAs(beanAfterPostProcessing)
+        assertThat(finalBean).isSameInstanceAs(beanAfterPostProcessing)
     }
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/activity/ActivityScopedFactoryBeanHandlerTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/activity/ActivityScopedFactoryBeanHandlerTest.kt
index bb8d7cf..c381ba2 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/activity/ActivityScopedFactoryBeanHandlerTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/activity/ActivityScopedFactoryBeanHandlerTest.kt
@@ -3,10 +3,7 @@ package rocks.frieler.android.beans.scopes.activity
 import android.app.Activity
 import androidx.activity.ComponentActivity
 import assertk.assertThat
-import assertk.assertions.isEqualTo
-import assertk.assertions.isFalse
-import assertk.assertions.isSameAs
-import assertk.assertions.isTrue
+import assertk.assertions.*
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.kotlin.clearInvocations
@@ -69,7 +66,7 @@ class ActivityScopedFactoryBeanHandlerTest {
 
 		val bean = activityScopedFactoryBeanHandler.getBean("bean", activityScopedFactoryBean, dependencies)
 
-		assertThat(bean).isSameAs(this)
+		assertThat(bean).isSameInstanceAs(this)
 	}
 
 	@Test
@@ -83,13 +80,13 @@ class ActivityScopedFactoryBeanHandlerTest {
 		val bean = activityScopedFactoryBeanHandler.getBean("bean", activityScopedFactoryBean, dependencies)
 
 		verify(activityScopedFactoryBean).produceBean(dependencies)
-		assertThat(bean).isSameAs(this)
+		assertThat(bean).isSameInstanceAs(this)
 		clearInvocations(activityScopedFactoryBean)
 
 		val beanAgain = activityScopedFactoryBeanHandler.getBean("bean", activityScopedFactoryBean, dependencies)
 
 		verify(activityScopedFactoryBean, never()).produceBean(dependencies)
-		assertThat(beanAgain).isSameAs(bean)
+		assertThat(beanAgain).isSameInstanceAs(bean)
 	}
 
 	@Test
@@ -104,6 +101,6 @@ class ActivityScopedFactoryBeanHandlerTest {
 		val bean = activityScopedFactoryBeanHandler.getBean("bean", activityScopedFactoryBean, dependencies)
 
 		verify(activityAwareBean).setActivity(componentActivity)
-		assertThat(bean).isSameAs(activityAwareBean)
+		assertThat(bean).isSameInstanceAs(activityAwareBean)
 	}
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/activity/ActivityScopedFactoryBeanTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/activity/ActivityScopedFactoryBeanTest.kt
index 0f4ddf2..b51a646 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/activity/ActivityScopedFactoryBeanTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/activity/ActivityScopedFactoryBeanTest.kt
@@ -4,6 +4,7 @@ import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isInstanceOf
 import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.mock
@@ -34,7 +35,7 @@ class ActivityScopedFactoryBeanTest {
 		val dependencies: BeansProvider = mock()
 		whenever(producer(dependencies)).thenReturn(this)
 
-		assertThat(factoryBean.produceBean(dependencies)).isSameAs(this)
+		assertThat(factoryBean.produceBean(dependencies)).isSameInstanceAs(this)
 	}
 
 	@Test
@@ -83,6 +84,6 @@ class ActivityScopedFactoryBeanTest {
 	private fun assertActivityScopedFactoryBeanProducingThis(factoryBean: ActivityScopedFactoryBean<*>, dependencies: BeansProvider) {
 		assertThat(factoryBean).isInstanceOf(ActivityScopedFactoryBean::class)
 		assertThat(factoryBean.beanType).isEqualTo(ActivityScopedFactoryBeanTest::class)
-		assertThat(factoryBean.produceBean(dependencies)).isSameAs(this)
+		assertThat(factoryBean.produceBean(dependencies)).isSameInstanceAs(this)
 	}
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/activity/ForegroundActivityHolderTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/activity/ForegroundActivityHolderTest.kt
index babdea2..b0c308f 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/activity/ForegroundActivityHolderTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/activity/ForegroundActivityHolderTest.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import assertk.assertThat
 import assertk.assertions.isNull
 import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import org.mockito.kotlin.mock
 import org.junit.jupiter.api.Test
 
@@ -18,21 +19,21 @@ class ForegroundActivityHolderTest {
 	fun `ForegroundActivityHolder holds created Activity`() {
 		foregroundActivityHolder.onActivityCreated(activity, null)
 
-		assertThat(foregroundActivityHolder.currentActivity).isSameAs(activity)
+		assertThat(foregroundActivityHolder.currentActivity).isSameInstanceAs(activity)
 	}
 
 	@Test
 	fun `ForegroundActivityHolder holds started Activity`() {
 		foregroundActivityHolder.onActivityStarted(activity)
 
-		assertThat(foregroundActivityHolder.currentActivity).isSameAs(activity)
+		assertThat(foregroundActivityHolder.currentActivity).isSameInstanceAs(activity)
 	}
 
 	@Test
 	fun `ForegroundActivityHolder holds resumed Activity`() {
 		foregroundActivityHolder.onActivityResumed(activity)
 
-		assertThat(foregroundActivityHolder.currentActivity).isSameAs(activity)
+		assertThat(foregroundActivityHolder.currentActivity).isSameInstanceAs(activity)
 	}
 
 	@Test
@@ -48,7 +49,7 @@ class ForegroundActivityHolderTest {
 		foregroundActivityHolder.onActivityResumed(activity)
 		foregroundActivityHolder.onActivityPaused(anotherActivity)
 
-		assertThat(foregroundActivityHolder.currentActivity).isSameAs(activity)
+		assertThat(foregroundActivityHolder.currentActivity).isSameInstanceAs(activity)
 	}
 
 	@Test
@@ -64,6 +65,6 @@ class ForegroundActivityHolderTest {
 		foregroundActivityHolder.onActivityResumed(activity)
 		foregroundActivityHolder.onActivityStopped(anotherActivity)
 
-		assertThat(foregroundActivityHolder.currentActivity).isSameAs(activity)
+		assertThat(foregroundActivityHolder.currentActivity).isSameInstanceAs(activity)
 	}
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/prototype/PrototypeScopedFactoryBeanHandlerTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/prototype/PrototypeScopedFactoryBeanHandlerTest.kt
index 0e6a44e..93de77b 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/prototype/PrototypeScopedFactoryBeanHandlerTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/prototype/PrototypeScopedFactoryBeanHandlerTest.kt
@@ -3,6 +3,7 @@ package rocks.frieler.android.beans.scopes.prototype
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import assertk.assertions.isTrue
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito
@@ -35,7 +36,7 @@ class PrototypeScopedFactoryBeanHandlerTest {
 
         val beanInstance = prototypeScopedFactoryBeanHandler.getBean("bean", scopedFactoryBean, dependencies)
 
-        assertThat(beanInstance).isSameAs(bean)
+        assertThat(beanInstance).isSameInstanceAs(bean)
     }
 
     @Test
@@ -49,7 +50,7 @@ class PrototypeScopedFactoryBeanHandlerTest {
         val secondBeanInstance = prototypeScopedFactoryBeanHandler.getBean("bean", scopedFactoryBean, beansProvider)
 
         verify(scopedFactoryBean, Mockito.times(2)).produceBean(beansProvider)
-        assertThat(firstBeanInstance).isSameAs(firstBean)
-        assertThat(secondBeanInstance).isSameAs(secondBean)
+        assertThat(firstBeanInstance).isSameInstanceAs(firstBean)
+        assertThat(secondBeanInstance).isSameInstanceAs(secondBean)
     }
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/prototype/PrototypeScopedFactoryBeanTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/prototype/PrototypeScopedFactoryBeanTest.kt
index 5868dc6..d76c551 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/prototype/PrototypeScopedFactoryBeanTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/prototype/PrototypeScopedFactoryBeanTest.kt
@@ -4,6 +4,7 @@ import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isInstanceOf
 import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.mock
@@ -36,7 +37,7 @@ class PrototypeScopedFactoryBeanTest {
         val producedBean = factoryBean.produceBean(dependencies)
 
         verify(producer).invoke(dependencies)
-        assertThat(producedBean).isSameAs(this)
+        assertThat(producedBean).isSameInstanceAs(this)
     }
 
     @Test
@@ -85,6 +86,6 @@ class PrototypeScopedFactoryBeanTest {
     private fun assertPrototypeScopedFactoryBeanProducingThis(factoryBean: PrototypeScopedFactoryBean<*>, dependencies: BeansProvider) {
         assertThat(factoryBean).isInstanceOf(PrototypeScopedFactoryBean::class)
         assertThat(factoryBean.beanType).isEqualTo(PrototypeScopedFactoryBeanTest::class)
-        assertThat(factoryBean.produceBean(dependencies)).isSameAs(this)
+        assertThat(factoryBean.produceBean(dependencies)).isSameInstanceAs(this)
     }
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/singleton/SingletonScopedFactoryBeanHandlerTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/singleton/SingletonScopedFactoryBeanHandlerTest.kt
index e8c9a39..bb05d0e 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/singleton/SingletonScopedFactoryBeanHandlerTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/singleton/SingletonScopedFactoryBeanHandlerTest.kt
@@ -3,6 +3,7 @@ package rocks.frieler.android.beans.scopes.singleton
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import assertk.assertions.isTrue
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito.times
@@ -35,7 +36,7 @@ class SingletonScopedFactoryBeanHandlerTest {
 
         val beanInstance = singletonScopedFactoryBeanHandler.getBean("bean", scopedFactoryBean, dependencies)
 
-        assertThat(beanInstance).isSameAs(bean)
+        assertThat(beanInstance).isSameInstanceAs(bean)
     }
 
     @Test
@@ -48,7 +49,7 @@ class SingletonScopedFactoryBeanHandlerTest {
         val secondBeanInstance = singletonScopedFactoryBeanHandler.getBean("bean", scopedFactoryBean, dependencies)
 
         verify(scopedFactoryBean, times(1)).produceBean(dependencies)
-        assertThat(firstBeanInstance).isSameAs(bean)
-        assertThat(secondBeanInstance).isSameAs(bean)
+        assertThat(firstBeanInstance).isSameInstanceAs(bean)
+        assertThat(secondBeanInstance).isSameInstanceAs(bean)
     }
 }
diff --git a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/singleton/SingletonScopedFactoryBeanTest.kt b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/singleton/SingletonScopedFactoryBeanTest.kt
index 12d939c..7ad8ea8 100644
--- a/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/singleton/SingletonScopedFactoryBeanTest.kt
+++ b/android-beans/src/test/kotlin/rocks/frieler/android/beans/scopes/singleton/SingletonScopedFactoryBeanTest.kt
@@ -4,6 +4,7 @@ import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isInstanceOf
 import assertk.assertions.isSameAs
+import assertk.assertions.isSameInstanceAs
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.mock
@@ -37,7 +38,7 @@ class SingletonScopedFactoryBeanTest {
         val producedBean = factoryBean.produceBean(dependencies)
 
         verify(producer).invoke(dependencies)
-        assertThat(producedBean).isSameAs(this)
+        assertThat(producedBean).isSameInstanceAs(this)
     }
 
     @Test
@@ -86,6 +87,6 @@ class SingletonScopedFactoryBeanTest {
     private fun assertSingletonScopedFactoryBeanProducingThis(factoryBean: SingletonScopedFactoryBean<*>, dependencies: BeansProvider) {
         assertThat(factoryBean).isInstanceOf(SingletonScopedFactoryBean::class)
         assertThat(factoryBean.beanType).isEqualTo(SingletonScopedFactoryBeanTest::class)
-        assertThat(factoryBean.produceBean(dependencies)).isSameAs(this)
+        assertThat(factoryBean.produceBean(dependencies)).isSameInstanceAs(this)
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index 7b7bd23..af57b5c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,14 +5,14 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.1.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10")
+        classpath(libs.kotlin)
+        classpath(libs.android.build.tools.gradle)
     }
 }
 
 plugins {
-    id("org.sonarqube") version "4.2.1.3168"
-    id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
+    id("org.sonarqube") version "6.1.0.5360"
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 }
 
 allprojects {
diff --git a/gradle.properties b/gradle.properties
index 05ae7e1..dba1d98 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,6 +12,9 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+
 android.useAndroidX=true
 
 # configuration for the signing-plugin:
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..c03fc30
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,25 @@
+[versions]
+kotlin = "2.1.20"
+android-build-tools-gradle = "8.7.3"
+androidx-activity = "1.10.1"
+androidx-lifecycle = "2.8.7"
+android-tools-desugar_jdk_libs = "2.1.5"
+junit = "5.11.3"
+assertk = "0.28.1"
+mockito = "5.4.0"
+robolectric = "4.14.1"
+
+[plugins]
+
+[libraries]
+kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+android-build-tools-gradle = { module = "com.android.tools.build:gradle", version.ref = "android-build-tools-gradle" }
+android-tools-desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "android-tools-desugar_jdk_libs" }
+androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
+androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
+junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine" }
+assertk-jvm = { module = "com.willowtreeapps.assertk:assertk-jvm", version.ref = "assertk" }
+mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito" }
+robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7..9bbc975 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c30b486..37f853b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 79a61d4..faf9300 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +133,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +147,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +155,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +200,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59..9d21a21 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail