Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach

dependencies {
implementation("com.android.tools.build:gradle:8.13.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.21")
implementation("org.jlleitschuh.gradle:ktlint-gradle:14.2.0")
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8")
// Matches the `dokka` version in gradle/libs.versions.toml. Applied by
Expand Down
6 changes: 3 additions & 3 deletions gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
id("org.jetbrains.kotlin.jvm") version "2.2.20"
id("org.jetbrains.kotlin.jvm") version "2.4.21"
id("java-gradle-plugin")
id("maven-publish")
// Latest 1.x release: 2.x raises the minimum Gradle version this repo isn't ready to require yet.
id("com.gradle.plugin-publish") version "1.3.1"
id("com.gradle.plugin-publish") version "2.2.1"
}

// Must share a top-level namespace with the plugin ID (a Plugin Portal requirement) and match
Expand All @@ -30,7 +30,7 @@ dependencies {
// the plain kotlin.jvm plugin doesn't pull this in the way build-logic's
// `kotlin-dsl` plugin does.
compileOnly(gradleKotlinDsl())
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:2.2.20")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:2.4.21")
testImplementation(gradleTestKit())
}

Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[versions]
agp = "8.13.0"
kotlin = "2.2.20"
agp = "9.4.1"
kotlin = "2.4.21"
ktor = "3.0.3"
compose-bom = "2024.10.01"
compose-bom = "2026.09.00"
activity = "1.9.3"
lifecycle = "2.8.7"
coroutines = "1.9.0"
coroutines = "1.11.0"
re2j = "1.8"
# okhttp itself is still declared inline per-module (e.g. sdk/socket-okhttp/build.gradle.kts) --
# migrating it into this catalog is out of scope for this change.
Expand All @@ -16,7 +16,7 @@ android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.18.1" }
binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.18.2" }
dokka = { id = "org.jetbrains.dokka", version = "2.2.0" }
# Must match the version on build-logic's classpath (build-logic/build.gradle.kts).
vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.37.0" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
194 changes: 112 additions & 82 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions samples/compose-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ dependencies {
// network-ktor is the one adapter with no release no-op twin, so it is debug-only and the
// client that installs it lives in src/debug (src/release builds the same client without it).
debugImplementation(project(":sdk:network-ktor"))
implementation("io.ktor:ktor-client-core:3.0.3")
implementation("io.ktor:ktor-client-core:3.6.0")
// CIO, not the OkHttp engine: a body captured through a pure-Kotlin engine is the proof that
// the Ktor plugin captures on its own rather than riding on this sample's OkHttp adapter.
implementation("io.ktor:ktor-client-cio:3.0.3")
implementation("com.squareup.okhttp3:okhttp:4.12.0")
implementation("io.ktor:ktor-client-cio:3.6.0")
implementation("com.squareup.okhttp3:okhttp:5.5.0")
implementation(libs.paho.mqttv3)
implementation(libs.activity.compose)
implementation(libs.lifecycle.runtime.compose)
Expand Down
2 changes: 1 addition & 1 deletion samples/foundation-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {
releaseImplementation(project(":sdk:mocks-okhttp-noop"))
debugImplementation(project(":sdk:socket-okhttp"))
releaseImplementation(project(":sdk:socket-okhttp-noop"))
implementation("com.squareup.okhttp3:okhttp:4.12.0")
implementation("com.squareup.okhttp3:okhttp:5.5.0")
}

// No devConsole {} override here: this sample has no product flavors, so the plugin's own
Expand Down
2 changes: 1 addition & 1 deletion samples/views-java-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
// DevConsolePanelController seam (src/main) instead of DevConsolePanelView directly, with a
// debug and a release DevConsolePanelControllerFactory supplying the real panel or a no-op.
debugImplementation(project(":sdk:ui-views"))
implementation("com.squareup.okhttp3:okhttp:4.12.0")
implementation("com.squareup.okhttp3:okhttp:5.5.0")
}

// No devConsole {} override here: this sample has no product flavors, so the plugin's own
Expand Down
2 changes: 1 addition & 1 deletion sdk/api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

dependencies {
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0")
api(project(":sdk:network"))
api(project(":sdk:socket"))
api(project(":sdk:push"))
Expand Down
2 changes: 1 addition & 1 deletion sdk/composer/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ android { namespace = "io.devconsole.composer" }

dependencies {
implementation(project(":sdk:security"))
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
testImplementation("com.squareup.okhttp3:mockwebserver:5.5.0")
}
4 changes: 2 additions & 2 deletions sdk/core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ dependencies {
implementation(project(":sdk:api"))
implementation(project(":sdk:security"))
implementation(project(":sdk:storage-api"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.11.0")
}
2 changes: 1 addition & 1 deletion sdk/export/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android { namespace = "io.devconsole.export" }

dependencies {
api(project(":sdk:timeline"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0")
implementation(project(":sdk:security"))
implementation(project(":sdk:storage-api"))
}
8 changes: 4 additions & 4 deletions sdk/full/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
// to be a declared dependency rather than one inherited by luck through ui-compose's Compose
// graph. A manifest-referenced provider whose class goes missing fails in the host app at
// instantiation, not here.
implementation("androidx.core:core-ktx:1.13.1")
implementation("androidx.core:core-ktx:1.19.1")
// OkHttp adapters stay on the umbrella: OkHttp (and Retrofit, which delegates to it) is the
// integration the overwhelming majority of hosts need, so it belongs in the two-coordinate story.
api(project(":sdk:network-okhttp"))
Expand All @@ -43,15 +43,15 @@ dependencies {
implementation(project(":sdk:composer"))
implementation(project(":sdk:storage-api"))
implementation(project(":sdk:storage-room"))
implementation("androidx.room:room-runtime:2.6.1")
implementation("androidx.room:room-runtime:2.8.5")
implementation(project(":sdk:timeline"))
implementation(project(":sdk:export"))
implementation(project(":sdk:server-api"))
implementation(project(":sdk:server-ktor"))
implementation(project(":sdk:push"))
implementation(project(":sdk:state"))
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0")
testImplementation("org.robolectric:robolectric:4.16.1")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.11.0")
testImplementation("org.robolectric:robolectric:4.17")
testImplementation("androidx.test:core:1.6.1")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test:runner:1.6.2")
Expand Down
4 changes: 2 additions & 2 deletions sdk/mocks-okhttp-noop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ android { namespace = "io.devconsole.mocks.okhttp.noop" }

dependencies {
implementation(project(":sdk:mocks"))
implementation("com.squareup.okhttp3:okhttp:4.12.0")
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
implementation("com.squareup.okhttp3:okhttp:5.5.0")
testImplementation("com.squareup.okhttp3:mockwebserver:5.5.0")
}
4 changes: 2 additions & 2 deletions sdk/mocks-okhttp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ android {
dependencies {
implementation(project(":sdk:mocks"))
implementation(project(":sdk:network"))
implementation("com.squareup.okhttp3:okhttp:4.12.0")
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
implementation("com.squareup.okhttp3:okhttp:5.5.0")
testImplementation("com.squareup.okhttp3:mockwebserver:5.5.0")
}
6 changes: 3 additions & 3 deletions sdk/network-ktor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {

dependencies {
api(project(":sdk:network"))
implementation("io.ktor:ktor-client-core:3.0.3")
testImplementation("io.ktor:ktor-client-mock:3.0.3")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0")
implementation("io.ktor:ktor-client-core:3.6.0")
testImplementation("io.ktor:ktor-client-mock:3.6.0")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.11.0")
}
4 changes: 2 additions & 2 deletions sdk/network-okhttp-noop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ dependencies {
// Mirrors the enabled module: MockEngine is named in installDevConsole's signature on both sides,
// so it has to be visible to consumers here too or the release variant would not compile.
api(project(":sdk:mocks"))
implementation("com.squareup.okhttp3:okhttp:4.12.0")
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
implementation("com.squareup.okhttp3:okhttp:5.5.0")
testImplementation("com.squareup.okhttp3:mockwebserver:5.5.0")
}
4 changes: 2 additions & 2 deletions sdk/network-okhttp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ dependencies {
// type of its defaulted mockEngine parameter), so a consumer cannot resolve the call without it.
api(project(":sdk:mocks"))
implementation(project(":sdk:mocks-okhttp"))
implementation("com.squareup.okhttp3:okhttp:4.12.0")
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
implementation("com.squareup.okhttp3:okhttp:5.5.0")
testImplementation("com.squareup.okhttp3:mockwebserver:5.5.0")
}
Loading
Loading