Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
- name: Build and check
run: |
cd snippets
./gradlew assembleDebug lintGmsDebug
./gradlew assembleDebug lintDebug

build-tutorials:
runs-on: ubuntu-latest
Expand Down
9 changes: 7 additions & 2 deletions ApiDemos/project/common-ui/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

/*
* Copyright 2025 Google LLC
*
Expand Down Expand Up @@ -43,8 +45,11 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "17"
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
javaParameters.set(true)
}
}
}

Expand Down
14 changes: 7 additions & 7 deletions ApiDemos/project/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
activity = "1.10.1"
activityKtx = "1.10.1"
androidxJunit = "1.2.1"
appcompat = "1.7.0"
appcompat = "1.7.1"
cardview = "1.0.0"
easypermissions = "3.0.0"
espresso = "3.6.1"
gradle = "8.8.0"
gradle = "8.10.1"
junit = "4.13.2"
kotlin = "2.1.10"
lifecycle = "2.8.7"
mapsKtx = "5.1.1"
kotlin = "2.2.0"
lifecycle = "2.9.1"
mapsKtx = "5.2.0"
material = "1.12.0"
multidex = "2.0.1"
playServicesMaps = "19.1.0"
playServicesMaps = "19.2.0"
recyclerview = "1.4.0"
secretsGradlePlugin = "2.0.1"
volley = "1.2.1"
coreKtx = "1.15.0"
coreKtx = "1.16.0"

[libraries]
activity = { module = "androidx.activity:activity", version.ref = "activity" }
Expand Down
Binary file modified ApiDemos/project/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions ApiDemos/project/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Wed Jul 10 22:13:55 CEST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading