From 42ac00a2e0fc49e4afd243b641ad619adf5ddb8c Mon Sep 17 00:00:00 2001 From: Nikolai Kotchetkov Date: Fri, 30 Dec 2022 10:30:07 +0000 Subject: [PATCH] Library updates --- .gitpod.yml | 7 ++----- .idea/kotlinc.xml | 2 +- build.gradle | 6 +++--- gradle/libs.versions.toml | 16 ++++++++-------- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 6f1e5ac..3971242 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,11 +2,8 @@ image: file: .gitpod.Dockerfile tasks: - - before: | - export GRADLE_USER_HOME="/workspace/.gradle" - export M2_HOME="/workspace/.m2" - - init: | - ./gradlew build + - before: export GRADLE_USER_HOME="/workspace/.gradle"; export M2_HOME="/workspace/.m2"; export KONAN_DATA_DIR="workspace/.konan" + - init: git fetch --tags && ./gradlew runUnitTests :lce:assemble :welcome:assemble jetbrains: intellij: diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index b1077fb..e1eea1d 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5e44ddd..ff52fa6 100644 --- a/build.gradle +++ b/build.gradle @@ -35,10 +35,10 @@ allprojects { ext { versionCode = buildVersionCode() versionName = buildVersionName() - androidBuildToolsVersion = '32.0.0' + androidBuildToolsVersion = '33.0.0' androidMinSdkVersion = 24 - androidTargetSdkVersion = 32 - androidCompileSdkVersion = 32 + androidTargetSdkVersion = 33 + androidCompileSdkVersion = 33 developerId = 'motorro' developerName = 'Nikolai Kotchetkov' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ca13c56..0c96559 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] -kotlin = "1.7.10" +kotlin = "1.7.20" coroutines = "1.6.4" -compose = "1.2.1" -compose_compiler = "1.3.0" -hilt = "2.42" +compose = "1.3.1" +compose_compiler = "1.3.2" +hilt = "2.44" [plugins] android_app = { id = "com.android.application", version = "7.3.0" } @@ -24,10 +24,10 @@ kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines desugaring = { module = "com.android.tools:desugar_jdk_libs", version = "1.1.5" } -androidx-core = { module = "androidx.core:core-ktx", version = "1.7.0" } -androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version = "2.4.1" } -androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version = "2.4.1" } -androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.4.1" } +androidx-core = { module = "androidx.core:core-ktx", version = "1.9.0" } +androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version = "2.5.1" } +androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version = "2.5.1" } +androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.5.1" } compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" } compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }