Skip to content

Commit

Permalink
Dependencies updated (#226)
Browse files Browse the repository at this point in the history
  • Loading branch information
alisen committed Oct 22, 2023
1 parent 67173fe commit c4a11a4
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 19 deletions.
12 changes: 6 additions & 6 deletions zeapp/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,13 @@ dependencies {
debugImplementation(libs.androidx.compose.ui.tooling)
debugImplementation(libs.androidx.compose.ui.test.manifest)

testImplementation(libs.test.assertk)
testImplementation(libs.test.junit)
testImplementation(libs.test.mockk)
testImplementation(libs.test.coroutines)
testImplementation(libs.testAssertk)
testImplementation(libs.testJunit4)
testImplementation(libs.testMockk)
testImplementation(libs.testCoroutines)

androidTestImplementation(libs.test.compose.junit)
debugImplementation(libs.test.compose.manifest)
androidTestImplementation(libs.testComposeJunit)
debugImplementation(libs.testComposeManifest)
kapt(libs.dagger.hilt.compiler)
baselineProfile(project(":benchmark"))
}
Expand Down
4 changes: 2 additions & 2 deletions zeapp/badge/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ kotlin {

val commonTest by getting {
dependencies {
implementation(libs.test.junit)
implementation(libs.test.assertk)
implementation(libs.testJunit4)
implementation(libs.testAssertk)
}
}

Expand Down
27 changes: 16 additions & 11 deletions zeapp/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,20 @@ license-report-gradle = { id = "com.jaredsburrows.license", version.ref = "licen

android-gradle-plugin = "8.1.2"
androidx-activity = "1.8.0"
androidx-compose-bom = "2023.10.00"
androidx-compose-bom = "2023.10.01"
androidx-compose-compiler = "1.5.3"
androidx-core = "1.12.0"
androidx-datastore = "1.0.0"
androidx-lifecycle = "2.6.2"
androidx-test-ext-junit = "1.1.5"
appcompat = "1.6.1"
benchmark = "1.2.0-alpha16"
benchmarkMacroJunit4 = "1.2.0-rc02"
benchmark = "1.2.0"
benchmarkMacroJunit4 = "1.2.0"
core-ktx = "1.12.0"
dagger-hilt = "2.48.1"
detekt-gradle = "1.23.1"
espresso-core = "3.5.1"
jSerialComm = "2.10.3"
junit = "4.13.2"
kotlin = "1.9.10"
kotlinx-coroutines-core = "1.7.3"
ktlint-gradle = "11.6.1"
Expand All @@ -42,6 +41,12 @@ retrofit = "2.9.0"
timber = "5.0.1"
uiautomator = "2.2.0"
zxing ="3.5.2"
assertk = "0.27.0"
junit4 = "4.13.2"
junit4-ui = "1.5.4"
uiTestManifest = "1.5.4"
mockk = "1.13.8"
kotlinxCoroutinesTest = "1.7.3"

[libraries]

Expand All @@ -67,7 +72,7 @@ dagger-hilt = { module = "com.google.dagger:hilt-android", version.ref = "dagger
dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger-hilt" }
espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
jSerialComm = { module = "com.fazecast:jSerialComm", version.ref = "jSerialComm" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
junit = { group = "junit", name = "junit", version.ref = "junit4" }
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" }
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
material3-wsc = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "material3-wsc"}
Expand All @@ -77,9 +82,9 @@ retrofit2-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref =
timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
zxing = { module = "com.google.zxing:core", version.ref = "zxing" }

test-assertk = "com.willowtreeapps.assertk:assertk-jvm:0.27.0"
test-junit = "junit:junit:4.13.2"
test-compose-junit = "androidx.compose.ui:ui-test-junit4:1.5.3"
test-compose-manifest = "androidx.compose.ui:ui-test-manifest:1.5.3"
test-mockk = "io.mockk:mockk:1.13.7"
test-coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"
testAssertk = { module = "com.willowtreeapps.assertk:assertk-jvm", version.ref = "assertk" }
testJunit4 = { module = "junit:junit", version.ref = "junit4" }
testMockk = { module = "io.mockk:mockk", version.ref = "mockk" }
testComposeJunit = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "junit4-ui" }
testComposeManifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "uiTestManifest" }
testCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }

0 comments on commit c4a11a4

Please sign in to comment.