zedfrigg/zanbur
1
0
Fork 0
Code Releases Activity Actions

Update runtime, dependencies and build script syntax

Browse source
This commit is contained in:
Reinout Meliesie 2025-12-04 16:59:48 +01:00
commit c261b06dcb
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
2 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

48
app/build.gradle.kts
View file

@ -1,6 +1,7 @@
import java.io.FileInputStream import java.io.FileInputStream
import java.util.Properties import java.util.Properties
import org.gradle.kotlin.dsl.android import org.gradle.kotlin.dsl.android
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@ -9,20 +10,20 @@ val keystoreProperties = Properties ()
keystoreProperties . load ( FileInputStream ( rootProject . file ("keystore.properties") ) ) keystoreProperties . load ( FileInputStream ( rootProject . file ("keystore.properties") ) )
plugins { plugins {
id ("com.android.application") . version ("8.8.1") id ("com.android.application") . version ("8.13.1")
id ("org.jetbrains.kotlin.android") . version ("2.1.10") id ("org.jetbrains.kotlin.android") . version ("2.2.21")
id ("org.jetbrains.kotlin.plugin.compose") . version ("2.1.10") id ("org.jetbrains.kotlin.plugin.compose") . version ("2.2.21")
id ("org.jetbrains.kotlin.plugin.serialization") . version ("2.1.10") id ("org.jetbrains.kotlin.plugin.serialization") . version ("2.2.21")
} }
android { android {
namespace = "com.kernelmaft.zanbur" namespace = "com.kernelmaft.zanbur"
compileSdk = 35 compileSdk = 36
defaultConfig { defaultConfig {
applicationId = "com.kernelmaft.zanbur" applicationId = "com.kernelmaft.zanbur"
minSdk = 35 minSdk = 36
targetSdk = 35 targetSdk = 36
versionCode = 1 versionCode = 1
versionName = "1.0" 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 // Required even though we don't have any Java sources because it needs to match Kotlin's JVM version
targetCompatibility = JavaVersion . VERSION_23 targetCompatibility = JavaVersion . VERSION_23
} }
kotlinOptions {
jvmTarget = "23"
}
buildFeatures { buildFeatures {
compose = true compose = true
} }
} }
kotlin {
compilerOptions {
jvmTarget = JvmTarget . JVM_23
}
}
dependencies { dependencies {
// Android runtime libraries // Android runtime libraries
implementation ( "com.google.android.material" , "material" , "1.12.0" ) implementation ( "com.google.android.material:material:1.13.0" )
implementation ( "androidx.activity" , "activity-compose" , "1.10.0" ) implementation ( "androidx.activity:activity-compose:1.12.1" )
implementation ( "androidx.core" , "core-ktx" , "1.15.0" ) implementation ( "androidx.core:core-ktx:1.17.0" )
implementation ( "androidx.compose.material3" , "material3" , "1.3.1" ) implementation ( "androidx.compose.material3:material3:1.4.0" )
implementation ( "androidx.compose.ui" , "ui" , "1.7.8" ) implementation ( "androidx.compose.ui:ui:1.10.0" )
implementation ( "androidx.compose.ui" , "ui-graphics" , "1.7.8" ) implementation ( "androidx.compose.ui:ui-graphics:1.10.0" )
debugImplementation ( "androidx.compose.ui" , "ui-tooling" , "1.7.8" ) debugImplementation ( "androidx.compose.ui:ui-tooling:1.10.0" )
implementation ( "androidx.lifecycle" , "lifecycle-runtime-ktx" , "2.8.7" ) implementation ( "androidx.lifecycle:lifecycle-runtime-ktx:2.10.0" )
implementation ( "org.jetbrains.kotlinx" , "kotlinx-coroutines-android" , "1.10.1" ) implementation ( "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" )
implementation ( "org.jetbrains.kotlinx" , "kotlinx-serialization-json" , "1.8.0" ) implementation ( "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0" )
// Other libraries // Other libraries
implementation ( "io.github.davidepianca98" , "kmqtt-common" , "1.0.0" ) implementation ( "io.github.davidepianca98:kmqtt-common:1.0.0" )
implementation ( "io.github.davidepianca98" , "kmqtt-client" , "1.0.0" ) implementation ( "io.github.davidepianca98:kmqtt-client:1.0.0" )
} }
tasks . withType ( KotlinCompile :: class ) . all { tasks . withType ( KotlinCompile :: class ) . all {

8
settings.gradle.kts
View file

@ -1,12 +1,6 @@
pluginManagement { pluginManagement {
repositories { repositories {
google { google ()
content {
includeGroupByRegex ("com\\.android.*")
includeGroupByRegex ("com\\.google.*")
includeGroupByRegex ("androidx.*")
}
}
mavenCentral () mavenCentral ()
gradlePluginPortal () gradlePluginPortal ()
} }