Feature/modernize

.github/workflows/build-pipeline.yml

@@ -4,18 +4,18 @@ 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'
       - name: Configure Sonar-Analysis
         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,17 +46,17 @@ 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 }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           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 }}

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")
 }

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

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)

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)
 	}
 }

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)
 	}
 }