Skip to content

Downgrade Kotlin/Ktor for Kotlin 2.1-compatible metadata #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Josh Pensky (joshpensky) merged 5 commits into from
Jul 3, 2026
Merged

Downgrade Kotlin/Ktor for Kotlin 2.1-compatible metadata #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0af69a0
Downgrade Ktor to 3.2.4 for Kotlin 2.1-compatible metadata
joshpensky Jul 1, 2026
053c03b
Downgrade Kotlin plugin to 2.1.20
joshpensky Jul 2, 2026
d9f8625
Fix evervault-cages lockfile: debugAndroidTestCompileClasspath still …
joshpensky Jul 2, 2026
524862e
add changeset
joshpensky Jul 2, 2026
cffa149
revert Android signing
joshpensky Jul 2, 2026
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
8 changes: 8 additions & 0 deletions .changeset/cute-bugs-do.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"evervault-android": minor
---

Add support for Kotlin 2.1

- Downgrade the ktor dependency to 3.2.4, which supports Kotlin 2.1
- Change Kotlin version dependencies to 2.1
104 changes: 56 additions & 48 deletions evervault-cages/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions evervault-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ dependencies {
testImplementation(kotlin("test"))

// Explicitly specify kotlin-stdlib-common version to ensure all configurations (including Android test)
// are properly locked. Version must match the Kotlin plugin version in settings.gradle.kts (2.0.21).
// are properly locked. Version must match the Kotlin plugin version in settings.gradle.kts (2.1.20).
// This resolves the issue where debugAndroidTestRuntimeClasspath isn't captured during lockfile generation.
implementation("org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21")
implementation("org.jetbrains.kotlin:kotlin-stdlib-common:2.1.20")

// ktor
implementation("io.ktor:ktor-client-core:3.4.0")
implementation("io.ktor:ktor-client-okhttp:3.4.0")
implementation("io.ktor:ktor-client-core:3.2.4")
Comment thread
matt-evervault marked this conversation as resolved.
implementation("io.ktor:ktor-client-okhttp:3.2.4")
implementation("org.bouncycastle:bcprov-jdk15to18:1.84")

// JSON
Expand Down
321 changes: 88 additions & 233 deletions evervault-core/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

122 changes: 62 additions & 60 deletions evervault-enclaves/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

121 changes: 64 additions & 57 deletions evervault-inputs/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions sampleapplication/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ dependencies {
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0-alpha03")
// Explicitly specify kotlin-stdlib-common version to ensure debugAndroidTestRuntimeClasspath is properly locked.
// Version must match the Kotlin plugin version in settings.gradle.kts (2.2.21).
androidTestImplementation("org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21")
// Version must match the Kotlin plugin version in settings.gradle.kts (2.1.20).
androidTestImplementation("org.jetbrains.kotlin:kotlin-stdlib-common:2.1.20")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
}
117 changes: 60 additions & 57 deletions sampleapplication/gradle.lockfile
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ pluginManagement {
plugins {
id("com.android.application") version "8.13.2" apply false
id("com.android.library") version "8.13.2" apply false
id("org.jetbrains.kotlin.android") version "2.2.21" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "2.2.21" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.2.21" apply false
id("org.jetbrains.kotlin.android") version "2.1.20" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "2.1.20" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.1.20" apply false
}
}

Expand Down
Loading