Merge pull request #87 from rubensousa/agp_update

rubensousa · web-flow · commit cff6e61ae233 · 2026-02-27T02:03:40.000+01:00
Update Dokka
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -35,8 +35,8 @@ jobs:
 
       - name: Build docs
         run: |
-          ./gradlew dokkaHtmlMultiModule
-          mv ./build/dokka/htmlMultiModule docs/api
+          ./gradlew dokkaGeneratePublicationHtml
+          mv ./build/dokka/html docs/api
 
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -77,8 +77,8 @@ jobs:
 
       - name: Build docs
         run: |
-          ./gradlew dokkaHtmlMultiModule
-          mv ./build/dokka/htmlMultiModule docs/api
+          ./gradlew dokkaGeneratePublicationHtml
+          mv ./build/dokka/html docs/api
 
       - name: Install dependencies
         run: |
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,18 +19,17 @@ import com.rubensousa.carioca.report.android.allure.gradle.AllureReportExtension
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.application) apply false apply false
+    alias(libs.plugins.android.library) apply false apply false
     alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.android.library) apply false
     alias(libs.plugins.jetbrains.kotlin.jvm) apply false
-    alias(libs.plugins.kotlin.dokka) apply true
     alias(libs.plugins.maven.publish) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.dagger.hilt) apply false
     id(libs.plugins.carioca.allure.get().pluginId) apply false
+    alias(libs.plugins.kotlin.dokka) apply true
 }
 
-
 subprojects {
     group = property("GROUP") as String
 
@@ -46,3 +45,17 @@ subprojects {
     }
 
 }
+
+dependencies {
+    dokka(project(":carioca-report:report-android"))
+    dokka(project(":carioca-report:report-android-compose"))
+    dokka(project(":carioca-report:report-android-coroutines"))
+    dokka(project(":carioca-report:report-json"))
+    dokka(project(":carioca-report:report-junit4"))
+    dokka(project(":carioca-report:report-runtime"))
+    dokka(project(":carioca-hilt:carioca-hilt-compose"))
+    dokka(project(":carioca-hilt:carioca-hilt-fragment"))
+    dokka(project(":carioca-hilt:carioca-hilt-manifest"))
+    dokka(project(":carioca-hilt:carioca-hilt-runner"))
+    dokka(project(":carioca-junit4-rules"))
+}
diff --git a/carioca-hilt/carioca-hilt-compose/build.gradle.kts b/carioca-hilt/carioca-hilt-compose/build.gradle.kts
@@ -41,8 +41,8 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        jvmToolchain(17)
     }
 
     testOptions {
diff --git a/carioca-hilt/carioca-hilt-fragment/build.gradle.kts b/carioca-hilt/carioca-hilt-fragment/build.gradle.kts
@@ -39,8 +39,8 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        jvmToolchain(17)
     }
 
     testOptions {
diff --git a/carioca-hilt/carioca-hilt-manifest/build.gradle.kts b/carioca-hilt/carioca-hilt-manifest/build.gradle.kts
@@ -17,7 +17,7 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.maven.publish)
+    alias(libs.plugins.maven.publish)    
     alias(libs.plugins.kotlin.dokka)
     alias(libs.plugins.ksp)
     alias(libs.plugins.dagger.hilt)
@@ -39,8 +39,8 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        jvmToolchain(17)
     }
 
     testOptions {
diff --git a/carioca-hilt/carioca-hilt-runner/build.gradle.kts b/carioca-hilt/carioca-hilt-runner/build.gradle.kts
@@ -39,8 +39,8 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        jvmToolchain(17)
     }
 
     testOptions {
diff --git a/carioca-report-allure-gradle-plugin/src/main/kotlin/com/rubensousa/carioca/report/android/allure/gradle/AllureReportPlugin.kt b/carioca-report-allure-gradle-plugin/src/main/kotlin/com/rubensousa/carioca/report/android/allure/gradle/AllureReportPlugin.kt
@@ -25,12 +25,12 @@ import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.android.build.api.variant.TestAndroidComponentsExtension
 import com.android.build.api.variant.TestVariant
 import com.android.build.api.variant.Variant
+import com.android.build.api.variant.impl.capitalizeFirstChar
 import com.rubensousa.carioca.report.json.JsonReportParser
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.tasks.TaskProvider
-import org.gradle.configurationcache.extensions.capitalized
 import java.io.File
 
 class AllureReportPlugin : Plugin<Project> {
@@ -148,7 +148,7 @@ class AllureReportPlugin : Plugin<Project> {
         buildOutputDir: File,
         connectedOutputDir: File,
     ) {
-        project.tasks.register("clean${variant.name.capitalized()}AllureReport") {
+        project.tasks.register("clean${variant.name.capitalizeFirstChar()}AllureReport") {
             it.group = "report"
             it.description = "Deletes the previous generated allure report"
             it.doFirst {
@@ -170,7 +170,7 @@ class AllureReportPlugin : Plugin<Project> {
         val reportOutputDir = allureExtension?.outputDir ?: getBuildOutputDir(project)
         val attachLogcatOnSuccess = allureExtension?.attachLogcatOnSuccess ?: false
 
-        return project.tasks.register("generate${variant.name.capitalized()}AllureReport") {
+        return project.tasks.register("generate${variant.name.capitalizeFirstChar()}AllureReport") {
             it.group = "report"
             it.description = "Generates the allure report for a previous test run"
             it.doLast {
@@ -187,11 +187,11 @@ class AllureReportPlugin : Plugin<Project> {
     }
 
     private fun getTestTaskName(testVariant: AndroidTest): String {
-        return "connected${testVariant.name.capitalized()}"
+        return "connected${testVariant.name.capitalizeFirstChar()}"
     }
 
     private fun getTestTaskName(variantName: String): String {
-        return "connected${variantName.capitalized()}AndroidTest"
+        return "connected${variantName.capitalizeFirstChar()}AndroidTest"
     }
 
     private fun getConnectedOutputDir(project: Project, testVariant: AndroidTest): File {
diff --git a/carioca-report/report-android-compose/build.gradle.kts b/carioca-report/report-android-compose/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kover)
-    alias(libs.plugins.maven.publish)
+    alias(libs.plugins.maven.publish)    
     alias(libs.plugins.kotlin.dokka)
     alias(libs.plugins.kotlin.compose)
 }
@@ -27,8 +27,8 @@ android {
         targetSdk = 34
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        jvmToolchain(17)
     }
 }
 
diff --git a/carioca-report/report-android-coroutines/build.gradle.kts b/carioca-report/report-android-coroutines/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kover)
-    alias(libs.plugins.maven.publish)
+    alias(libs.plugins.maven.publish)    
     alias(libs.plugins.kotlin.dokka)
 }
 
@@ -15,16 +15,15 @@ android {
     defaultConfig {
         minSdk = 21
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
     }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        jvmToolchain(17)
     }
 }
 
diff --git a/carioca-report/report-android/build.gradle.kts b/carioca-report/report-android/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kover)
-    alias(libs.plugins.maven.publish)
+    alias(libs.plugins.maven.publish)    
     alias(libs.plugins.kotlin.dokka)
 }
 
@@ -39,8 +39,8 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        jvmToolchain(17)
     }
 
     testOptions {
diff --git a/carioca-report/report-json/build.gradle.kts b/carioca-report/report-json/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java-library")
-    alias(libs.plugins.jetbrains.kotlin.jvm)
+    alias(libs.plugins.jetbrains.kotlin.jvm)    
     alias(libs.plugins.kotlin.dokka)
     alias(libs.plugins.kover)
     alias(libs.plugins.kotlin.serialization)
diff --git a/carioca-report/report-junit4/build.gradle.kts b/carioca-report/report-junit4/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("java-library")
     alias(libs.plugins.jetbrains.kotlin.jvm)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.kover)    
     alias(libs.plugins.kotlin.dokka)
     alias(libs.plugins.maven.publish)
 }
diff --git a/carioca-report/report-runtime/build.gradle.kts b/carioca-report/report-runtime/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("java-library")
     alias(libs.plugins.jetbrains.kotlin.jvm)
-    alias(libs.plugins.kover)
+    alias(libs.plugins.kover)    
     alias(libs.plugins.kotlin.dokka)
     alias(libs.plugins.maven.publish)
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx6000m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 kotlin.code.style=official
 android.nonTransitiveRClass=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,14 +3,14 @@ activityCompose = "1.9.2"
 agp = "8.13.2"
 android-tools = "31.6.0"
 hiltNavigationCompose = "1.2.0"
-kotlin = "2.0.20"
+kotlin = "2.2.20"
 coreKtx = "1.13.1"
 fragment = "1.8.3"
-dagger = "2.52"
+dagger = "2.58"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
-kotlinxSerializationJson = "1.7.2"
+kotlinxSerializationJson = "1.10.0"
 lifecycle = "2.8.6"
 material3Android = "1.3.0"
 testRules = "1.6.1"
@@ -22,11 +22,11 @@ truth = "1.4.4"
 uiautomator = '2.3.0'
 test-services = '1.5.0'
 orchestrator = '1.5.0'
-jetbrainsKotlinJvm = "2.0.20"
-dokka = "1.9.20"
+dokka = "2.1.0"
 kotlinx-coroutines = "1.9.0"
-kover = "0.9.0-RC"
-ksp = "2.0.20-1.0.24"
+kover = "0.9.7"
+ksp = "2.3.6"
+fakt = "1.0.0-beta01"
 
 # Publishing
 cariocaReport = "1.0.1"
@@ -47,6 +47,7 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 truth = { module = "com.google.truth:truth", version.ref = "truth" }
+fakt-annotations = { module = "com.rsicarelli.fakt:annotations", version.ref = "fakt" }
 
 # Hilt
 dagger-hilt = { module = "com.google.dagger:hilt-android", version.ref = "dagger" }
@@ -89,16 +90,17 @@ carioca-report-json = { group = "com.rubensousa.carioca", name = "report-json",
 [plugins]
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
+fakt = { id = "com.rsicarelli.fakt", version.ref = "fakt" }
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.29.0" }
+maven-publish = { id = "com.vanniktech.maven.publish", version = "0.36.0" }
 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 carioca-allure = { id = "com.rubensousa.carioca.report.allure", version = "unspecified" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 android-test = { id = "com.android.test", version.ref = "agp" }
-jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "jetbrainsKotlinJvm" }
+jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu May 08 17:54:36 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample-compose/build.gradle.kts b/sample-compose/build.gradle.kts
@@ -58,8 +58,8 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        jvmToolchain(17)
     }
 
 
diff --git a/sample-reports/build.gradle.kts b/sample-reports/build.gradle.kts
@@ -55,8 +55,8 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        jvmToolchain(17)
     }
 
     testOptions {
diff --git a/sample-test/build.gradle.kts b/sample-test/build.gradle.kts
@@ -10,22 +10,22 @@ plugins {
 
 android {
     namespace = "com.rubensousa.carioca.sample.test"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 35
+        targetSdk = 36
         testInstrumentationRunner = "com.rubensousa.carioca.hilt.runner.HiltTestRunner"
         testInstrumentationRunnerArguments["clearPackageData"] = "true"
         testInstrumentationRunnerArguments["useTestStorageService"] = "true"
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        jvmToolchain(17)
     }
 
     targetProjectPath = ":sample-compose"

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ android {`
`41`	`41`	`targetCompatibility = JavaVersion.VERSION_17`
`42`	`42`	`}`
`43`	`43`
`44`		`- kotlinOptions {`
`45`		`- jvmTarget = "17"`
	`44`	`+ kotlin {`
	`45`	`+ jvmToolchain(17)`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`testOptions {`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ android {`
`39`	`39`	`targetCompatibility = JavaVersion.VERSION_17`
`40`	`40`	`}`
`41`	`41`
`42`		`- kotlinOptions {`
`43`		`- jvmTarget = "17"`
	`42`	`+ kotlin {`
	`43`	`+ jvmToolchain(17)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`testOptions {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ plugins {`
`2`	`2`	`alias(libs.plugins.android.library)`
`3`	`3`	`alias(libs.plugins.kotlin.android)`
`4`	`4`	`alias(libs.plugins.kover)`
`5`		`- alias(libs.plugins.maven.publish)`
	`5`	`+ alias(libs.plugins.maven.publish)`
`6`	`6`	`alias(libs.plugins.kotlin.dokka)`
`7`	`7`	`alias(libs.plugins.kotlin.compose)`
`8`	`8`	`}`
`@@ -27,8 +27,8 @@ android {`
`27`	`27`	`targetSdk = 34`
`28`	`28`	`}`
`29`	`29`
`30`		`- kotlinOptions {`
`31`		`- jvmTarget = "17"`
	`30`	`+ kotlin {`
	`31`	`+ jvmToolchain(17)`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`