initial dependency updates
This commit is contained in:
parent
fbfaf9be00
commit
808a80f2ba
2 changed files with 62 additions and 23 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
import com.android.build.gradle.internal.api.BaseVariantOutputImpl
|
||||||
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
|
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
|
||||||
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
|
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
|
||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
@ -7,13 +8,24 @@ plugins {
|
||||||
alias(libs.plugins.androidApplication)
|
alias(libs.plugins.androidApplication)
|
||||||
alias(libs.plugins.jetbrainsCompose)
|
alias(libs.plugins.jetbrainsCompose)
|
||||||
alias(libs.plugins.compose.compiler)
|
alias(libs.plugins.compose.compiler)
|
||||||
|
alias(libs.plugins.ksp)
|
||||||
|
alias(libs.plugins.kotlinSerialization)
|
||||||
|
alias(libs.plugins.sqldelight)
|
||||||
|
}
|
||||||
|
|
||||||
|
sqldelight {
|
||||||
|
databases {
|
||||||
|
create("Database") {
|
||||||
|
packageName.set(libs.versions.app.versionID.get())
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
androidTarget {
|
androidTarget {
|
||||||
@OptIn(ExperimentalKotlinGradlePluginApi::class)
|
@OptIn(ExperimentalKotlinGradlePluginApi::class)
|
||||||
compilerOptions {
|
compilerOptions {
|
||||||
jvmTarget.set(JvmTarget.JVM_11)
|
jvmTarget.set(JvmTarget.valueOf(libs.versions.android.kotlinJVMTarget.get()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,7 +64,7 @@ kotlin {
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "org.yrovas.finance"
|
namespace = libs.versions.app.versionID.get()
|
||||||
compileSdk = libs.versions.android.compileSdk.get().toInt()
|
compileSdk = libs.versions.android.compileSdk.get().toInt()
|
||||||
|
|
||||||
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
|
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
|
||||||
|
@ -60,32 +72,43 @@ android {
|
||||||
sourceSets["main"].resources.srcDirs("src/commonMain/resources")
|
sourceSets["main"].resources.srcDirs("src/commonMain/resources")
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId = "org.yrovas.finance"
|
applicationId = libs.versions.app.versionID.get()
|
||||||
minSdk = libs.versions.android.minSdk.get().toInt()
|
minSdk = libs.versions.android.minSdk.get().toInt()
|
||||||
targetSdk = libs.versions.android.targetSdk.get().toInt()
|
targetSdk = libs.versions.android.targetSdk.get().toInt()
|
||||||
versionCode = 1
|
versionCode = libs.versions.app.versionCode.get().toInt()
|
||||||
versionName = "1.0"
|
versionName = libs.versions.app.versionName.get()
|
||||||
}
|
|
||||||
packaging {
|
|
||||||
resources {
|
|
||||||
excludes += "/META-INF/{AL2.0,LGPL2.1}"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
|
||||||
buildTypes {
|
buildTypes {
|
||||||
getByName("release") {
|
// getByName("release") {
|
||||||
isMinifyEnabled = false
|
// isMinifyEnabled = false
|
||||||
|
// }
|
||||||
|
|
||||||
|
release {
|
||||||
|
isMinifyEnabled = true
|
||||||
|
isShrinkResources = true
|
||||||
|
proguardFiles(
|
||||||
|
getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility = JavaVersion.VERSION_11
|
val javaVersion = JavaVersion.valueOf(libs.versions.app.javaVersion.get())
|
||||||
targetCompatibility = JavaVersion.VERSION_11
|
sourceCompatibility = javaVersion
|
||||||
}
|
targetCompatibility = javaVersion
|
||||||
buildFeatures {
|
|
||||||
compose = true
|
|
||||||
}
|
}
|
||||||
|
buildFeatures { compose = true }
|
||||||
dependencies {
|
dependencies {
|
||||||
debugImplementation(compose.uiTooling)
|
debugImplementation(compose.uiTooling)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//applicationVariants.all { variant ->
|
||||||
|
//variant.outputs.all {
|
||||||
|
//(this as BaseVariantOutputImpl).outputFileName =
|
||||||
|
//"app-${variant.productFlavors[0].name}-${variant.buildType.name}-${variant.versionName}.apk"
|
||||||
|
//}
|
||||||
|
//true
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
compose.desktop {
|
compose.desktop {
|
||||||
|
@ -94,8 +117,8 @@ compose.desktop {
|
||||||
|
|
||||||
nativeDistributions {
|
nativeDistributions {
|
||||||
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
|
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
|
||||||
packageName = "org.yrovas.finance"
|
packageName = libs.versions.app.versionID.get()
|
||||||
packageVersion = "1.0.0"
|
packageVersion = libs.versions.app.versionName.get()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,17 @@
|
||||||
[versions]
|
[versions]
|
||||||
agp = "8.2.0"
|
app-versionID = "org.yrovas.finance"
|
||||||
|
app-versionCode = "1"
|
||||||
|
app-versionName = "1.0.0"
|
||||||
|
app-javaVersion = "VERSION_19"
|
||||||
|
|
||||||
|
android-kotlinJVMTarget = "JVM_19"
|
||||||
android-compileSdk = "34"
|
android-compileSdk = "34"
|
||||||
android-minSdk = "24"
|
|
||||||
android-targetSdk = "34"
|
android-targetSdk = "34"
|
||||||
|
android-minSdk = "24"
|
||||||
|
|
||||||
|
agp = "8.3.2"
|
||||||
androidx-activityCompose = "1.9.0"
|
androidx-activityCompose = "1.9.0"
|
||||||
androidx-appcompat = "1.6.1"
|
androidx-appcompat = "1.7.0"
|
||||||
androidx-constraintlayout = "2.1.4"
|
androidx-constraintlayout = "2.1.4"
|
||||||
androidx-core-ktx = "1.13.1"
|
androidx-core-ktx = "1.13.1"
|
||||||
androidx-espresso-core = "3.5.1"
|
androidx-espresso-core = "3.5.1"
|
||||||
|
@ -13,6 +20,11 @@ androidx-test-junit = "1.1.5"
|
||||||
compose-plugin = "1.6.10"
|
compose-plugin = "1.6.10"
|
||||||
junit = "4.13.2"
|
junit = "4.13.2"
|
||||||
kotlin = "2.0.0"
|
kotlin = "2.0.0"
|
||||||
|
sqldelight = "2.0.2"
|
||||||
|
# ktor = "2.3.10"
|
||||||
|
kotlinxDatetime = "0.5.0"
|
||||||
|
ksp = "2.0.0-1.0.22"
|
||||||
|
kotlinxSerializationJson = "1.6.3"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
|
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
|
||||||
|
@ -25,6 +37,7 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
|
||||||
androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
|
androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
|
||||||
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
|
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
|
||||||
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
|
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
|
||||||
|
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
|
||||||
|
|
||||||
[plugins]
|
[plugins]
|
||||||
androidApplication = { id = "com.android.application", version.ref = "agp" }
|
androidApplication = { id = "com.android.application", version.ref = "agp" }
|
||||||
|
@ -32,3 +45,6 @@ androidLibrary = { id = "com.android.library", version.ref = "agp" }
|
||||||
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
|
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
|
||||||
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
||||||
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
|
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
|
||||||
|
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
|
||||||
|
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
|
||||||
|
sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue