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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,26 @@ on:
types: [gh-pages]
workflow_dispatch:

permissions:
contents: read

jobs:
gh-page-sync:
runs-on: ubuntu-latest

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout Repo
uses: actions/checkout@v6
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

- name: Set up JDK 21
uses: actions/setup-java@v5
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
with:
java-version: '21'
distribution: 'temurin'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v6
uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0

# Run dokka and create tar
- name: Generate documentation
Expand All @@ -54,7 +57,7 @@ jobs:

# Commit changes and create a PR
- name: PR Changes
uses: peter-evans/create-pull-request@v7
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
with:
token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}
commit-message: 'docs: Update docs'
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/lint-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,38 @@ on:
branches:
- main

permissions:
contents: read
security-events: write

jobs:
lint:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v6
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

- name: Set up JDK 21
uses: actions/setup-java@v5
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
with:
java-version: '21'
distribution: 'temurin'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v6
uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0

- name: Run Android Lint
run: ./gradlew lint

- name: Upload SARIF for places-compose
uses: github/codeql-action/upload-sarif@v3
uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
with:
sarif_file: places-compose/build/reports/lint-results.sarif
category: places-compose

- name: Upload SARIF for places-compose-demo
uses: github/codeql-action/upload-sarif@v3
uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
with:
sarif_file: places-compose-demo/build/reports/lint-results.sarif
category: places-compose-demo
9 changes: 6 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,26 @@ on:
release:
types: [published]

permissions:
contents: read

jobs:
publish:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}

- name: Set up JDK 21
uses: actions/setup-java@v5
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
with:
java-version: '21'
distribution: 'temurin'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v6
uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0

- name: Create .gpg key
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
release-please:
runs-on: ubuntu-latest
steps:
- uses: googleapis/release-please-action@v4
- uses: googleapis/release-please-action@45996ed1f6d02564a971a2fa1b5860e934307cf7 # v5.0.0
id: release
with:
token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,34 @@ on:
workflow_dispatch:
workflow_call:

permissions:
contents: read
pull-requests: write

jobs:
test:
runs-on: ubuntu-latest

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout Repo
uses: actions/checkout@v6
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

- name: Set up JDK 21
uses: actions/setup-java@v5
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
with:
java-version: '21'
distribution: 'temurin'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v6
uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0

- name: Build modules
run: ./gradlew build jacocoTestReport --stacktrace

- name: Jacoco Report to PR
id: jacoco
uses: madrapps/jacoco-report@v1.7.2
uses: madrapps/jacoco-report@e51ce1f46f7f8b5331593f935e59cbaf44b84920 # v1.8.0
with:
paths: |
${{ github.workspace }}/places-compose/build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml
Expand All @@ -58,13 +62,16 @@ jobs:
update-comment: true

- name: Get the Coverage info
env:
COVERAGE_OVERALL: ${{ steps.jacoco.outputs.coverage-overall }}
COVERAGE_CHANGED_FILES: ${{ steps.jacoco.outputs.coverage-changed-files }}
run: |
echo "Total coverage ${{ steps.jacoco.outputs.coverage-overall }}"
echo "Changed Files coverage ${{ steps.jacoco.outputs.coverage-changed-files }}"
echo "Total coverage $COVERAGE_OVERALL"
echo "Changed Files coverage $COVERAGE_CHANGED_FILES"

- name: Upload test reports
if: always()
uses: actions/upload-artifact@v7
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: test-reports
path: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,14 @@ class PublishingConventionPlugin : Plugin<Project> {

private fun Project.configureJacoco() {
configure<JacocoPluginExtension> {
toolVersion = "0.8.11" // Compatible with newer JDKs
toolVersion = "0.8.15" // Compatible with newer JDKs
}

tasks.withType<Test>().configureEach {
configure<JacocoTaskExtension> {
isIncludeNoLocationClasses = true
excludes = listOf("jdk.internal.*")
}
}

// AGP 9.0+ built-in Jacoco support or manual configuration.
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ plugins {
alias(libs.plugins.hilt.android) apply false
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"
alias(libs.plugins.ksp) apply false
alias(libs.plugins.dokka) apply false
}

allprojects {
Expand Down
37 changes: 19 additions & 18 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
[versions]
accompanistPermissions = "0.37.3"
activityCompose = "1.13.0"
agp = "9.2.0"
appcompat = "1.7.1"
composeBom = "2026.04.01"
coreKtx = "1.18.0"
agp = "9.3.2"
appcompat = "1.8.0"
composeBom = "2026.08.00"
coreKtx = "1.19.0"
dokka = "2.2.0"
espressoCore = "3.7.0"
gson = "2.14.0"
hiltVersion = "2.59.2"
hiltVersion = "2.60.1"
junit = "4.13.2"
junitVersion = "1.3.0"
kotlin = "2.3.21"
kotlinReflect = "2.3.21"
kotlinxCoroutinesPlayServices = "1.10.2"
ksp = "2.3.2"
lifecycleRuntimeKtx = "2.10.0"
lifecycleViewmodelCompose = "2.10.0"
mapsCompose = "8.3.0"
mapsUtilsKtx = "6.0.1"
kotlinxCoroutinesPlayServices = "1.11.0"
ksp = "2.3.11"
lifecycleRuntimeKtx = "2.11.0"
lifecycleViewmodelCompose = "2.11.0"
mapsCompose = "8.5.0"
mapsUtilsKtx = "6.3.0"
material-icons = "1.7.8"
materialVersion = "1.13.0"
navigationCompose = "2.9.8"
org-jacoco-core = "0.8.14"
places = "5.2.0"
materialVersion = "1.14.0"
navigationCompose = "2.10.0"
org-jacoco-core = "0.8.15"
places = "5.3.0"
robolectric = "4.16.1"
secretsGradlePlugin = "2.0.1"
truth = "1.4.5"
uiTestAndroid = "1.11.0"
uiToolingVersion = "1.11.0"
gradleMavenPublishPlugin = "0.36.0"
uiTestAndroid = "1.12.0"
uiToolingVersion = "1.12.0"
gradleMavenPublishPlugin = "0.37.0"
mockk = "1.14.11"
startup-runtime = "1.2.0"
androidxTestCoreKtx = "1.7.0"
Expand Down Expand Up @@ -93,6 +93,7 @@
android-application = { id = "com.android.application", version.ref = "agp" }
androidLibrary = { id = "com.android.library", version.ref = "agp" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hiltVersion" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
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-9.5.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
1 change: 0 additions & 1 deletion places-compose-demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<activity
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.AndroidPlacesCompose">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import com.google.android.libraries.places.compose.demo.ui.theme.AndroidPlacesComposeDemoTheme
import android.content.Intent
import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Button
Expand Down Expand Up @@ -60,7 +60,7 @@ class MainActivity : ComponentActivity() {
setContent {
AndroidPlacesComposeDemoTheme {
Surface(
modifier = Modifier.fillMaxSize().systemBarsPadding(),
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
) {
ActivityButtons()
Expand All @@ -70,11 +70,17 @@ class MainActivity : ComponentActivity() {
}
}

data class ActivityItem(
val activityClass: Class<*>,
val titleRes: Int,
val descRes: Int,
)

val activities = listOf(
AutocompleteActivity::class.java to R.string.autocomplete_button,
LandmarkSelectionActivity::class.java to R.string.landmark_selection_button,
AddressCompletionActivity::class.java to R.string.address_validation_button,
PlacesAutocompleteMinimalActivity::class.java to R.string.minimal_autocomplete_button
ActivityItem(AutocompleteActivity::class.java, R.string.autocomplete_button, R.string.autocomplete_button_desc),
ActivityItem(LandmarkSelectionActivity::class.java, R.string.landmark_selection_button, R.string.landmark_selection_button_desc),
ActivityItem(AddressCompletionActivity::class.java, R.string.address_validation_button, R.string.address_validation_button_desc),
ActivityItem(PlacesAutocompleteMinimalActivity::class.java, R.string.minimal_autocomplete_button, R.string.minimal_autocomplete_button_desc),
)

@OptIn(ExperimentalMaterial3Api::class)
Expand All @@ -98,15 +104,33 @@ fun ActivityButtons() {
Column(
Modifier
.padding(paddingValues)
.padding(top = 16.dp)
.fillMaxSize()
.padding(horizontal = 24.dp, vertical = 20.dp)
.verticalScroll(rememberScrollState()),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(10.dp)
verticalArrangement = Arrangement.spacedBy(14.dp)
) {
for ((activityClass, buttonTextResId) in activities) {
Button(onClick = { context.startActivity(Intent(context, activityClass)) }) {
Text(stringResource(buttonTextResId))
for (item in activities) {
Button(
onClick = { context.startActivity(Intent(context, item.activityClass)) },
modifier = Modifier.fillMaxWidth()
) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 4.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
Text(
text = stringResource(item.titleRes),
style = MaterialTheme.typography.titleMedium
)
Text(
text = stringResource(item.descRes),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onPrimary.copy(alpha = 0.85f)
)
}
}
}
}
Expand Down
Loading
Loading