Skip to content

Commit

Permalink
Merge pull request #106 from jsoberg/renovate/all-minor-patch
Browse files Browse the repository at this point in the history
Update all non-major dependencies (except kotlin)
  • Loading branch information
jsoberg authored Dec 24, 2024
2 parents b83c57f + 21c8e5f commit 2625698
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ object Versions {
}

object Java {
val sourceCompatibility = JavaVersion.VERSION_17
val sourceCompatibility = JavaVersion.VERSION_21
val targetCompatibility = sourceCompatibility
val toolchainVersion: JavaLanguageVersion =
JavaLanguageVersion.of(sourceCompatibility.toString())
}

// 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
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,20 @@ 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,
NET_CAPABILITY_VALIDATED,
)
)
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)
}
}

Expand Down
22 changes: 11 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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.1.0"
kotlinCoroutines = "1.10.1"
kotlinSerialization = "1.7.3"
# KSP version must align with Kotlin version: https://github.com/google/ksp/releases
ksp = "2.1.0-1.0.29"
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"


Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.0"
}
Expand Down

0 comments on commit 2625698

Please sign in to comment.