diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 160f63e..c8d8419 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -43,7 +43,7 @@ jobs: # Run dokka and create tar - name: Generate documentation run: | - ./gradlew dokkaHtml + ./gradlew docs:dokkaGenerate echo "Creating tar for generated docs" cd $GITHUB_WORKSPACE/places-compose/build/dokka/html && tar cvf ~/places-compose-docs.tar . @@ -65,5 +65,5 @@ jobs: automerge title: 'docs: Update docs' body: | - Updated GitHub pages with latest from `./gradlew dokkaHtml`. + Updated GitHub pages with latest from `./gradlew docs:dokkaGenerate`. branch: googlemaps-bot/update_gh_pages diff --git a/.github/workflows/lint-report.yml b/.github/workflows/lint-report.yml index c8f4a01..c058e03 100644 --- a/.github/workflows/lint-report.yml +++ b/.github/workflows/lint-report.yml @@ -45,5 +45,5 @@ jobs: - name: Upload SARIF for places-compose-demo uses: github/codeql-action/upload-sarif@v3 with: - sarif_file: places-compose-demo/build/reports/lint-results.sarif + sarif_file: places-compose-demo/build/reports/lint-results-debug.sarif category: places-compose-demo diff --git a/build.gradle.kts b/build.gradle.kts index 401868d..78dada1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,6 +12,7 @@ plugins { alias(libs.plugins.secrets.gradle.plugin) apply false alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.ksp) + id("org.jetbrains.dokka") version "2.1.0" } allprojects { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3b87e0e..4ebaafa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,36 +1,36 @@ [versions] accompanistPermissions = "0.37.3" -activityCompose = "1.11.0" -agp = "8.13.0" +activityCompose = "1.12.0" +agp = "8.13.1" appcompat = "1.7.1" -composeBom = "2025.09.01" +composeBom = "2025.11.01" coreKtx = "1.17.0" -dokka = "2.0.0" +dokka = "2.1.0" espressoCore = "3.7.0" gson = "2.13.2" hiltVersion = "2.57.2" jacoco-plugin = "0.2.1" junit = "4.13.2" junitVersion = "1.3.0" -kotlin = "2.2.20" +kotlin = "2.2.21" kotlinReflect = "2.2.20" kotlinxCoroutinesPlayServices = "1.10.2" -ksp = "2.2.20-2.0.3" -lifecycleRuntimeKtx = "2.9.4" -lifecycleViewmodelCompose = "2.9.4" -mapsCompose = "6.11.0" -mapsUtilsKtx = "5.2.0" +ksp = "2.2.20-2.0.4" +lifecycleRuntimeKtx = "2.10.0" +lifecycleViewmodelCompose = "2.10.0" +mapsCompose = "6.12.2" +mapsUtilsKtx = "5.2.1" material-icons = "1.7.8" materialVersion = "1.13.0" -navigationCompose = "2.9.5" -org-jacoco-core = "0.8.13" -places = "5.0.0" +navigationCompose = "2.9.6" +org-jacoco-core = "0.8.14" +places = "5.1.1" robolectric = "4.16" secretsGradlePlugin = "2.0.1" truth = "1.4.5" -uiTestAndroid = "1.9.2" -uiToolingVersion = "1.9.2" -gradleMavenPublishPlugin = "0.34.0" +uiTestAndroid = "1.9.5" +uiToolingVersion = "1.9.5" +gradleMavenPublishPlugin = "0.35.0" [libraries] accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanistPermissions" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55..8bdaf60 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da..2a84e18 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a9..ef07e01 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/places-compose-demo/build.gradle.kts b/places-compose-demo/build.gradle.kts index d1820d8..e9d0218 100644 --- a/places-compose-demo/build.gradle.kts +++ b/places-compose-demo/build.gradle.kts @@ -9,7 +9,7 @@ plugins { android { lint { - sarifOutput = file("$buildDir/reports/lint-results.sarif") + sarifOutput = file("${layout.buildDirectory}/reports/lint-results.sarif") } namespace = "com.google.android.libraries.places.compose.demo" @@ -50,8 +50,10 @@ android { } } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) + } } buildFeatures {