From 99cc5e519c204317cb46da5a756bd30e3b05e169 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 24 Dec 2024 12:13:27 +0000 Subject: [PATCH 1/4] Update all non-major dependencies (except kotlin) --- gradle/libs.versions.toml | 22 +++++++++++----------- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5014757..cb81056 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,28 +1,28 @@ [versions] -androidGradlePlugin = "8.7.2" +androidGradlePlugin = "8.7.3" androidxActivity = "1.9.3" androidxLifecycle = "2.8.7" androidxCoreTest = "1.6.1" assertk = "0.28.1" -composeBom = "2024.10.01" -composeNavigation = "2.8.3" -dagger = "2.52" -dependencyAnalysis = "2.4.2" +composeBom = "2024.12.01" +composeNavigation = "2.8.5" +dagger = "2.54" +dependencyAnalysis = "2.6.1" googleAccompanist = "0.36.0" -googleGuava = "33.3.1-jre" +googleGuava = "33.4.0-jre" googleMaterial = "1.12.0" javapoet = "1.13.0" junit4 = "4.13.2" -junitJupiter = "5.11.3" +junitJupiter = "5.11.4" kotlin = "2.0.21" kotlinCoroutines = "1.9.0" kotlinSerialization = "1.7.3" # KSP version must align with Kotlin version: https://github.com/google/ksp/releases ksp = "2.0.21-1.0.26" -ktor = "3.0.1" -lottie = "6.6.0" -mockk = "1.13.13" -robolectric = "4.13" +ktor = "3.0.3" +lottie = "6.6.2" +mockk = "1.13.14" +robolectric = "4.14.1" turbine = "1.2.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index fd9943f..97504ca 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,7 +12,7 @@ plugins { // Can't apply these version from the TOML, since they're applied in settings before the TOML is ready to use. // See https://plugins.gradle.org/plugin/org.gradle.toolchains.foojay-resolver-convention - id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" // See https://kotlin.github.io/kotlinx-kover/gradle-plugin/aggregated.html id("org.jetbrains.kotlinx.kover.aggregation") version "0.8.3" } From 3b283ecdc7c3a26421d75f17dd2e0a34c2bcbaad Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Tue, 24 Dec 2024 09:48:07 -0500 Subject: [PATCH 2/4] Update to JDK 21 --- .../plugins/src/main/kotlin/com/soberg/gradle/Versions.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-logic/plugins/src/main/kotlin/com/soberg/gradle/Versions.kt b/build-logic/plugins/src/main/kotlin/com/soberg/gradle/Versions.kt index f81268c..2052f0a 100644 --- a/build-logic/plugins/src/main/kotlin/com/soberg/gradle/Versions.kt +++ b/build-logic/plugins/src/main/kotlin/com/soberg/gradle/Versions.kt @@ -16,7 +16,7 @@ object Versions { } object Java { - val sourceCompatibility = JavaVersion.VERSION_17 + val sourceCompatibility = JavaVersion.VERSION_21 val targetCompatibility = sourceCompatibility val toolchainVersion: JavaLanguageVersion = JavaLanguageVersion.of(sourceCompatibility.toString()) @@ -24,7 +24,7 @@ object Versions { // See https://kotlinlang.org/docs/gradle-compiler-options.html#types-for-compiler-options object Kotlin { - val jvmTarget = JvmTarget.JVM_17 + val jvmTarget = JvmTarget.JVM_21 val languageVersion = KotlinVersion.KOTLIN_2_0 } } \ No newline at end of file From a9ae6356e046626151d09df105a22937b14ef0b4 Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Tue, 24 Dec 2024 09:54:36 -0500 Subject: [PATCH 3/4] Update GHA to use JDK 21 --- .github/workflows/build-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 1e6e858..108e380 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -18,11 +18,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Setup JDK 17 + - name: Setup JDK 21 uses: actions/setup-java@v4 with: distribution: 'adopt' - java-version: '17' + java-version: '21' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 From 21c8e5fea544915653bf106579aa86cb34df05aa Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Tue, 24 Dec 2024 10:08:43 -0500 Subject: [PATCH 4/4] Update test for Robolectric changes --- .../AndroidNetworkConnectionRepositoryTest.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/feature/data/network-connectivity/src/test/kotlin/com/soberg/netinfo/android/data/netconnectivity/AndroidNetworkConnectionRepositoryTest.kt b/feature/data/network-connectivity/src/test/kotlin/com/soberg/netinfo/android/data/netconnectivity/AndroidNetworkConnectionRepositoryTest.kt index 9995e34..8fd5897 100644 --- a/feature/data/network-connectivity/src/test/kotlin/com/soberg/netinfo/android/data/netconnectivity/AndroidNetworkConnectionRepositoryTest.kt +++ b/feature/data/network-connectivity/src/test/kotlin/com/soberg/netinfo/android/data/netconnectivity/AndroidNetworkConnectionRepositoryTest.kt @@ -99,6 +99,10 @@ internal class AndroidNetworkConnectionRepositoryTest { assertThat(awaitItem()).isEqualTo(State.NoActiveConnection) shadowOf(connectivityManager).setDefaultNetworkActive(true) + val second = awaitItem() as State.Connected + // Default active network doesn't yet have capabilities. + assertThat(second.netInterface.properties).isEmpty() + mockActiveNetwork( capabilities = listOf( NET_CAPABILITY_INTERNET, @@ -106,8 +110,9 @@ internal class AndroidNetworkConnectionRepositoryTest { ) ) callback.onAvailable(mockk()) - val second = awaitItem() as State.Connected - assertThat(second.netInterface.properties).containsExactly(Internet) + + val last = awaitItem() as State.Connected + assertThat(last.netInterface.properties).containsExactly(Internet) } }