[MOB-52820] Обновил поддержку плагином версий от AS Narwhal 3 Feature Drop

.github/workflows/build.yml

@@ -3,7 +3,7 @@ on: [pull_request, workflow_call]
 
 env:
   # Link for Linux zip file from https://developer.android.com/studio/archive
-  ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.2.2.13/android-studio-2024.2.2.13-linux.tar.gz
+  ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2025.1.3.7/android-studio-2025.1.3.7-linux.tar.gz
 
 jobs:
   build:

build-logic/idea-convention/src/main/kotlin/convention.idea-plugin.gradle.kts

@@ -30,13 +30,7 @@ intellijPlatform {
         }
         ideaVersion {
             sinceBuild = properties("pluginSinceBuild")
-            properties("pluginUntilBuild").let {
-                if (it.isNotBlank()) {
-                    untilBuild = it
-                } else {
-                    // keep default untilBuild
-                }
-            }
+            untilBuild = properties("pluginUntilBuild")
         }
         vendor {
             name = "hh.ru"
@@ -60,6 +54,9 @@ tasks.named<Zip>("buildPlugin").configure {
 }
 
 tasks.named<RunIdeTask>("runIde").configure {
+    jvmArgumentProviders += CommandLineArgumentProvider {
+        listOf("-Didea.kotlin.plugin.use.k2=true")
+    }
     maxHeapSize = "8g"
     minHeapSize = "4g"
 }

gradle.properties

@@ -7,11 +7,11 @@ kotlin.code.style=official
 
 systemProp.gradleIntellijPluginVersion=2.2.1
 systemProp.gradleChangelogPluginVersion=2.2.1
-systemProp.kotlinVersion=1.9.21
+systemProp.kotlinVersion=2.1.0
 systemProp.detektVersion=1.23.4
 
 systemProp.androidStudioPath=/Applications/Android Studio.app/Contents
-systemProp.androidStudioPluginVersion=242.23726.103
+systemProp.androidStudioPluginVersion=251.26094.121
 
 # Opt-out flag for bundling Kotlin standard library -> https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
 # suppress inspection "UnusedProperty"

plugins/hh-carnival/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Carnival
 
+## [1.13.0]
+
+### Added
+
+- Support for Android Studio Narwhal 3 Feature Drop | 2025.1.1 (build 251.*). Older versions are not supported.
+- Support all news AS versions
+- Support K2 mode
+
 ## [1.10.0]
 
 Support for Android Studio Ladybug | 2024.2.1 Patch 2. Older versions are not supported.

plugins/hh-carnival/gradle.properties

@@ -1,2 +1,3 @@
-pluginVersion=1.11.0
-pluginSinceBuild=242.23726.103
+pluginVersion=1.13.0
+pluginSinceBuild=251.26094.121
+pluginUntilBuild=

plugins/hh-carnival/src/main/resources/META-INF/plugin.xml

@@ -124,4 +124,8 @@
                            displayType="NONE"/>
     </extensions>
 
+    <extensions defaultExtensionNs="org.jetbrains.kotlin">
+        <supportsKotlinPluginMode supportsK2="true"/>
+    </extensions>
+
 </idea-plugin>

plugins/hh-garcon/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Garcon
 
+## [1.13.0]
+
+### Added
+
+- Support for Android Studio Narwhal 3 Feature Drop | 2025.1.1 (build 251.*). Older versions are not supported.
+- Support all news AS versions
+- Support K2 mode
+
 ## [1.8.0]
 
 ### Added

plugins/hh-garcon/gradle.properties

@@ -1,2 +1,3 @@
-pluginVersion=1.9.0
-pluginSinceBuild=242.23726.103
+pluginVersion=1.13.0
+pluginSinceBuild=251.26094.121
+pluginUntilBuild=

plugins/hh-garcon/src/main/kotlin/ru/hh/plugins/garcon/config/editor/GarconPluginSettingsSearchableConfigurable.kt

@@ -51,11 +51,10 @@ class GarconPluginSettingsSearchableConfigurable(
         return panel {
             row("Config File:") {
                 textFieldWithBrowseButton(
-                    browseDialogTitle = "Config File Path",
                     project = project,
                     fileChooserDescriptor = FileChooserDescriptorFactory.createSingleFileDescriptor(
                         PluginsConstants.YAML_FILES_FILTER_EXTENSION
-                    ),
+                    ).withTitle("Config File Path"),
                     fileChosen = { chosenFile ->
                         chosenFile.presentableUrl.also {
                             applyConfigurationFromFile(it)

plugins/hh-garcon/src/main/resources/META-INF/plugin.xml

@@ -34,6 +34,10 @@
                            displayType="NONE"/>
     </extensions>
 
+    <extensions defaultExtensionNs="org.jetbrains.kotlin">
+        <supportsKotlinPluginMode supportsK2="true"/>
+    </extensions>
+
     <actions>
         <!-- Add your actions here -->
         <action class="ru.hh.plugins.garcon.actions.create_screen_page_object.CreateScreenPageObjectAction"

plugins/hh-geminio/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Geminio
 
+## [1.13.0]
+
+### Added
+
+- Support for Android Studio Narwhal 3 Feature Drop | 2025.1.1 (build 251.*). Older versions are not supported.
+- Support all news AS versions
+- Support K2 mode
+- Fix crash in Geminio Wizard dialog
+
 ## [1.11.0]
 
 Support for Android Studio Ladybug | 2024.2.1 Patch 2. Older versions are not supported.

plugins/hh-geminio/gradle.properties

@@ -1,2 +1,3 @@
-pluginVersion=1.12.0
-pluginSinceBuild=242.21829.142
+pluginVersion=1.13.0
+pluginSinceBuild=251.26094.121
+pluginUntilBuild=

plugins/hh-geminio/src/main/kotlin/ru/hh/plugins/geminio/config/editor/GeminioPluginSettingsSearchableConfigurable.kt

@@ -42,11 +42,10 @@ class GeminioPluginSettingsSearchableConfigurable(
         return panel {
             row("Config File:") {
                 textFieldWithBrowseButton(
-                    browseDialogTitle = "Config File Path",
                     project = project,
                     fileChooserDescriptor = FileChooserDescriptorFactory.createSingleFileDescriptor(
                         PluginsConstants.YAML_FILES_FILTER_EXTENSION
-                    ),
+                    ).withTitle("Config File Path"),
                     fileChosen = { chosenFile ->
                         chosenFile.presentableUrl.also {
                             applyConfigurationFromFile(it)

plugins/hh-geminio/src/main/kotlin/ru/hh/plugins/geminio/services/templates/GeminioRecipeExecutorFactoryService.kt

@@ -1,5 +1,6 @@
 package ru.hh.plugins.geminio.services.templates
 
+import com.android.sdklib.AndroidMajorVersion
 import com.android.tools.idea.gradle.plugin.AgpVersions
 import com.android.tools.idea.npw.template.ModuleTemplateDataBuilder
 import com.android.tools.idea.npw.template.ProjectTemplateDataBuilder
@@ -111,9 +112,9 @@ class GeminioRecipeExecutorFactoryService(
                 main = ThemeData(STUB_MAIN_THEME_DATA_NAME, true)
             )
             builder.apis = ApiTemplateData(
-                buildApi = createStubApiVersion(),
-                targetApi = createStubApiVersion(),
-                minApi = createStubApiVersion(),
+                buildApi = createStubAndroidVersion(),
+                targetApi = createStubAndroidMajorVersion(),
+                minApi = createStubAndroidMajorVersion(),
                 appCompatVersion = STUB_API_VERSION,
             )
             builder.category = Category.Other
@@ -134,8 +135,12 @@ class GeminioRecipeExecutorFactoryService(
             builder.setProjectDefaults(project)
         }
 
-    private fun createStubApiVersion(): ApiVersion {
-        return ApiVersion(STUB_API_VERSION, STUB_API_VERSION_STRING)
+    private fun createStubAndroidVersion(): com.android.sdklib.AndroidVersion {
+        return com.android.sdklib.AndroidVersion(STUB_API_VERSION, STUB_API_VERSION_STRING)
+    }
+
+    private fun createStubAndroidMajorVersion(): AndroidMajorVersion {
+        return AndroidMajorVersion(STUB_API_VERSION, STUB_API_VERSION_STRING)
     }
 
     private fun GeminioTemplateData.getModuleName(): String {

shared/core/psi-utils/src/main/kotlin/ru/hh/plugins/psi_utils/kotlin/KtFileExt.kt

@@ -2,7 +2,6 @@ package ru.hh.plugins.psi_utils.kotlin
 
 import com.intellij.openapi.project.DumbService
 import org.jetbrains.kotlin.idea.codeinsight.utils.commitAndUnblockDocument
-import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtPsiFactory
@@ -14,7 +13,6 @@ import ru.hh.plugins.psi_utils.reformatWithCodeStyle
 fun KtFile.shortReferencesAndReformatWithCodeStyle() {
     this.commitAndUnblockDocument()
     DumbService.getInstance(project).completeJustSubmittedTasks()
-    ShortenReferences.DEFAULT.process(this)
     this.reformatWithCodeStyle()
 }
 

shared/feature/geminio-sdk/src/main/kotlin/ru/hh/plugins/geminio/sdk/recipe/models/optional/TemplateCategory.kt

@@ -12,13 +12,16 @@ enum class TemplateCategory(
     APPLICATION("application"),
     FOLDER("folder"),
     UI_COMPONENT("ui_component"),
-    AUTOMOTIVE("automotive"),
     XML("xml"),
     WEAR("wear"),
     AIDL("aidl"),
     WIDGET("widget"),
     GOOGLE("google"),
     COMPOSE("compose"),
+    SERVICE("service"),
+    CAR("car"),
+    TV("tv"),
+    TEST("test"),
     OTHER("other");
 
     companion object {

shared/feature/geminio-sdk/src/main/kotlin/ru/hh/plugins/geminio/sdk/recipe/models/optional/TemplateFormFactor.kt

@@ -11,7 +11,8 @@ enum class TemplateFormFactor(
     MOBILE("mobile"),
     WEAR("wear"),
     TV("tv"),
-    AUTOMOTIVE("automotive"),
+    CAR("car"),
+    XR("xr"),
     GENERIC("generic");
 
     companion object {

shared/feature/geminio-sdk/src/main/kotlin/ru/hh/plugins/geminio/sdk/template/mapping/optional/TemplateCategoryMapper.kt

@@ -14,13 +14,16 @@ internal fun TemplateCategory.toAndroidStudioTemplateCategory(): AndroidStudioTe
         TemplateCategory.APPLICATION -> AndroidStudioTemplateCategory.Application
         TemplateCategory.FOLDER -> AndroidStudioTemplateCategory.Folder
         TemplateCategory.UI_COMPONENT -> AndroidStudioTemplateCategory.UiComponent
-        TemplateCategory.AUTOMOTIVE -> AndroidStudioTemplateCategory.Automotive
+        TemplateCategory.CAR -> AndroidStudioTemplateCategory.Car
         TemplateCategory.XML -> AndroidStudioTemplateCategory.XML
         TemplateCategory.WEAR -> AndroidStudioTemplateCategory.Wear
         TemplateCategory.AIDL -> AndroidStudioTemplateCategory.AIDL
         TemplateCategory.WIDGET -> AndroidStudioTemplateCategory.Widget
         TemplateCategory.GOOGLE -> AndroidStudioTemplateCategory.Google
         TemplateCategory.COMPOSE -> AndroidStudioTemplateCategory.Compose
         TemplateCategory.OTHER -> AndroidStudioTemplateCategory.Other
+        TemplateCategory.TV -> AndroidStudioTemplateCategory.TV
+        TemplateCategory.SERVICE -> AndroidStudioTemplateCategory.Service
+        TemplateCategory.TEST -> AndroidStudioTemplateCategory.Test
     }
 }

shared/feature/geminio-sdk/src/main/kotlin/ru/hh/plugins/geminio/sdk/template/mapping/optional/TemplateFormFactorMapper.kt

@@ -12,7 +12,8 @@ internal fun TemplateFormFactor.toAndroidStudioTemplateFormFactor(): AndroidStud
         TemplateFormFactor.MOBILE -> AndroidStudioTemplateFormFactor.Mobile
         TemplateFormFactor.WEAR -> AndroidStudioTemplateFormFactor.Wear
         TemplateFormFactor.TV -> AndroidStudioTemplateFormFactor.Tv
-        TemplateFormFactor.AUTOMOTIVE -> AndroidStudioTemplateFormFactor.Automotive
+        TemplateFormFactor.CAR -> AndroidStudioTemplateFormFactor.Car
+        TemplateFormFactor.XR -> AndroidStudioTemplateFormFactor.XR
         TemplateFormFactor.GENERIC -> AndroidStudioTemplateFormFactor.Generic
     }
 }