Skip to content

Commit 451b536

Browse files
committed
Upgrade dependencies
1 parent 14dbf90 commit 451b536

File tree

3 files changed

+14
-20
lines changed

3 files changed

+14
-20
lines changed

uhabits-android/build.gradle.kts

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919

2020
plugins {
21-
id("com.github.triplet.play") version "3.8.6"
2221
id("com.android.application") version "8.8.0"
2322
id("org.jetbrains.kotlin.android")
2423
id("org.jetbrains.kotlin.kapt")
@@ -100,10 +99,10 @@ android {
10099

101100
dependencies {
102101
val daggerVersion = "2.51.1"
103-
val kotlinVersion = "1.9.22"
104-
val kxCoroutinesVersion = "1.7.3"
102+
val kotlinVersion = "2.1.10"
103+
val kxCoroutinesVersion = "1.10.1"
105104
val ktorVersion = "1.6.8"
106-
val espressoVersion = "3.5.1"
105+
val espressoVersion = "3.6.1"
107106

108107
androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
109108
androidTestImplementation("androidx.test.espresso:espresso-core:$espressoVersion")
@@ -112,12 +111,12 @@ dependencies {
112111
androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion")
113112
androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion")
114113
androidTestImplementation("androidx.annotation:annotation:1.7.1")
115-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
116-
androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
117-
androidTestImplementation("androidx.test:rules:1.5.0")
118-
androidTestImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
114+
androidTestImplementation("androidx.test.ext:junit:1.2.1")
115+
androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
116+
androidTestImplementation("androidx.test:rules:1.6.1")
117+
androidTestImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
119118
compileOnly("javax.annotation:jsr250-api:1.0")
120-
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
119+
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
121120
implementation("com.github.AppIntro:AppIntro:6.3.1")
122121
implementation("com.google.code.findbugs:jsr305:3.0.2")
123122
implementation("com.google.dagger:dagger:$daggerVersion")
@@ -129,25 +128,20 @@ dependencies {
129128
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
130129
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kxCoroutinesVersion")
131130
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kxCoroutinesVersion")
132-
implementation("androidx.appcompat:appcompat:1.6.1")
131+
implementation("androidx.appcompat:appcompat:1.7.0")
133132
implementation("androidx.legacy:legacy-preference-v14:1.0.0")
134133
implementation("androidx.legacy:legacy-support-v4:1.0.0")
135-
implementation("com.google.android.material:material:1.11.0")
134+
implementation("com.google.android.material:material:1.12.0")
136135
implementation("com.opencsv:opencsv:5.9")
137136
implementation("nl.dionsegijn:konfetti-xml:2.0.2")
138137
implementation(project(":uhabits-core"))
139138
kapt("com.google.dagger:dagger-compiler:$daggerVersion")
140139
kaptAndroidTest("com.google.dagger:dagger-compiler:$daggerVersion")
141140
testImplementation("com.google.dagger:dagger:$daggerVersion")
142141
testImplementation("junit:junit:4.13.2")
143-
testImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
142+
testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
144143
}
145144

146145
kapt {
147146
correctErrorTypes = true
148147
}
149-
150-
play {
151-
serviceAccountCredentials.set(file("../.secret/gcp-key.json"))
152-
track.set("alpha")
153-
}

uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ object CommonSteps : BaseUserInterfaceTest() {
132132
}
133133

134134
@Throws(Exception::class)
135-
fun verifyOpensWebsite(url: String?) {
135+
fun verifyOpensWebsite(url: String) {
136136
var browserPkg = "org.chromium.webview_shell"
137137
if (SDK_INT <= Build.VERSION_CODES.M) {
138138
browserPkg = "com.android.browser"

uhabits-core/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ kotlin {
4646
implementation(kotlin("stdlib-jdk8"))
4747
compileOnly("com.google.dagger:dagger:2.51.1")
4848
implementation("com.google.guava:guava:33.1.0-android")
49-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3")
49+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.1")
5050
implementation("androidx.annotation:annotation:1.7.1")
5151
implementation("com.google.code.findbugs:jsr305:3.0.2")
5252
implementation("com.opencsv:opencsv:5.9")
@@ -62,7 +62,7 @@ kotlin {
6262
implementation("org.xerial:sqlite-jdbc:3.45.1.0")
6363
implementation("org.hamcrest:hamcrest:2.2")
6464
implementation("org.apache.commons:commons-io:1.3.2")
65-
implementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
65+
implementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
6666
implementation("org.junit.jupiter:junit-jupiter:5.10.1")
6767
}
6868
}

0 commit comments

Comments
 (0)