Update runtime, dependencies and build script syntax
This commit is contained in:
parent
6749f0f09f
commit
c261b06dcb
2 changed files with 27 additions and 29 deletions
|
|
@ -1,6 +1,7 @@
|
|||
import java.io.FileInputStream
|
||||
import java.util.Properties
|
||||
import org.gradle.kotlin.dsl.android
|
||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
|
||||
|
||||
|
|
@ -9,20 +10,20 @@ val keystoreProperties = Properties ()
|
|||
keystoreProperties . load ( FileInputStream ( rootProject . file ("keystore.properties") ) )
|
||||
|
||||
plugins {
|
||||
id ("com.android.application") . version ("8.8.1")
|
||||
id ("org.jetbrains.kotlin.android") . version ("2.1.10")
|
||||
id ("org.jetbrains.kotlin.plugin.compose") . version ("2.1.10")
|
||||
id ("org.jetbrains.kotlin.plugin.serialization") . version ("2.1.10")
|
||||
id ("com.android.application") . version ("8.13.1")
|
||||
id ("org.jetbrains.kotlin.android") . version ("2.2.21")
|
||||
id ("org.jetbrains.kotlin.plugin.compose") . version ("2.2.21")
|
||||
id ("org.jetbrains.kotlin.plugin.serialization") . version ("2.2.21")
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "com.kernelmaft.zanbur"
|
||||
compileSdk = 35
|
||||
compileSdk = 36
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "com.kernelmaft.zanbur"
|
||||
minSdk = 35
|
||||
targetSdk = 35
|
||||
minSdk = 36
|
||||
targetSdk = 36
|
||||
versionCode = 1
|
||||
versionName = "1.0"
|
||||
}
|
||||
|
|
@ -50,29 +51,32 @@ android {
|
|||
// Required even though we don't have any Java sources because it needs to match Kotlin's JVM version
|
||||
targetCompatibility = JavaVersion . VERSION_23
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = "23"
|
||||
}
|
||||
buildFeatures {
|
||||
compose = true
|
||||
}
|
||||
}
|
||||
|
||||
kotlin {
|
||||
compilerOptions {
|
||||
jvmTarget = JvmTarget . JVM_23
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// Android runtime libraries
|
||||
implementation ( "com.google.android.material" , "material" , "1.12.0" )
|
||||
implementation ( "androidx.activity" , "activity-compose" , "1.10.0" )
|
||||
implementation ( "androidx.core" , "core-ktx" , "1.15.0" )
|
||||
implementation ( "androidx.compose.material3" , "material3" , "1.3.1" )
|
||||
implementation ( "androidx.compose.ui" , "ui" , "1.7.8" )
|
||||
implementation ( "androidx.compose.ui" , "ui-graphics" , "1.7.8" )
|
||||
debugImplementation ( "androidx.compose.ui" , "ui-tooling" , "1.7.8" )
|
||||
implementation ( "androidx.lifecycle" , "lifecycle-runtime-ktx" , "2.8.7" )
|
||||
implementation ( "org.jetbrains.kotlinx" , "kotlinx-coroutines-android" , "1.10.1" )
|
||||
implementation ( "org.jetbrains.kotlinx" , "kotlinx-serialization-json" , "1.8.0" )
|
||||
implementation ( "com.google.android.material:material:1.13.0" )
|
||||
implementation ( "androidx.activity:activity-compose:1.12.1" )
|
||||
implementation ( "androidx.core:core-ktx:1.17.0" )
|
||||
implementation ( "androidx.compose.material3:material3:1.4.0" )
|
||||
implementation ( "androidx.compose.ui:ui:1.10.0" )
|
||||
implementation ( "androidx.compose.ui:ui-graphics:1.10.0" )
|
||||
debugImplementation ( "androidx.compose.ui:ui-tooling:1.10.0" )
|
||||
implementation ( "androidx.lifecycle:lifecycle-runtime-ktx:2.10.0" )
|
||||
implementation ( "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" )
|
||||
implementation ( "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0" )
|
||||
// Other libraries
|
||||
implementation ( "io.github.davidepianca98" , "kmqtt-common" , "1.0.0" )
|
||||
implementation ( "io.github.davidepianca98" , "kmqtt-client" , "1.0.0" )
|
||||
implementation ( "io.github.davidepianca98:kmqtt-common:1.0.0" )
|
||||
implementation ( "io.github.davidepianca98:kmqtt-client:1.0.0" )
|
||||
}
|
||||
|
||||
tasks . withType ( KotlinCompile :: class ) . all {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,6 @@
|
|||
pluginManagement {
|
||||
repositories {
|
||||
google {
|
||||
content {
|
||||
includeGroupByRegex ("com\\.android.*")
|
||||
includeGroupByRegex ("com\\.google.*")
|
||||
includeGroupByRegex ("androidx.*")
|
||||
}
|
||||
}
|
||||
google ()
|
||||
mavenCentral ()
|
||||
gradlePluginPortal ()
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue