Skip to content

feat: added AttributionId #702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 22, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
feat: added Attributionid
  • Loading branch information
kikoso committed Apr 21, 2025
commit 22d02d0e373f1861ce6c7916aa7e819b65b9d9f8
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ kotlinxCoroutines = "1.9.0"
leakcanaryAndroid = "2.12"
lifecycleRuntimeKtx = "2.8.7"
mapsecrets = "2.0.1"
mapsktx = "5.1.1"
mapsktx = "5.2.0"
navigation = "6.1.0"
org-jacoco-core = "0.8.11"
places = "4.1.0"
Expand Down
33 changes: 33 additions & 0 deletions maps-compose/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.gradle.kotlin.dsl.sourceSets

plugins {
id("org.jetbrains.kotlin.android")
alias(libs.plugins.compose.compiler)
Expand Down Expand Up @@ -33,6 +35,8 @@ android {
"-Xopt-in=kotlin.RequiresOptIn",
)
}

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

composeCompiler {
Expand Down Expand Up @@ -60,3 +64,32 @@ dependencies {
androidTestImplementation(libs.androidx.test.espresso)
androidTestImplementation(libs.androidx.test.junit.ktx)
}

// Artifact ID logic
val attributionId = "gmp_git_androidmapscompose_v$version"

val generateArtifactIdFile = tasks.register("generateArtifactIdFile") {
val outputDir = layout.buildDirectory.dir("generated/source/artifactId")
val packageName = "com.google.maps.android.compose.meta"
val packagePath = packageName.replace('.', '/')
val outputFile = outputDir.get().file("$packagePath/ArtifactId.kt").asFile

outputs.file(outputFile)

doLast {
outputFile.parentFile.mkdirs()
outputFile.writeText(
"""
package $packageName

public object AttributionId {
public const val VALUE: String = "$attributionId"
}
""".trimIndent()
)
}
}

tasks.named("preBuild") {
dependsOn(generateArtifactIdFile)
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,12 @@ import androidx.lifecycle.findViewTreeLifecycleOwner
import com.google.android.gms.maps.GoogleMapOptions
import com.google.android.gms.maps.LocationSource
import com.google.android.gms.maps.MapView
import com.google.android.gms.maps.MapsApiSettings

import com.google.android.gms.maps.model.LatLng
import com.google.android.gms.maps.model.MapColorScheme
import com.google.android.gms.maps.model.PointOfInterest
import com.google.maps.android.compose.meta.AttributionId
import com.google.maps.android.ktx.awaitMap
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.CoroutineStart
Expand Down Expand Up @@ -148,7 +151,8 @@ public fun GoogleMap(
AndroidView(
modifier = modifier,
factory = { context ->
MapView(context, googleMapOptionsFactory()).also { mapView ->
MapView(context, googleMapOptionsFactory()) .also { mapView ->
MapsApiSettings.addInternalUsageAttributionId(context, AttributionId.VALUE )
val componentCallbacks = object : ComponentCallbacks2 {
override fun onConfigurationChanged(newConfig: Configuration) {}
@Deprecated("Deprecated in Java", ReplaceWith("onTrimMemory(level)"))
Expand Down
Loading