Compatibility with AS Ladybug 2024.1.3

Author: pbreault

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## [[Unreleased]]
 
+## [1.6.16] - 2024-07-21
+- Compatibility with Android Studio Ladybug 
+
 ## [1.6.15] - 2024-03-17
 - Compatibility with Android Studio Jellyfish
 
@@ -202,8 +205,9 @@
 - Command to clear data
 - Command to clear data and restart
 
-[Unreleased]: https://github.com/pbreault/adb-idea/compare/1.6.15...HEAD
-[1.6.14]: https://github.com/pbreault/adb-idea/compare/1.6.14...1.6.15
+[Unreleased]: https://github.com/pbreault/adb-idea/compare/1.6.16...HEAD
+[1.6.16]: https://github.com/pbreault/adb-idea/compare/1.6.15...1.6.16
+[1.6.15]: https://github.com/pbreault/adb-idea/compare/1.6.14...1.6.15
 [1.6.14]: https://github.com/pbreault/adb-idea/compare/1.6.13...1.6.14
 [1.6.13]: https://github.com/pbreault/adb-idea/compare/1.6.12...1.6.13
 [1.6.12]: https://github.com/pbreault/adb-idea/compare/1.6.11...1.6.12

build.gradle.kts

@@ -67,6 +67,7 @@ tasks.runIde {
 tasks.register("printLastChanges") {
     doLast {
         println(recentChanges(outputType = MARKDOWN))
+        println(recentChanges(outputType = HTML))
     }
 }
 
@@ -95,7 +96,7 @@ fun recentChanges(outputType: Changelog.OutputType): String {
         .take(5) // last 5 changes
         .forEach { (key, _) ->
             s += changelog.renderItem(
-                changelog.get(key).withHeader(false).withEmptySections(false), outputType
+                changelog.get(key).withHeader(true).withEmptySections(false), outputType
             )
         }
 

gradle.properties

@@ -1,10 +1,10 @@
 # Android Studio Version
 # Get it from `list-studio-versions.sh`
-ideVersion=2023.3.1.13
+ideVersion=2024.1.3.1
 
 # Minimum Intellij PLatform version supported by this plugin
 # see https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html
-sinceBuild=233.13135
+sinceBuild=241.18034
 
 # The path to a local Android Studio installation. Note that this will override the ideVersion
 # Should provide this either as a command line argument or in your home gradle.properties

src/main/kotlin/com/developerphil/adbidea/adb/DeviceResultFetcher.kt

@@ -3,6 +3,7 @@ package com.developerphil.adbidea.adb
 import com.android.ddmlib.IDevice
 import com.android.tools.idea.insights.isAndroidApp
 import com.android.tools.idea.model.AndroidModel
+import com.android.tools.idea.projectsystem.isHolderModule
 import com.android.tools.idea.util.androidFacet
 import com.developerphil.adbidea.adb.DeviceResult.DeviceNotFound
 import com.developerphil.adbidea.adb.DeviceResult.SuccessfulDeviceResult
@@ -52,8 +53,8 @@ class DeviceResultFetcher constructor(
 
     private fun getFacet(facets: List<AndroidFacet>): AndroidFacet? {
         val appFacets = facets
-            .filter { it.holderModule.isAndroidApp }
-            .mapNotNull { it.holderModule.androidFacet }
+            .filter { it.module.isAndroidApp && it.module.isHolderModule()}
+            .mapNotNull { it.module.androidFacet }
             .distinct()
 
         return if (appFacets.size > 1) {

src/main/kotlin/com/developerphil/adbidea/ui/MyDeviceChooser.kt

@@ -23,7 +23,7 @@ import com.android.sdklib.IAndroidTarget
 import com.android.tools.idea.model.AndroidModel
 import com.android.tools.idea.model.StudioAndroidModuleInfo
 import com.android.tools.idea.run.AndroidDevice
-import com.android.tools.idea.run.ConnectedAndroidDevice
+import com.android.tools.idea.run.FakeAndroidDevice
 import com.android.tools.idea.run.LaunchCompatibility
 import com.android.tools.idea.run.LaunchCompatibility.State
 import com.google.common.util.concurrent.ListenableFuture
@@ -294,7 +294,7 @@ class MyDeviceChooser(
                 SERIAL_COLUMN_INDEX -> return device.serialNumber
                 DEVICE_STATE_COLUMN_INDEX -> return getDeviceState(device)
                 COMPATIBILITY_COLUMN_INDEX -> {
-                    val connectedDevice: AndroidDevice = ConnectedAndroidDevice(device)
+                    val connectedDevice: AndroidDevice = FakeAndroidDevice(device)
                     return try {
                         if (myMinSdkVersion.isDone) connectedDevice.canRun(
                             myMinSdkVersion.get(),