iotishnik/narodmon-app
2
1
Fork 0
Code Issues 8 Pull requests 1 Projects 1 Releases Packages Activity

Merge branch 'master' into dc09-sensors

Browse source
This commit is contained in:
Даниил 2023-06-05 22:34:28 +04:00
commit e384ffdf6c
Signed by: nm17
GPG key ID: 3303B70C59145CD4
20 changed files with 460 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/build.gradle.kts
View file

@ -1,4 +1,3 @@
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
plugins {
alias(libs.plugins.androidApplication)
@ -7,6 +6,7 @@ plugins {
kotlin("plugin.serialization") version "1.8.21"
}
android {
namespace = "ru.nm17.narodmon"
compileSdk = 33
@ -27,7 +27,10 @@ android {
buildTypes {
release {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
@ -62,6 +65,7 @@ dependencies {
implementation(libs.material3)
implementation(libs.androidx.datastore.core.android)
implementation(libs.androidx.room.common)
implementation(libs.androidx.security.crypto.ktx)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.test.ext.junit)
androidTestImplementation(libs.espresso.core)
@ -119,11 +123,32 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
// Ktor
val ktor_version = "2.3.1"
implementation("io.ktor:ktor-client-core:$ktor_version")
implementation("io.ktor:ktor-client-cio:$ktor_version")
implementation(platform("dev.forkhandles:forkhandles-bom:2.6.0.0"))
implementation("dev.forkhandles:result4k")
implementation("io.ktor:ktor-client-core:2.3.1")
implementation("io.ktor:ktor-client-okhttp:2.3.1")
implementation("androidx.security:security-crypto-ktx:1.1.0-alpha06")
// For Identity Credential APIs
implementation("androidx.security:security-identity-credential:1.0.0-alpha03")
// For App Authentication APIs
implementation("androidx.security:security-app-authenticator:1.0.0-alpha02")
// For App Authentication API testing
androidTestImplementation("androidx.security:security-app-authenticator:1.0.0-alpha01")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
// Map Compose library
implementation("ovh.plrapps:mapcompose:2.7.1")
}