feat(attribution): register usage attribution with Places SDK and remove legacy library module

places-compose-demo/build.gradle.kts

@@ -95,7 +95,6 @@ dependencies {
     implementation(libs.kotlin.reflect)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
-    implementation(project(":library"))
     // Hilt
     implementation(libs.dagger)
     ksp(libs.hilt.android.compiler)

places-compose/build.gradle.kts

@@ -49,6 +49,13 @@ android {
         }
     }
 
+    sourceSets {
+        getByName("main") {
+            java.directories.add("build/generated/source/artifactId")
+            kotlin.directories.add("build/generated/source/artifactId")
+        }
+    }
+
     buildFeatures {
         buildConfig = true
         compose = true
@@ -62,12 +69,46 @@ android {
     }
 }
 
+// Artifact ID logic for usage attribution
+val attributionId = "gmp_git_androidplacescompose_v$version"
+
+val generateArtifactIdFile = tasks.register("generateArtifactIdFile") {
+    val outputDir = layout.buildDirectory.dir("generated/source/artifactId")
+    val packageName = "com.google.android.libraries.places.compose.autocomplete.utils.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
+
+            /**
+             * Automatically generated object containing the library's attribution ID.
+             * This is used to track library usage for analytics.
+             */
+            public object AttributionId {
+                public const val VALUE: String = "$attributionId"
+            }
+            """.trimIndent()
+        )
+    }
+}
+
+tasks.named("preBuild") {
+    dependsOn(generateArtifactIdFile)
+}
+
 dependencies {
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
     implementation(libs.places)
+    implementation(libs.startup.runtime)
     testImplementation(libs.junit)
     testImplementation(libs.androidx.ui.test.android)
     androidTestImplementation(libs.androidx.junit)

places-compose/src/main/AndroidManifest.xml

@@ -14,7 +14,20 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+    <application>
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="com.google.android.libraries.places.compose.autocomplete.utils.attribution.AttributionIdInitializer"
+                android:value="androidx.startup" />
+        </provider>
+    </application>
 </manifest>

library/src/main/java/com/google/android/libraries/places/compose/library/utils/attribution/AttributionIdInitializer.kt → places-compose/src/main/java/com/google/android/libraries/places/compose/autocomplete/utils/attribution/AttributionIdInitializer.kt

@@ -13,28 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.libraries.places.compose.library.utils.attribution
+
+package com.google.android.libraries.places.compose.autocomplete.utils.attribution
 
 import android.content.Context
 import androidx.annotation.Keep
 import androidx.startup.Initializer
-import com.google.android.gms.maps.MapsApiSettings
-import com.google.android.libraries.places.compose.library.utils.meta.AttributionId
+import com.google.android.libraries.places.api.Places
+import com.google.android.libraries.places.compose.autocomplete.utils.meta.AttributionId
 
 /**
- * Adds a usage attribution ID to the initializer, which helps Google understand which libraries
- * and samples are helpful to developers, such as usage of this library.
+ * Adds a usage attribution ID to the Places SDK initializer, which helps Google understand
+ * which libraries and samples are helpful to developers, such as usage of this library.
+ *
  * To opt out of sending the usage attribution ID, please remove this initializer from your manifest.
  */
 @Keep
 internal class AttributionIdInitializer : Initializer<Unit> {
     override fun create(context: Context) {
-        MapsApiSettings.addInternalUsageAttributionId(
-            // context =
-            context,
-            // internalUsageAttributionId =
-            AttributionId.VALUE,
-        )
+        Places.addInternalUsageAttributionId(AttributionId.VALUE)
     }
 
     override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()

library/src/test/java/com/google/android/libraries/places/compose/library/utils/attribution/AttributionIdInitializerTest.kt → places-compose/src/test/java/com/google/android/libraries/places/compose/autocomplete/utils/attribution/AttributionIdInitializerTest.kt

@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.libraries.places.compose.library.utils.attribution
+
+package com.google.android.libraries.places.compose.autocomplete.utils.attribution
 
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
-import com.google.android.gms.maps.MapsApiSettings
-import com.google.android.libraries.places.compose.library.utils.meta.AttributionId
+import com.google.android.libraries.places.api.Places
+import com.google.android.libraries.places.compose.autocomplete.utils.meta.AttributionId
+import com.google.common.truth.Truth.assertThat
 import io.mockk.every
 import io.mockk.just
 import io.mockk.mockkStatic
@@ -35,27 +37,30 @@ import org.robolectric.RobolectricTestRunner
 class AttributionIdInitializerTest {
     @Before
     fun setUp() {
-        mockkStatic(MapsApiSettings::class)
-        every { MapsApiSettings.addInternalUsageAttributionId(any(), any()) } just runs
+        mockkStatic(Places::class)
+        every { Places.addInternalUsageAttributionId(any()) } just runs
     }
 
     @After
     fun tearDown() {
-        unmockkStatic(MapsApiSettings::class)
+        unmockkStatic(Places::class)
     }
 
     @Test
-    fun `create adds internal usage attribution id`() {
+    fun create_addsInternalUsageAttributionIdToPlaces() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         val initializer = AttributionIdInitializer()
 
         initializer.create(context)
 
         verify {
-            MapsApiSettings.addInternalUsageAttributionId(
-                context,
-                AttributionId.VALUE,
-            )
+            Places.addInternalUsageAttributionId(AttributionId.VALUE)
         }
     }
+
+    @Test
+    fun dependencies_returnsEmptyList() {
+        val initializer = AttributionIdInitializer()
+        assertThat(initializer.dependencies()).isEmpty()
+    }
 }

settings.gradle.kts

@@ -26,4 +26,3 @@ dependencyResolutionManagement {
 rootProject.name = "Android Places Compose"
 include(":places-compose-demo")
 include(":places-compose")
-include(":library")