docs: update places install snippet (#642)

* docs: update places install snippet Don't use a variable in the kotlin bom dependency. * chore: Update build.yml GitHub Actions runner image moved SDK manager per actions/runner-images#8952. Migrate to new location of SDK manager per path listed at actions/runner-images#9146 (comment)
googlemaps-samples · Jan 18, 2024 · a0e31e8 · a0e31e8
1 parent 4d5616d
commit a0e31e8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
 
     - name: Install NDK
       run: |
-        sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;20.0.5594570"
+        sudo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;20.0.5594570"
 
     - name: Build and check
       run: cd demo-java && ./gradlew assemble lint
@@ -69,7 +69,7 @@ jobs:
 
     - name: Install NDK
       run: |
-        sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;20.0.5594570"
+        sudo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;20.0.5594570"
 
     - name: Build and check
       run: cd demo-kotlin && ./gradlew assemble lint
@@ -95,7 +95,7 @@ jobs:
 
     - name: Install NDK
       run: |
-        sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;20.0.5594570"
+        sudo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;20.0.5594570"
 
     - name: Build and check
       run: cd snippets && ./gradlew assemble lint

diff --git a/snippets/app/build.gradle b/snippets/app/build.gradle
@@ -34,8 +34,9 @@ android {
 
 // [START maps_android_places_install_snippet]
 dependencies {
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom:$kotlin_version"))
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.21"))
     // [START_EXCLUDE silent]
+    // If updating kotlin-bom version number above, also edit project-level build.gradle definition of $kotlin_version variable
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
     implementation 'androidx.core:core-ktx:1.10.0'

diff --git a/snippets/build.gradle b/snippets/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.8.21"
+    ext.kotlin_version = "1.8.21" // If changing this version number, also change in the kotlin-bom dependency in app/build.gradle
     repositories {
         google()
         mavenCentral()
@@ -23,4 +23,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}