Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ repositories {
}

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions build-logic/src/main/java/ytemplate/android/KotlinAndroid.kt
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ internal fun Project.configureKotlinAndroid(
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
isCoreLibraryDesugaringEnabled = false
}

Expand All @@ -54,7 +54,7 @@ internal fun Project.configureKotlinAndroid(
"-opt-in=kotlin.Experimental",
)

jvmTarget = JavaVersion.VERSION_11.toString()
jvmTarget = JavaVersion.VERSION_17.toString()
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ fun File.extractTestCoverage(): Map<String, Double> {
val counterNodes: List<NodeChild> = xmlReader.parse(this).parent().children()
.filter { (it as NodeChild).name() == "counter" } as List<NodeChild>
return counterNodes.associate { child ->
val type = child.attributes()["type"].toString().toLowerCase(Locale.US)
val type = child.attributes()["type"].toString().lowercase(Locale.US)
val covered = child.attributes()["covered"].toString().toDouble()
val missed = child.attributes()["missed"].toString().toDouble()
val percentage = ((covered / (covered + missed)) * 10000.0).roundToInt() / 100.0
Expand Down
22 changes: 11 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[versions]
# Define the dependency versions
#kotlin
kotlinVersion = "1.8.10"
kotlinJvmTarget = "11"
kotlinVersion = "1.8.20"
kotlinJvmTarget = "17"
kotlinxCoroutines = "1.6.4"
kotlinxSerializationJson = "1.5.0"

#gradle
androidGradlePlugin = "7.4.2"
androidGradlePlugin = "8.0.0"

#androidx
androidxComposeBom = "2023.03.00"
androidxActivityCompose = "1.7.0"
androidxComposeBom = "2023.04.01"
androidxActivityCompose = "1.7.1"
androidxAppCompat = "1.6.1"
androidxComposeCompiler = "1.4.4"
androidxCore = "1.9.0"
androidxComposeCompiler = "1.4.6"
androidxCore = "1.10.0"
androidxLifecycle = "2.6.1"
androidxNavigation = "2.5.3"
androidxEspresso = "3.5.1"
Expand All @@ -41,7 +41,7 @@ compose_ui_testing = "1.4.0-beta01"
core_ktx = "1.9.0"

#ksp
ksp = "1.8.10-1.0.9"
ksp = "1.8.20-1.0.11"

#coroutine
coroutine = "1.6.4"
Expand All @@ -62,12 +62,12 @@ junit = "4.13.2"
jupiter_junit = "5.9.2"

#Firebase
firebase_analytics = "21.2.1"
firebase_bom = "31.4.0"
firebase_analytics = "21.2.2"
firebase_bom = "31.5.0"

#Mock
anotation = "1.3.0"
mockk_android = "1.13.4"
mockk_android = "1.13.5"
test_runner = "1.5.2"

#sonar
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"config:base"
],
"baseBranches": [
"feature/CM-1239-RenovateBotFix",
"multi_module"
],
"packageRules": [
Expand Down