Merge pull request #242 from ndtp/241-meerkat

241: Support Android Studio Meerkat | 2024.3.1 Canary 7 | 243.+

Author: DanielJette

Plugins/IntelliJ/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Android Testify - IntelliJ Platform Plugin - Change Log
 
+## [2.5.0]
+
+  - Added support for Support Android Studio Meerkat | 2024.3.1 Canary 7 | 243.+
+
 ## [2.4.0]
 
   - Added support for Android Studio Ladybug | 2024.2.1 Canary 9 | 242.+

Plugins/IntelliJ/build.gradle.kts

@@ -20,7 +20,7 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
 }
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
@@ -52,14 +52,14 @@ tasks {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 
 tasks {
     runIde {
         // Absolute path to installed target 3.5 Android Studio to use as
         // IDE Development Instance (the "Contents" directory is macOS specific):
-        ideDir.set(file("/Applications/Android Studio.app/Contents"))
+        ideDir.set(file("/Applications/Android Studio Preview.app/Contents"))
     }
 }

Plugins/IntelliJ/gradle.properties

@@ -2,16 +2,17 @@
 # -> https://www.jetbrains.org/intellij/sdk/docs/reference_guide/intellij_artifacts.html
 
 pluginGroup = dev.testify
-version = 2.4.0
+version = 2.5.0
 
 # https://plugins.jetbrains.com/docs/intellij/android-studio.html#android-studio-releases-listing
-pluginSinceBuild = 222
-pluginUntilBuild = 242.*
+pluginSinceBuild = 223
+pluginUntilBuild = 243.*
 
 platformType = IC
 platformDownloadSources = true
 
 # Set the explicit compiler version
 InstrumentCodeVersion=223.7571.182
 
-kotlin.code.style=official
+kotlin.code.style=official
+kotlin.stdlib.default.dependency = false

Plugins/IntelliJ/src/main/resources/META-INF/plugin.xml

@@ -28,6 +28,11 @@ Copyright (c) 2023-2024 ndtp
     <change-notes>
         <![CDATA[
 
+      <h3>2.5.0</h3>
+      <ul>
+        <li>Added support for Support Android Studio Meerkat | 2024.3.1 Canary 7 | 243.+</li>
+      </ul>
+
       <h3>2.4.0</h3>
       <ul>
         <li>Added support for Android Studio Ladybug | 2024.2.1 Canary 9 | 242.+</li>
@@ -81,10 +86,11 @@ Copyright (c) 2023-2024 ndtp
     ]]>
     </change-notes>
 
-    <depends>com.intellij.modules.androidstudio</depends>
+<!--    <depends>com.intellij.modules.androidstudio</depends>-->
     <depends>com.intellij.modules.java</depends>
     <depends>org.jetbrains.kotlin</depends>
     <depends>org.jetbrains.android</depends>
+<!--    <depends>org.jetbrains.plugins</depends>-->
 
     <!-- Declare the default resource location for localizing menu strings -->
     <resource-bundle>messages.MyBundle</resource-bundle>
@@ -100,6 +106,10 @@ Copyright (c) 2023-2024 ndtp
 
     </extensions>
 
+    <extensions defaultExtensionNs="org.jetbrains.kotlin">
+        <supportsKotlinPluginMode supportsK1="true" supportsK2="false" />
+    </extensions>
+
     <actions>
         <action
                 id="dev.testify.actions.utility.GoToSourceAction"