From 1beb6ea2e5345621c22b5bfb8fa7c88b059fd59d Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sun, 3 Mar 2024 17:06:19 +0100 Subject: [PATCH] libs update --- build.gradle.kts | 2 +- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Libs.kt | 2 +- .../src/main/kotlin/jacoco-app-dependencies.gradle.kts | 6 +++--- .../src/main/kotlin/jacoco-module-dependencies.gradle.kts | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- jacoco_aggregation.gradle.kts | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8299de521cf..38ede877530 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,5 +59,5 @@ allprojects { apply(from = "jacoco_aggregation.gradle.kts") tasks.register("clean").configure { - delete(rootProject.buildDir) + delete(rootProject.layout.buildDirectory) } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 223da698c98..820abdc2545 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ object KtsBuildVersions { const val gradle = "8.2.0" - const val kotlin = "1.9.10" + const val kotlin = "1.9.22" } plugins { diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 67054d7b49a..16d90b1992a 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -3,7 +3,7 @@ object Libs { object Kotlin { - const val kotlin = "1.9.10" + const val kotlin = "1.9.22" const val stdlibJdk8 = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin" const val reflect = "org.jetbrains.kotlin:kotlin-reflect:$kotlin" diff --git a/buildSrc/src/main/kotlin/jacoco-app-dependencies.gradle.kts b/buildSrc/src/main/kotlin/jacoco-app-dependencies.gradle.kts index db9a293e9ef..2555d742e22 100644 --- a/buildSrc/src/main/kotlin/jacoco-app-dependencies.gradle.kts +++ b/buildSrc/src/main/kotlin/jacoco-app-dependencies.gradle.kts @@ -117,11 +117,11 @@ fun Project.registerCodeCoverageTask( description = "Generate Jacoco coverage reports on the ${sourceName.replaceFirstChar(Char::titlecase)} build." val javaDirectories = fileTree( - "${project.buildDir}/intermediates/classes/${sourcePath}" + "${project.layout.buildDirectory}/intermediates/classes/${sourcePath}" ) { exclude(excludedFiles) } val kotlinDirectories = fileTree( - "${project.buildDir}/tmp/kotlin-classes/${sourcePath}" + "${project.layout.buildDirectory}/tmp/kotlin-classes/${sourcePath}" ) { exclude(excludedFiles) } val coverageSrcDirectories = listOf( @@ -137,7 +137,7 @@ fun Project.registerCodeCoverageTask( additionalClassDirs.setFrom(files(coverageSrcDirectories)) sourceDirectories.setFrom(files(coverageSrcDirectories)) executionData.setFrom( - files("${project.buildDir}/jacoco/${testTaskName}.exec") + files("${project.layout.buildDirectory}/jacoco/${testTaskName}.exec") ) reports { diff --git a/buildSrc/src/main/kotlin/jacoco-module-dependencies.gradle.kts b/buildSrc/src/main/kotlin/jacoco-module-dependencies.gradle.kts index e199e8ff78e..cf525c7db86 100644 --- a/buildSrc/src/main/kotlin/jacoco-module-dependencies.gradle.kts +++ b/buildSrc/src/main/kotlin/jacoco-module-dependencies.gradle.kts @@ -117,11 +117,11 @@ fun Project.registerCodeCoverageTask( description = "Generate Jacoco coverage reports on the ${sourceName.replaceFirstChar(Char::titlecase)} build." val javaDirectories = fileTree( - "${project.buildDir}/intermediates/classes/${sourcePath}" + "${project.layout.buildDirectory}/intermediates/classes/${sourcePath}" ) { exclude(excludedFiles) } val kotlinDirectories = fileTree( - "${project.buildDir}/tmp/kotlin-classes/${sourcePath}" + "${project.layout.buildDirectory}/tmp/kotlin-classes/${sourcePath}" ) { exclude(excludedFiles) } val coverageSrcDirectories = listOf( @@ -137,7 +137,7 @@ fun Project.registerCodeCoverageTask( additionalClassDirs.setFrom(files(coverageSrcDirectories)) sourceDirectories.setFrom(files(coverageSrcDirectories)) executionData.setFrom( - files("${project.buildDir}/jacoco/${testTaskName}.exec") + files("${project.layout.buildDirectory}/jacoco/${testTaskName}.exec") ) reports { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2968a868fe..558acbc50a5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Sep 18 18:21:09 CEST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/jacoco_aggregation.gradle.kts b/jacoco_aggregation.gradle.kts index 23a2da05317..9c0e3550fab 100644 --- a/jacoco_aggregation.gradle.kts +++ b/jacoco_aggregation.gradle.kts @@ -42,8 +42,8 @@ project.afterEvaluate { val classesDirectories = mutableListOf().also { subprojects.forEach { proj -> variants.forEach { variant -> - it.add("${proj.buildDir}/intermediates/javac/$variant/classes") - it.add("${proj.buildDir}/tmp/kotlin-classes/$variant") + it.add("${proj.layout.buildDirectory}/intermediates/javac/$variant/classes") + it.add("${proj.layout.buildDirectory}/tmp/kotlin-classes/$variant") } } } @@ -71,12 +71,12 @@ project.afterEvaluate { val executions = mutableListOf().also { subprojects.forEach { proj -> variants.forEach { variant -> - val path = "${proj.buildDir}/outputs/unit_test_code_coverage/${variant}UnitTest/test${variant.replaceFirstChar(Char::titlecase)}UnitTest.exec" + val path = "${proj.layout.buildDirectory}/outputs/unit_test_code_coverage/${variant}UnitTest/test${variant.replaceFirstChar(Char::titlecase)}UnitTest.exec" if ((File(path)).exists()) { it.add(path) println("Collecting execution data from: $path") } - val androidPath = "${proj.buildDir}/outputs/code_coverage/${variant}AndroidTest/connected/" + val androidPath = "${proj.layout.buildDirectory}/outputs/code_coverage/${variant}AndroidTest/connected/" val androidFiles = fileTree(androidPath) androidFiles.forEach { file -> it.add(file.path)