Skip to content
Merged
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
9 changes: 7 additions & 2 deletions evervault-cages/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
kotlin {
jvmToolchain(JavaVersion.VERSION_11.toString().toInt())
}
buildFeatures {
compose = true
Expand All @@ -64,6 +64,11 @@ android {
}
}

dependencyLocking {
// Enable lock files for dependency versions.
lockAllConfigurations()
}

dependencies {
implementation(project(":evervault-core"))
implementation("androidx.core:core-ktx:1.8.0")
Expand Down
271 changes: 271 additions & 0 deletions evervault-cages/gradle.lockfile

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions evervault-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
kotlin {
jvmToolchain(JavaVersion.VERSION_11.toString().toInt())
}
buildFeatures {
buildConfig = true
Expand All @@ -82,6 +82,11 @@ android {
}
}

dependencyLocking {
// Enable lock files for dependency versions.
lockAllConfigurations()
}

dependencies {
testImplementation("junit:junit:4.13.2")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2")
Expand All @@ -90,7 +95,10 @@ dependencies {
testImplementation("org.mockito.kotlin:mockito-kotlin:5.0.0")
testImplementation(kotlin("test"))

implementation(kotlin("stdlib-common"))
// 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).
// This resolves the issue where debugAndroidTestRuntimeClasspath isn't captured during lockfile generation.
implementation("org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21")

// ktor
implementation("io.ktor:ktor-client-core:2.3.1")
Expand Down
236 changes: 236 additions & 0 deletions evervault-core/gradle.lockfile

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions evervault-enclaves/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
kotlin {
jvmToolchain(JavaVersion.VERSION_11.toString().toInt())
}
buildFeatures {
compose = true
Expand All @@ -63,6 +63,11 @@ android {
}
}

dependencyLocking {
// Enable lock files for dependency versions.
lockAllConfigurations()
}

val kotlinVersion = "1.8.0"
val kotlinCoroutineVersion = "1.7.3"

Expand Down
271 changes: 271 additions & 0 deletions evervault-enclaves/gradle.lockfile

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions evervault-inputs/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
kotlin {
jvmToolchain(JavaVersion.VERSION_11.toString().toInt())
}
buildFeatures {
compose = true
Expand All @@ -66,6 +66,11 @@ android {
}
}

dependencyLocking {
// Enable lock files for dependency versions.
lockAllConfigurations()
}

val composeActivityVersion = "1.9.0"

dependencies {
Expand Down
329 changes: 329 additions & 0 deletions evervault-inputs/gradle.lockfile

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions sampleapplication/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
kotlin {
jvmToolchain(JavaVersion.VERSION_11.toString().toInt())
}
buildFeatures {
compose = true
Expand All @@ -77,6 +77,11 @@ android {
}
}

dependencyLocking {
// Enable lock files for dependency versions.
lockAllConfigurations()
}

dependencies {
implementation(project(":evervault-inputs"))
implementation(project(":evervault-enclaves"))
Expand All @@ -95,7 +100,7 @@ dependencies {
implementation("io.coil-kt:coil-compose:2.4.0")

// GSON converter
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
implementation("com.squareup.retrofit2:converter-gson:3.0.0")
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.5.1")

testImplementation("junit:junit:4.13.2")
Expand All @@ -104,6 +109,9 @@ dependencies {
androidTestImplementation(platform("androidx.compose:compose-bom:2022.10.00"))
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.0.21).
androidTestImplementation("org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
}
381 changes: 381 additions & 0 deletions sampleapplication/gradle.lockfile

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions tools/update-lockfiles.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash
set -e

PROJECTS=("evervault-core" "evervault-cages" "evervault-enclaves" "evervault-inputs" "sampleapplication")

# Update lockfiles for all projects
for PROJECT in "${PROJECTS[@]}"
do
./gradlew "$PROJECT:dependencies" --write-locks
done
Loading