Skip to content

Commit f086269

Browse files
authored
Merge pull request #52 from yml-org/upgrade_libraries_fix_renovate
update libraries
2 parents 9c3b5c4 + 564aa55 commit f086269

File tree

6 files changed

+18
-19
lines changed

6 files changed

+18
-19
lines changed

build-logic/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ repositories {
1010
}
1111

1212
java {
13-
sourceCompatibility = JavaVersion.VERSION_11
14-
targetCompatibility = JavaVersion.VERSION_11
13+
sourceCompatibility = JavaVersion.VERSION_17
14+
targetCompatibility = JavaVersion.VERSION_17
1515
}
1616

1717
dependencies {

build-logic/src/main/java/ytemplate/android/KotlinAndroid.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ internal fun Project.configureKotlinAndroid(
3737
}
3838

3939
compileOptions {
40-
sourceCompatibility = JavaVersion.VERSION_11
41-
targetCompatibility = JavaVersion.VERSION_11
40+
sourceCompatibility = JavaVersion.VERSION_17
41+
targetCompatibility = JavaVersion.VERSION_17
4242
isCoreLibraryDesugaringEnabled = false
4343
}
4444

@@ -54,7 +54,7 @@ internal fun Project.configureKotlinAndroid(
5454
"-opt-in=kotlin.Experimental",
5555
)
5656

57-
jvmTarget = JavaVersion.VERSION_11.toString()
57+
jvmTarget = JavaVersion.VERSION_17.toString()
5858
}
5959
}
6060
}

build-logic/src/main/java/ytemplate/android/jacoco/Jacoco.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ fun File.extractTestCoverage(): Map<String, Double> {
248248
val counterNodes: List<NodeChild> = xmlReader.parse(this).parent().children()
249249
.filter { (it as NodeChild).name() == "counter" } as List<NodeChild>
250250
return counterNodes.associate { child ->
251-
val type = child.attributes()["type"].toString().toLowerCase(Locale.US)
251+
val type = child.attributes()["type"].toString().lowercase(Locale.US)
252252
val covered = child.attributes()["covered"].toString().toDouble()
253253
val missed = child.attributes()["missed"].toString().toDouble()
254254
val percentage = ((covered / (covered + missed)) * 10000.0).roundToInt() / 100.0

gradle/libs.versions.toml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[versions]
22
# Define the dependency versions
33
#kotlin
4-
kotlinVersion = "1.8.10"
5-
kotlinJvmTarget = "11"
4+
kotlinVersion = "1.8.20"
5+
kotlinJvmTarget = "17"
66
kotlinxCoroutines = "1.6.4"
77
kotlinxSerializationJson = "1.5.0"
88

99
#gradle
10-
androidGradlePlugin = "7.4.2"
10+
androidGradlePlugin = "8.0.0"
1111

1212
#androidx
13-
androidxComposeBom = "2023.03.00"
14-
androidxActivityCompose = "1.7.0"
13+
androidxComposeBom = "2023.04.01"
14+
androidxActivityCompose = "1.7.1"
1515
androidxAppCompat = "1.6.1"
16-
androidxComposeCompiler = "1.4.4"
17-
androidxCore = "1.9.0"
16+
androidxComposeCompiler = "1.4.6"
17+
androidxCore = "1.10.0"
1818
androidxLifecycle = "2.6.1"
1919
androidxNavigation = "2.5.3"
2020
androidxEspresso = "3.5.1"
@@ -41,7 +41,7 @@ compose_ui_testing = "1.4.0-beta01"
4141
core_ktx = "1.9.0"
4242

4343
#ksp
44-
ksp = "1.8.10-1.0.9"
44+
ksp = "1.8.20-1.0.11"
4545

4646
#coroutine
4747
coroutine = "1.6.4"
@@ -62,12 +62,12 @@ junit = "4.13.2"
6262
jupiter_junit = "5.9.2"
6363

6464
#Firebase
65-
firebase_analytics = "21.2.1"
66-
firebase_bom = "31.4.0"
65+
firebase_analytics = "21.2.2"
66+
firebase_bom = "31.5.0"
6767

6868
#Mock
6969
anotation = "1.3.0"
70-
mockk_android = "1.13.4"
70+
mockk_android = "1.13.5"
7171
test_runner = "1.5.2"
7272

7373
#sonar
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

renovate.json

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"config:base"
55
],
66
"baseBranches": [
7-
"feature/CM-1239-RenovateBotFix",
87
"multi_module"
98
],
109
"packageRules": [

0 commit comments

Comments
 (0)