mirror of
https://github.com/greenart7c3/Amber.git
synced 2026-10-05 19:08:23 +00:00
update kotlin and ksp. fix gradle deprecation warnings
This commit is contained in:
Generated
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="KotlinJpsPluginSettings">
|
<component name="KotlinJpsPluginSettings">
|
||||||
<option name="version" value="2.0.0" />
|
<option name="version" value="2.0.10" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
+15
-8
@@ -15,27 +15,34 @@ tasks.register('installGitHook', Copy) {
|
|||||||
from new File(rootProject.rootDir, 'git-hooks/pre-commit')
|
from new File(rootProject.rootDir, 'git-hooks/pre-commit')
|
||||||
from new File(rootProject.rootDir, 'git-hooks/pre-push')
|
from new File(rootProject.rootDir, 'git-hooks/pre-push')
|
||||||
into { new File(rootProject.rootDir, '.git/hooks') }
|
into { new File(rootProject.rootDir, '.git/hooks') }
|
||||||
fileMode 0777
|
filePermissions {
|
||||||
|
unix(0b111_111_111)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.getByPath(':app:preBuild').dependsOn installGitHook
|
project(":app") {
|
||||||
|
tasks.matching { it.name == "preBuild" }.configureEach {
|
||||||
|
dependsOn(rootProject.tasks.named("installGitHook"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
subprojects {
|
subprojects {
|
||||||
tasks.withType(KotlinCompile).configureEach {
|
tasks.withType(KotlinCompile).configureEach {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
|
var buildDirPath = project.layout.buildDirectory.get().asFile.absolutePath
|
||||||
if (project.findProperty("composeCompilerReports") == "true") {
|
if (project.findProperty("composeCompilerReports") == "true") {
|
||||||
freeCompilerArgs += [
|
freeCompilerArgs += listOf(
|
||||||
"-P",
|
"-P",
|
||||||
"plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" +
|
"plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" +
|
||||||
project.buildDir.absolutePath + "/compose_compiler"
|
buildDirPath + "/compose_compiler"
|
||||||
]
|
)
|
||||||
}
|
}
|
||||||
if (project.findProperty("composeCompilerMetrics") == "true") {
|
if (project.findProperty("composeCompilerMetrics") == "true") {
|
||||||
freeCompilerArgs += [
|
freeCompilerArgs += listOf(
|
||||||
"-P",
|
"-P",
|
||||||
"plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" +
|
"plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" +
|
||||||
project.buildDir.absolutePath + "/compose_compiler"
|
buildDirPath + "/compose_compiler"
|
||||||
]
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,12 +24,12 @@ roomKtx = "2.6.1"
|
|||||||
securityCryptoKtx = "1.1.0-alpha06"
|
securityCryptoKtx = "1.1.0-alpha06"
|
||||||
zxingAndroidEmbedded = "4.3.0"
|
zxingAndroidEmbedded = "4.3.0"
|
||||||
okhttp = "5.0.0-alpha.14"
|
okhttp = "5.0.0-alpha.14"
|
||||||
kotlin = "2.0.0"
|
kotlin = "2.0.10"
|
||||||
workRuntimeKtx = "2.9.1"
|
workRuntimeKtx = "2.9.1"
|
||||||
agp = "8.5.2"
|
agp = "8.5.2"
|
||||||
ktlint = "12.1.1"
|
ktlint = "12.1.1"
|
||||||
gms = "4.4.2"
|
gms = "4.4.2"
|
||||||
ksp = "2.0.0-1.0.22"
|
ksp = "2.0.10-1.0.24"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
|
activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
|
||||||
|
|||||||
Reference in New Issue
Block a user