isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into rm_dep

Browse Source
pull/1791/head
Quentin Hibon 2 years ago committed by GitHub
parent 3ea5224825 b2fc79a3ab
commit 8751eb4143
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File

1
.github/dependabot.yml vendored
Unescape View File

@ -4,6 +4,7 @@ updates:
directory: "/"
schedule:
interval: "monthly"
open-pull-requests-limit: 10
- package-ecosystem: "github-actions"
directory: "/"
schedule:

2
build.gradle.kts
Unescape View File

@ -4,7 +4,7 @@ plugins {
id("org.jetbrains.kotlin.android") version kotlinVersion apply (false)
id("org.jetbrains.kotlin.kapt") version kotlinVersion apply (false)
id("org.jetbrains.kotlin.multiplatform") version kotlinVersion apply (false)
id("org.jlleitschuh.gradle.ktlint") version "11.4.2"
id("org.jlleitschuh.gradle.ktlint") version "11.5.1"
}
apply {

18
uhabits-android/build.gradle.kts
Unescape View File

@ -18,7 +18,7 @@
*/
plugins {
id("com.github.triplet.play") version "3.7.0"
id("com.github.triplet.play") version "3.8.4"
id("com.android.application") version "7.4.2"
id("org.jetbrains.kotlin.android")
id("org.jetbrains.kotlin.kapt")
@ -79,9 +79,9 @@ android {
}
dependencies {
val daggerVersion = "2.46"
val daggerVersion = "2.47"
val kotlinVersion = "1.7.21"
val kxCoroutinesVersion = "1.6.4"
val kxCoroutinesVersion = "1.7.3"
val ktorVersion = "1.6.8"
val espressoVersion = "3.5.1"
@ -91,17 +91,17 @@ dependencies {
androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.3")
androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion")
androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion")
androidTestImplementation("androidx.annotation:annotation:1.5.0")
androidTestImplementation("androidx.annotation:annotation:1.6.0")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
androidTestImplementation("androidx.test:rules:1.5.0")
androidTestImplementation("org.mockito.kotlin:mockito-kotlin:2.2.11")
androidTestImplementation("org.mockito.kotlin:mockito-kotlin:4.1.0")
compileOnly("javax.annotation:jsr250-api:1.0")
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
implementation("com.github.AppIntro:AppIntro:6.2.0")
implementation("com.google.code.findbugs:jsr305:3.0.2")
implementation("com.google.dagger:dagger:$daggerVersion")
implementation("com.google.guava:guava:31.1-android")
implementation("com.google.guava:guava:32.1.2-android")
implementation("io.ktor:ktor-client-android:$ktorVersion")
implementation("io.ktor:ktor-client-core:$ktorVersion")
implementation("io.ktor:ktor-client-jackson:$ktorVersion")
@ -112,14 +112,14 @@ dependencies {
implementation("androidx.appcompat:appcompat:1.5.1")
implementation("androidx.legacy:legacy-preference-v14:1.0.0")
implementation("androidx.legacy:legacy-support-v4:1.0.0")
implementation("com.google.android.material:material:1.8.0")
implementation("com.opencsv:opencsv:5.7.1")
implementation("com.google.android.material:material:1.9.0")
implementation("com.opencsv:opencsv:5.8")
implementation(project(":uhabits-core"))
kapt("com.google.dagger:dagger-compiler:$daggerVersion")
kaptAndroidTest("com.google.dagger:dagger-compiler:$daggerVersion")
testImplementation("com.google.dagger:dagger:$daggerVersion")
testImplementation("junit:junit:4.13.2")
testImplementation("org.mockito.kotlin:mockito-kotlin:2.2.11")
testImplementation("org.mockito.kotlin:mockito-kotlin:4.1.0")
}
kapt {

20
uhabits-core/build.gradle.kts
Unescape View File

@ -43,25 +43,25 @@ kotlin {
val jvmMain by getting {
dependencies {
implementation(kotlin("stdlib-jdk8"))
compileOnly("com.google.dagger:dagger:2.46")
implementation("com.google.guava:guava:31.1-android")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4")
implementation("androidx.annotation:annotation:1.5.0")
compileOnly("com.google.dagger:dagger:2.47")
implementation("com.google.guava:guava:32.1.2-android")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3")
implementation("androidx.annotation:annotation:1.6.0")
implementation("com.google.code.findbugs:jsr305:3.0.2")
implementation("com.opencsv:opencsv:5.7.1")
implementation("commons-codec:commons-codec:1.15")
implementation("org.apache.commons:commons-lang3:3.12.0")
implementation("com.opencsv:opencsv:5.8")
implementation("commons-codec:commons-codec:1.16.0")
implementation("org.apache.commons:commons-lang3:3.13.0")
}
}
val jvmTest by getting {
dependencies {
implementation(kotlin("test"))
implementation("org.xerial:sqlite-jdbc:3.40.0.0")
implementation("org.xerial:sqlite-jdbc:3.42.0.0")
implementation("org.hamcrest:hamcrest:2.2")
implementation("org.apache.commons:commons-io:1.3.2")
implementation("org.mockito.kotlin:mockito-kotlin:2.2.11")
implementation("org.junit.jupiter:junit-jupiter:5.8.1")
implementation("org.mockito.kotlin:mockito-kotlin:4.1.0")
implementation("org.junit.jupiter:junit-jupiter:5.10.0")
}
}
}

10
uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.kt
Unescape View File

@ -32,7 +32,7 @@ import org.junit.Test
import org.mockito.kotlin.mock
import org.mockito.kotlin.reset
import org.mockito.kotlin.verify
import org.mockito.kotlin.verifyZeroInteractions
import org.mockito.kotlin.verifyNoInteractions
import org.mockito.kotlin.whenever
class WidgetBehaviorTest : BaseUnitTest() {
@ -61,7 +61,7 @@ class WidgetBehaviorTest : BaseUnitTest() {
CreateRepetitionCommand(habitList, habit, today, Entry.YES_MANUAL, "")
)
verify(notificationTray).cancel(habit)
verifyZeroInteractions(preferences)
verifyNoInteractions(preferences)
}
@Test
@ -71,7 +71,7 @@ class WidgetBehaviorTest : BaseUnitTest() {
CreateRepetitionCommand(habitList, habit, today, Entry.NO, "")
)
verify(notificationTray).cancel(habit)
verifyZeroInteractions(preferences)
verifyNoInteractions(preferences)
}
@Test
@ -113,7 +113,7 @@ class WidgetBehaviorTest : BaseUnitTest() {
CreateRepetitionCommand(habitList, habit, today, 600, "")
)
verify(notificationTray).cancel(habit)
verifyZeroInteractions(preferences)
verifyNoInteractions(preferences)
}
@Test
@ -126,6 +126,6 @@ class WidgetBehaviorTest : BaseUnitTest() {
CreateRepetitionCommand(habitList, habit, today, 400, "")
)
verify(notificationTray).cancel(habit)
verifyZeroInteractions(preferences)
verifyNoInteractions(preferences)
}
}

2
uhabits-server/build.gradle.kts
Unescape View File

@ -35,7 +35,7 @@ application {
dependencies {
val ktorVersion = "1.6.8"
val kotlinVersion = "1.7.21"
val logbackVersion = "1.4.5"
val logbackVersion = "1.4.9"
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
implementation("io.ktor:ktor-server-netty:$ktorVersion")
implementation("ch.qos.logback:logback-classic:$logbackVersion")

Write Preview
Loading…
Cancel
Save