Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
1 change: 0 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.secrets.gradle.plugin)
}

Expand Down
7 changes: 6 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,14 @@
* limitations under the License.
*/

buildscript {
dependencies {
classpath(libs.kotlin.gradle.plugin)
}
}

plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.dokka)
alias(libs.plugins.gradle.maven.publish) apply false
alias(libs.plugins.secrets.gradle.plugin) apply false
Expand Down
9 changes: 7 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ kotlin.code.style=official
signing.keyId=
signing.password=
signing.secretKeyRingFile=
android.defaults.buildfeatures.buildconfig=true

mavenCentralUsername=
mavenCentralPassword=
Expand All @@ -39,4 +38,10 @@ android.javaCompile.suppressSourceTargetDeprecationWarning=true

# Add a property to enable automatic release to Maven Central (optional, but good for CI)
# If true, publishToMavenCentral will also close and release the staging repository
mavenCentralAutomaticRelease=false
mavenCentralAutomaticRelease=false
android.defaults.buildfeatures.resvalues=true
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
android.usesSdkInManifest.disallowed=false
android.dependency.useConstraints=true
android.r8.strictFullModeForKeepRules=false
android.r8.optimizedResourceShrinking=false
11 changes: 5 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
[versions]
# --- Core Android & Kotlin ---
# These are the fundamental versions for building the Android app.
androidCompileSdk = "36"
androidCompileSdk = "37"
androidMinSdk = "23"
androidTargetSdk = "36"

androidxAppcompat = "1.7.1"
androidxCoreKtx = "1.18.0"
androidxCoreKtx = "1.19.0"
# Increasing androidxActivityKtx or lifecycleRuntimeKtx will require us to upgrade the minSdk
androidxActivityKtx = "1.13.0"
lifecycleRuntimeKtx = "2.10.0"
kotlin = "2.3.21"
kotlin = "2.4.0"
kotlinxCoroutines = "1.11.0"
material = "1.14.0"
androidxStartup = "1.2.0"

# --- Google Maps ---
# Versions for Google Play Services libraries, which are essential for this sample.
androidMapsSdk = "20.0.0"
androidMapsUtils = "4.4.0"
androidMapsUtils = "4.5.0"

# --- Testing ---
# Versions for testing libraries.
Expand All @@ -32,7 +32,7 @@ truth = "1.4.5"

# --- Gradle Plugins ---
# Versions for Gradle plugins used in the build process.
agp = "8.13.2"
agp = "9.2.1"
dokkaGradlePlugin = "2.2.0"
gradleMavenPublishPlugin = "0.36.0"
jacocoAndroidGradlePlugin = "0.2.1"
Expand Down Expand Up @@ -78,7 +78,6 @@ android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref
[plugins]
# --- Core Gradle Plugins ---
android-application = { id = "com.android.application", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

# --- Utility Gradle Plugins ---
# The secrets plugin is used to securely handle the Maps API key, preventing it from being checked into source control.
Expand Down
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip

Check warning

Code scanning / Android Lint

Obsolete Android Gradle Plugin Version Warning

A newer version of Gradle than 9.4.1 is available: 9.6.1
Comment thread
kikoso marked this conversation as resolved.
Dismissed
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
8 changes: 6 additions & 2 deletions maps-ktx/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/

plugins {
alias(libs.plugins.kotlin.android)
id("android.maps.ktx.PublishingConventionPlugin")
id("org.jetbrains.dokka")
}
Expand All @@ -39,7 +38,6 @@ android {
targetCompatibility = JavaVersion.VERSION_1_8
}

sourceSets["main"].java.srcDir("build/generated/source/artifactId")

kotlin {
compilerOptions {
Expand All @@ -55,6 +53,12 @@ android {
namespace = "com.google.maps.android.ktx"
}

androidComponents {
onVariants { variant ->
variant.sources.kotlin?.addStaticSourceDirectory("build/generated/source/artifactId")
}
}

dependencies {
implementation(libs.kotlin.stdlib)
implementation(libs.kotlinx.coroutines.android)
Expand Down
1 change: 0 additions & 1 deletion maps-utils-ktx/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/

plugins {
alias(libs.plugins.kotlin.android)
id("android.maps.ktx.PublishingConventionPlugin")
id("org.jetbrains.dokka")
}
Expand Down
Loading