diff --git a/build.gradle.kts b/build.gradle.kts index ce0129a2f..3a3435b0c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { id("org.jetbrains.kotlin.kapt") version kotlinVersion apply (false) id("org.jetbrains.kotlin.android.extensions") version kotlinVersion apply (false) id("org.jetbrains.kotlin.multiplatform") version kotlinVersion apply (false) - id("org.jlleitschuh.gradle.ktlint") version "10.2.1" + id("org.jlleitschuh.gradle.ktlint") version "10.3.0" } apply { diff --git a/docs/BUILD.md b/docs/BUILD.md index fd18f687b..ad0d93d1c 100644 --- a/docs/BUILD.md +++ b/docs/BUILD.md @@ -33,7 +33,7 @@ The repository will be downloaded to the directory `uhabits`. 2. When the IDE asks you for the project location, select `uhabits` and click "Ok". 3. Android Studio will spend some time indexing the project. When this is complete, click the toolbar icon "Sync Project with Gradle File", located near the right corner of the top toolbar. 4. The operation will likely fail several times due to missing Android SDK components. Each time it fails, click the link "Install missing platforms", "Install build tools", etc, and try again. -5. To test the application, create a virtual Android device using the menu "Tools" and "AVD Manager". The default options should work fine, but free to customize the device. +5. To test the application, create a virtual Android device using the menu "Tools" and "AVD Manager". The default options should work fine, but feel free to customize the device. 6. Click the menu "Run" and "uhabits-android". The application should launch. diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts index 2849d9df7..b5977679d 100644 --- a/uhabits-android/build.gradle.kts +++ b/uhabits-android/build.gradle.kts @@ -86,9 +86,9 @@ android { } dependencies { - val daggerVersion = "2.41" - val kotlinVersion = "1.6.21" - val kxCoroutinesVersion = "1.6.1" + val daggerVersion = "2.42" + val kotlinVersion = "1.7.0" + val kxCoroutinesVersion = "1.6.3" val ktorVersion = "1.6.8" val espressoVersion = "3.4.0" @@ -98,7 +98,7 @@ dependencies { androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.1") androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion") androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion") - androidTestImplementation("androidx.annotation:annotation:1.3.0") + androidTestImplementation("androidx.annotation:annotation:1.4.0") androidTestImplementation("androidx.test.ext:junit:1.1.3") androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0") androidTestImplementation("androidx.test:rules:1.4.0") @@ -116,10 +116,10 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kxCoroutinesVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kxCoroutinesVersion") - implementation("androidx.appcompat:appcompat:1.4.1") + implementation("androidx.appcompat:appcompat:1.4.2") 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.5.0") + implementation("com.google.android.material:material:1.6.1") implementation("com.opencsv:opencsv:5.6") implementation(project(":uhabits-core")) kapt("com.google.dagger:dagger-compiler:$daggerVersion") diff --git a/uhabits-core/build.gradle.kts b/uhabits-core/build.gradle.kts index d7335a596..77607d138 100644 --- a/uhabits-core/build.gradle.kts +++ b/uhabits-core/build.gradle.kts @@ -43,11 +43,11 @@ kotlin { val jvmMain by getting { dependencies { implementation(kotlin("stdlib-jdk8")) - compileOnly("com.google.dagger:dagger:2.41") + compileOnly("com.google.dagger:dagger:2.42") implementation("com.google.guava:guava:31.1-android") - implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1") - implementation("androidx.annotation:annotation:1.3.0") + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.3") + implementation("androidx.annotation:annotation:1.4.0") implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.opencsv:opencsv:5.6") implementation("commons-codec:commons-codec:1.15") diff --git a/uhabits-server/build.gradle.kts b/uhabits-server/build.gradle.kts index c41221430..dbc6bca1f 100644 --- a/uhabits-server/build.gradle.kts +++ b/uhabits-server/build.gradle.kts @@ -34,7 +34,7 @@ application { dependencies { val ktorVersion = "1.6.8" - val kotlinVersion = "1.6.21" + val kotlinVersion = "1.7.0" val logbackVersion = "1.2.11" implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion") implementation("io.ktor:ktor-server-netty:$ktorVersion") @@ -43,9 +43,9 @@ dependencies { implementation("io.ktor:ktor-html-builder:$ktorVersion") implementation("io.ktor:ktor-jackson:$ktorVersion") implementation("org.jetbrains:kotlin-css-jvm:1.0.0-pre.148-kotlin-1.4.30") - implementation("io.prometheus:simpleclient:0.15.0") - implementation("io.prometheus:simpleclient_httpserver:0.15.0") - implementation("io.prometheus:simpleclient_hotspot:0.15.0") + implementation("io.prometheus:simpleclient:0.16.0") + implementation("io.prometheus:simpleclient_httpserver:0.16.0") + implementation("io.prometheus:simpleclient_hotspot:0.16.0") testImplementation("io.ktor:ktor-server-tests:$ktorVersion") testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") testImplementation(kotlin("test"))