build: update to Kotlin 2.2.20, fixed tests (#1604)

* build: update to Kotlin 2.2.20, fixed tests

* build: re-added BuildConfig

Author: kikoso

build.gradle.kts

@@ -32,7 +32,7 @@ buildscript {
 }
 
 tasks.register<Delete>("clean") {
-    delete(rootProject.buildDir)
+    delete(layout.buildDirectory)
 }
 
 allprojects {

demo/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 /**
  * Copyright 2025 Google LLC
  *
@@ -22,7 +24,7 @@ plugins {
 
 android {
     lint {
-        sarifOutput = file("$buildDir/reports/lint-results.sarif")
+        sarifOutput = layout.buildDirectory.file("reports/lint-results.sarif").get().asFile
     }
 
     defaultConfig {
@@ -48,12 +50,13 @@ android {
         viewBinding = true
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
-    }
     kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
         jvmToolchain(17)
     }
+
     namespace = "com.google.maps.android.utils.demo"
 }
 

gradle.properties

@@ -37,4 +37,4 @@ mavenCentralPassword=
 
 # 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

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ gradle = "8.13.0"
 jacoco-android = "0.2.1"
 lifecycle-extensions = "2.2.0"
 lifecycle-viewmodel-ktx = "2.9.4"
-kotlin = "2.2.0"
+kotlin = "2.2.20"
 kotlinx-coroutines = "1.10.2"
 junit = "4.13.2"
 mockito-core = "5.20.0"

library/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 /**
  * Copyright 2024 Google Inc.
  *
@@ -21,14 +23,13 @@ plugins {
 
 android {
     lint {
-        sarifOutput = file("$buildDir/reports/lint-results.sarif")
+        sarifOutput = layout.buildDirectory.file("reports/lint-results.sarif").get().asFile
     }
     defaultConfig {
         compileSdk = libs.versions.compileSdk.get().toInt()
         minSdk = 21
-        targetSdk = libs.versions.targetSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.targetSdk.get().toInt()
         consumerProguardFiles("consumer-rules.pro")
-        buildConfigField("String", "TRAVIS", "\"${System.getenv("TRAVIS")}\"")
     }
     buildTypes {
         release {
@@ -40,16 +41,19 @@ android {
         }
     }
     resourcePrefix = "amu_"
-    adbOptions {
+
+    installation {
         timeOutInMs = 10 * 60 * 1000 // 10 minutes
         installOptions("-d", "-t")
     }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
+
     kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
         jvmToolchain(17)
     }
+
     testOptions {
         animationsDisabled = true
         unitTests.isIncludeAndroidResources = true
@@ -75,6 +79,7 @@ dependencies {
     testImplementation(libs.mockk)
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.robolectric)
+    testImplementation(libs.mockito.core)
 }
 
 tasks.register("instrumentTest") {

library/src/test/java/com/google/maps/android/TestUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google Inc.
+ * Copyright 2025 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,12 @@
 public class TestUtil {
 
     /**
-     * Returns true if execution is occurring on Travis CI, and false if it is not
-     * @return true if execution is occurring on Travis CI, and false if it is not
+     * Returns true if execution is occurring on GitHub Actions, and false otherwise.
+     * This is determined by checking the GITHUB_ACTIONS environment variable.
+     *
+     * @return true if running on GitHub Actions, false otherwise.
      */
-    public static boolean isRunningOnTravis() {
-        return BuildConfig.TRAVIS != null && BuildConfig.TRAVIS.equals("true");
+    public static boolean isRunningOnGitHub() {
+        return "true".equals(System.getenv("GITHUB_ACTIONS"));
     }
 }

library/src/test/java/com/google/maps/android/data/geojson/GeoJsonPointStyleTest.java

@@ -18,13 +18,12 @@
 import com.google.android.gms.maps.MapsInitializer;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
-import com.google.maps.android.TestUtil;
 
-import org.junit.Assume;
+import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
 import org.robolectric.RobolectricTestRunner;
 
 import java.util.Arrays;
@@ -35,15 +34,28 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
 
 @RunWith(RobolectricTestRunner.class)
 public class GeoJsonPointStyleTest {
     private GeoJsonPointStyle pointStyle;
 
+    private MockedStatic<BitmapDescriptorFactory> mockedStatic;
+
     @Before
     public void setUp() {
         MapsInitializer.initialize(InstrumentationRegistry.getInstrumentation().getTargetContext());
         pointStyle = new GeoJsonPointStyle();
+        mockedStatic = mockStatic(BitmapDescriptorFactory.class);
+    }
+
+    @After
+    public void tearDown() {
+        if (mockedStatic != null) {
+            mockedStatic.close();
+        }
     }
 
     @Test
@@ -84,16 +96,15 @@ public void testFlat() {
         assertTrue(pointStyle.toMarkerOptions().isFlat());
     }
 
-    @Ignore("I should run via Robolectric - java.lang.NullPointerException: IBitmapDescriptorFactory is not initialized") // FIXME
     @Test
     public void testIcon() {
-        if (TestUtil.isRunningOnTravis()) {
-            Assume.assumeTrue("Skipping GeoJsonPointStyleTest.testIcon() - this is expected behavior on Travis CI (#573)", false);
-            return;
-        }
-        BitmapDescriptor icon =
-                BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_GREEN);
+        // Mock the return value of defaultMarker
+        BitmapDescriptor mockedIcon = mock(BitmapDescriptor.class);
+        when(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_GREEN)).thenReturn(mockedIcon);
+
+        BitmapDescriptor icon = BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_GREEN);
         pointStyle.setIcon(icon);
+
         assertEquals(icon, pointStyle.getIcon());
         assertEquals(icon, pointStyle.toMarkerOptions().getIcon());
     }

library/src/test/java/com/google/maps/android/data/kml/KmlStyleTest.java

@@ -134,7 +134,7 @@ public void testLineColor() {
     @Test
     @Ignore("I should run via Robolectric - java.lang.NullPointerException: IBitmapDescriptorFactory is not initialized") // FIXME
     public void testMarkerColorLeadingSpace() {
-        if (TestUtil.isRunningOnTravis()) {
+        if (TestUtil.isRunningOnGitHub()) {
             Assume.assumeTrue("Skipping KmlStyleTest.testMarkerColorLeadingSpace() - this is expected behavior on Travis CI (#573)", false);
             return;
         }
@@ -148,7 +148,7 @@ public void testMarkerColorLeadingSpace() {
     @Test
     @Ignore("I should run via Robolectric - java.lang.NullPointerException: IBitmapDescriptorFactory is not initialized") // FIXME
     public void testMarkerColorTrailingSpace() {
-        if (TestUtil.isRunningOnTravis()) {
+        if (TestUtil.isRunningOnGitHub()) {
             Assume.assumeTrue("Skipping KmlStyleTest.testMarkerColorTrailingSpace() - this is expected behavior on Travis CI (#573)", false);
             return;
         }