Merge pull request #514 from gradle/asodja/test-android-studio

Upgrade Android Studio to Iguana 2023.2.1.7
gradle · Oct 17, 2023 · 747fe34 · 747fe34
2 parents 1c6f888 + 941be1e
commit 747fe34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -130,8 +130,8 @@ androidStudioTests {
     val autoDownloadAndRunInHeadless = providers.gradleProperty("autoDownloadAndRunInHeadless").orNull == "true"
     runAndroidStudioInHeadlessMode.set(autoDownloadAndRunInHeadless)
     autoDownloadAndroidStudio.set(autoDownloadAndRunInHeadless)
-    // Hedgehog (2023.1.1.6) Canary 6
-    testAndroidStudioVersion.set("2023.1.1.6")
+    // Iguana (2023.2.1.7) Canary 7
+    testAndroidStudioVersion.set("2023.2.1.7")
     testAndroidSdkVersion.set("7.3.0")
     // For local development it's easier to setup Android SDK with Android Studio, since auto download needs ANDROID_HOME or ANDROID_SDK_ROOT
     // to be set with an accepted license in it. See https://developer.android.com/studio/intro/update.html#download-with-gradle.

diff --git a/src/test/groovy/org/gradle/profiler/AndroidStudioIntegrationTest.groovy b/src/test/groovy/org/gradle/profiler/AndroidStudioIntegrationTest.groovy
@@ -259,7 +259,7 @@ class AndroidStudioIntegrationTest extends AbstractProfilerIntegrationTest {
         def scenarioFile = file("performance.scenarios") << """
             $scenarioName {
                 android-studio-sync {
-                    studio-jvm-args = ["-Xmx1024m", "-Xms128m"]
+                    studio-jvm-args = ["-Xmx4104m", "-Xms128m"]
                 }
             }
         """
@@ -273,7 +273,7 @@ class AndroidStudioIntegrationTest extends AbstractProfilerIntegrationTest {
         def vmOptionsFile = new File(sandboxDir, "scenarioOptions/idea.vmoptions")
         vmOptionsFile.exists()
         def vmOptions = vmOptionsFile.readLines()
-        vmOptions.contains("-Xmx1024m")
+        vmOptions.contains("-Xmx4104m")
         vmOptions.contains("-Xms128m")
     }