Mob 35191 support android studio hedgehog (#103)

* [support_hedgehog] Обновляет версии Gradle, Kotlin, gradle-intellij-plugin, detekt

* [support_hedgehog] Поднимает максимальный объём памяти для запуска IDE из проекта с плагинами

* [support_hedgehog] Поднимает версию для запуска плагинов под Android Studio Hedgehog

* [support_hedgehog] Исправляет константы для сборки плагинов через Github Actions

* [support_hedgehog] Поднимает версии плагинов

* [support_hedgehog] Исправляет замечания detekt

* [support_hedgehog] Поднимает версию github action, запускающего detekt

.github/workflows/build.yml

@@ -3,8 +3,8 @@ 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/2022.3.1.18/android-studio-2022.3.1.18-linux.tar.gz
-  COMPILER_VERSION: 223.8836.35
+  ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2023.1.1.26/android-studio-2023.1.1.26-linux.tar.gz
+  COMPILER_VERSION: 231.9392.1
 
 jobs:
   build:

.github/workflows/release_build.yml

@@ -7,8 +7,8 @@ on:
 
 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/2022.3.1.18/android-studio-2022.3.1.18-linux.tar.gz
-  COMPILER_VERSION: 223.8836.35
+  ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2023.1.1.26/android-studio-2023.1.1.26-linux.tar.gz
+  COMPILER_VERSION: 231.9392.1
 
 jobs:
   build:

.github/workflows/static_analysis.yml

@@ -11,7 +11,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: detekt
-        uses: alaegin/Detekt-Action@v1.19
+        uses: alaegin/Detekt-Action@v1.23.4
         with:
           github_token: ${{ secrets.github_token }}
           detekt_config: build-logic/static-analysis-convention/rules/detekt/detekt-config.yaml

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

@@ -68,6 +68,6 @@ tasks.getByName<Zip>("buildPlugin") {
 }
 
 tasks.getByName<RunIdeTask>("runIde") {
-    maxHeapSize = "4g"
+    maxHeapSize = "8g"
     minHeapSize = "4g"
 }

build-logic/static-analysis-convention/src/main/kotlin/convention.static-analysis.detekt.gradle.kts

@@ -53,7 +53,7 @@ val detektFormat by tasks.register<Detekt>("detektFormat") {
 
     // Configuration
     val staticAnalysisExtension = project.extensions.getByName<StaticAnalysisExtension>("staticAnalysis")
-    config.setFrom(staticAnalysisExtension.detekt.formatPath)
+    config.setFrom(staticAnalysisExtension.detekt.configPath)
 }
 
 val detektProjectBaseline by tasks.register<DetektCreateBaselineTask>("detektProjectBaseline") {

build-logic/static-analysis-convention/src/main/kotlin/ru/hh/plugins/static_analysis/DetektConfigExtension.kt

@@ -4,6 +4,5 @@ import java.io.File
 
 class DetektConfigExtension(
     var configPath: Iterable<*>? = null,
-    var formatPath: Iterable<*>? = null,
     var baselinePath: File? = null
 )

build-logic/testing-convention/src/main/kotlin/convention.unit-testing.gradle.kts

@@ -28,7 +28,7 @@ tasks.withType<Test>().configureEach {
     }
 }
 
-plugins.withType<KotlinBasePluginWrapper>() {
+plugins.withType<KotlinBasePluginWrapper> {
     dependencies {
         add("testImplementation", Libs.tests.kotest)
     }

gradle.properties

@@ -5,13 +5,13 @@ org.gradle.caching=false
 kotlin.parallel.tasks.in.project=true
 kotlin.code.style=official
 
-systemProp.gradleIntellijPluginVersion=1.15.0
+systemProp.gradleIntellijPluginVersion=1.16.0
 systemProp.gradleChangelogPluginVersion=2.1.2
-systemProp.kotlinVersion=1.9.0
-systemProp.detektVersion=1.22.0
+systemProp.kotlinVersion=1.9.21
+systemProp.detektVersion=1.23.4
 
 systemProp.androidStudioPath=/Applications/Android Studio.app/Contents
-systemProp.androidStudioCompilerVersion=223.8836.35
+systemProp.androidStudioCompilerVersion=231.9392.1
 systemProp.androidStudioPluginsNames=org.jetbrains.android,org.jetbrains.kotlin,com.intellij.java,org.intellij.groovy,Git4Idea,org.intellij.intelliLang
 
 # Opt-out flag for bundling Kotlin standard library -> https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

plugins/hh-carnival/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Carnival
 
+## [1.6.0]
+### Added
+- Support for Android Studio Hedgehog | 2023.1.1
+
 ## [1.5.0]
 ### Added
 - Support for Android Studio Giraffe | 2022.3.1

plugins/hh-carnival/gradle.properties

@@ -1,4 +1,4 @@
-pluginVersion=1.5.0
+pluginVersion=1.6.0
 
 pluginGroup=ru.hh.plugins
 pluginName=hh-carnival

plugins/hh-carnival/src/main/kotlin/ru/hh/android/plugin/config/JiraSettingsConfig.kt

@@ -30,8 +30,9 @@ class JiraSettingsConfig : PersistentStateComponent<Credentials> {
         get() {
             val keyFile = File(KEY_FILE_NAME)
 
-            if (!keyFile.exists())
+            if (!keyFile.exists()) {
                 keyFile.createNewFile()
+            }
 
             val reader = FileReader(KEY_FILE_NAME)
             val hostname = reader.readText()

plugins/hh-carnival/src/main/kotlin/ru/hh/android/plugin/config/view/PluginConfigEditor.kt

@@ -107,8 +107,8 @@ class PluginConfigEditor(
             initialJiraUsername != jiraUsernameTextField.text ||
             initialJiraPassword != jiraPasswordTextField.text ||
             initialJiraDevelopmentTeam != JiraDevelopmentTeam.fromLabel(
-            jiraDevelopmentTeamComboBoxModel.selected.orEmpty()
-        )
+                jiraDevelopmentTeamComboBoxModel.selected.orEmpty()
+            )
     }
 
     fun applyNewConfiguration(project: Project, pluginConfig: PluginConfig) {

plugins/hh-carnival/src/main/kotlin/ru/hh/android/plugin/inspections/PutSerializableDetector.kt

@@ -101,7 +101,10 @@ class PutSerializableDetector : Detector(), SourceCodeScanner {
                 .mapNotNull { checkIsSerializable(it.type as PsiClassReferenceType, checkedPsiClass, "${ktUltraLightClass.name}") }
                 .firstOrNull()
         }
-        logger.debug("\tChecked all inner fields for inheritance, is fully serializable: is serializable ${result == null} [time: $checkTime ms]")
+        logger.debug(
+            "\tChecked all inner fields for inheritance, is fully serializable: " +
+                "is serializable ${result == null} [time: $checkTime ms]"
+        )
 
         result?.let { pathToFirstNotSerializableObject ->
             logger.debug("----- END need report issue -----")
@@ -137,7 +140,13 @@ class PutSerializableDetector : Detector(), SourceCodeScanner {
                     it.type.canonicalText.endsWith("Companion").not() &&
                     it.type.canonicalText.equals(ktLightClassForSourceDeclaration.type().canonicalText).not()
             }
-            .mapNotNull { checkIsSerializable(it.type as PsiClassReferenceType, checkedClass, "$objectPath.${ktLightClassForSourceDeclaration.name}") }
+            .mapNotNull {
+                checkIsSerializable(
+                    it.type as PsiClassReferenceType,
+                    checkedClass,
+                    "$objectPath.${ktLightClassForSourceDeclaration.name}"
+                )
+            }
             .firstOrNull()
     }
 

plugins/hh-carnival/src/main/kotlin/ru/hh/android/plugin/services/code_generator/EmptyObjectGeneratorService.kt

@@ -58,7 +58,9 @@ class EmptyObjectGeneratorService(
 
     private fun KtClass.getEmptyObjectPropertyDeclaration(): String {
         val emptyProperties = primaryConstructorParameters.joinToString(
-            prefix = "\n", postfix = "\n", separator = ",\n"
+            prefix = "\n",
+            postfix = "\n",
+            separator = ",\n"
         ) { parameter ->
             "${parameter.name} = ${parameter.getEmptyObjectValue()}"
         }

plugins/hh-garcon/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Garcon
 
+## [1.5.0]
+### Added
+- Support for Android Studio Hedgehog | 2023.1.1
+
 ## [1.4.0]
 ### Added
 - Support for Android Studio Giraffe | 2022.3.1

plugins/hh-garcon/gradle.properties

@@ -1,4 +1,4 @@
-pluginVersion=1.4.0
+pluginVersion=1.5.0
 
 pluginGroup=ru.hh.plugins
 pluginName=hh-garcon

plugins/hh-garcon/src/main/kotlin/ru/hh/plugins/garcon/actions/collect_kakao_views/CollectWidgetsIntoPageObjectAction.kt

@@ -61,7 +61,9 @@ class CollectWidgetsIntoPageObjectAction : XmlLayoutCodeInsightAction() {
             if (params.openInEditor) {
                 params.targetClass.containingKtFile.openInEditor()
             }
-            HHNotifications.info(message = "Collecting Kakao widgets for '${params.targetClass.name}' successfully finished")
+            HHNotifications.info(
+                message = "Collecting Kakao widgets for '${params.targetClass.name}' successfully finished"
+            )
         }
     }
 

plugins/hh-garcon/src/main/kotlin/ru/hh/plugins/garcon/actions/collect_kakao_views/CollectWidgetsIntoPageObjectDialog.kt

@@ -75,7 +75,8 @@ class CollectWidgetsIntoPageObjectDialog(
         if (isFormValid()) {
             targetClass?.let { aClass ->
                 RecentsManager.getInstance(project).registerRecentEntry(
-                    GarconConstants.RecentsKeys.TARGET_SCREEN_CLASS, aClass.getKotlinFqName().toString()
+                    GarconConstants.RecentsKeys.TARGET_SCREEN_CLASS,
+                    aClass.getKotlinFqName().toString()
                 )
             }
             PropertiesComponent.getInstance()

plugins/hh-garcon/src/main/kotlin/ru/hh/plugins/garcon/actions/create_recycler_item_page_object/CreateRecyclerItemPageObjectDialog.kt

@@ -44,7 +44,8 @@ class CreateRecyclerItemPageObjectDialog(
         if (isFormValid()) {
             targetClass?.let { aClass ->
                 RecentsManager.getInstance(project).registerRecentEntry(
-                    GarconConstants.RecentsKeys.TARGET_SCREEN_CLASS, aClass.getKotlinFqName().toString()
+                    GarconConstants.RecentsKeys.TARGET_SCREEN_CLASS,
+                    aClass.getKotlinFqName().toString()
                 )
             }
             PropertiesComponent.getInstance()

plugins/hh-garcon/src/main/kotlin/ru/hh/plugins/garcon/services/ClassFiltersFactory.kt

@@ -4,6 +4,7 @@ import com.intellij.ide.util.ClassFilter
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiClass
 import com.intellij.psi.util.InheritanceUtil
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
 import org.jetbrains.kotlin.psi.KtClass
@@ -17,16 +18,19 @@ class ClassFiltersFactory {
     }
 
     fun createKakaoScreensClassFilter(): ClassFilter {
-        return ClassFilter { aClass ->
-            return@ClassFilter if (aClass is KtLightClassForSourceDeclaration) {
-                when (val classOrObject = aClass.kotlinOrigin) {
-                    is KtClass -> (classOrObject.isInner() || classOrObject.isAnnotation()).not() &&
-                        InheritanceUtil.isInheritor(aClass, GarconConstants.AGODA_SCREEN_CLASS_FQN)
-                    else -> false
-                }
-            } else {
-                false
+        return ClassFilter { isAccepted(it) }
+    }
+
+    private fun isAccepted(aClass: PsiClass?): Boolean {
+        return if (aClass is KtLightClassForSourceDeclaration) {
+            when (val classOrObject = aClass.kotlinOrigin) {
+                is KtClass -> (classOrObject.isInner() || classOrObject.isAnnotation()).not() &&
+                    InheritanceUtil.isInheritor(aClass, GarconConstants.AGODA_SCREEN_CLASS_FQN)
+
+                else -> false
             }
+        } else {
+            false
         }
     }
 }

plugins/hh-geminio/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Geminio
 
+## [1.7.0]
+### Added
+- Support for Android Studio Hedgehog | 2023.1.1
 
 ## [1.6.1]
 

plugins/hh-geminio/gradle.properties

@@ -1,4 +1,4 @@
-pluginVersion=1.6.1
+pluginVersion=1.7.0
 
 pluginGroup=ru.hh.plugins
 pluginName=hh-geminio

plugins/hh-geminio/src/main/kotlin/ru/hh/plugins/geminio/actions/module_template/ExecuteGeminioModuleTemplateAction.kt

@@ -119,7 +119,6 @@ class ExecuteGeminioModuleTemplateAction(
 
                 try {
                     project.executeWriteCommand(COMMAND_RECIPE_EXECUTION) {
-
                         with(recipeExecutorModel) {
                             geminioTemplateData.androidStudioTemplate.recipe.invoke(
                                 recipeExecutor,
@@ -139,7 +138,10 @@ class ExecuteGeminioModuleTemplateAction(
                     dialog.disposeIfNeeded()
                     dialog.close(1)
 
-                    HHNotifications.error(message = "Some error occurred when '$actionText' executed. Check warnings at the bottom right corner.")
+                    HHNotifications.error(
+                        message = "Some error occurred when '$actionText' executed. " +
+                            "Check warnings at the bottom right corner."
+                    )
                     throw ex
                 }
             }

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

@@ -58,10 +58,16 @@ class GeminioStartupActivity : StartupActivity {
             override fun windowActivated(e: WindowEvent?) {
                 val lastProject = lastViewedProject.get()
                 if (lastProject != project) {
-                    HHLogger.d("Project changed -> rescan Geminio's actions [old project name: `${lastProject.name}`, new project.name: `${project.name}`]")
+                    HHLogger.d(
+                        "Project changed -> rescan Geminio's actions " +
+                            "[old project name: `${lastProject.name}`, new project.name: `${project.name}`]"
+                    )
                     rescanTemplateActions(project)
                 } else {
-                    HHLogger.d("Activated project is the same as previous -> no need to rescan Geminio's actions [project.name: `${project.name}`]")
+                    HHLogger.d(
+                        "Activated project is the same as previous -> " +
+                            "no need to rescan Geminio's actions [project.name: `${project.name}`]"
+                    )
                 }
             }
 

shared/core/code-modification/src/main/kotlin/ru/hh/plugins/code_modification/BuildGradleModificationService.kt

@@ -64,6 +64,7 @@ class BuildGradleModificationService(
                 HHLogger.e(
                     "Can't find `$BUILD_GRADLE_FILENAME` or `$BUILD_GRADLE_KTS_FILENAME` file in rootDir ($rootDir)"
                 )
+                @Suppress("detekt.LabeledExpression")
                 return@wrapInCommand
             }
 
@@ -77,6 +78,7 @@ class BuildGradleModificationService(
         isInWriteCommand: Boolean = false
     ) {
         wrapInCommand(isInWriteCommand) {
+            @Suppress("detekt.LabeledExpression")
             val buildGradleFile = rootDir?.findFile(BUILD_GRADLE_FILENAME)
                 ?: rootDir?.findFile(BUILD_GRADLE_KTS_FILENAME)
                 ?: return@wrapInCommand

shared/core/utils/src/main/kotlin/ru/hh/plugins/extensions/AnActionEventExt.kt

@@ -7,6 +7,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiElement
 
 fun AnActionEvent.getSelectedPsiElement(): PsiElement? = getData(PlatformDataKeys.PSI_ELEMENT)
+
 @Suppress("detekt.UseCheckOrError")
 fun AnActionEvent.getTargetDirectory(): VirtualFile {
     val currentVirtualFile = CommonDataKeys.VIRTUAL_FILE.getData(dataContext)

shared/feature/geminio-sdk/src/main/kotlin/ru/hh/plugins/geminio/sdk/GeminioSdk.kt

@@ -17,5 +17,4 @@ interface GeminioSdk {
         geminioRecipe: GeminioRecipe,
         targetDirectory: VirtualFile,
     ): GeminioTemplateData
-
 }

shared/feature/geminio-sdk/src/main/kotlin/ru/hh/plugins/geminio/sdk/template/executors/InstantiateCommandExecutor.kt

@@ -17,10 +17,8 @@ internal fun RecipeExecutor.execute(
     val to = command.to.evaluateString(targetDirectory, moduleTemplateData, existingParametersMap)
 
     HHLogger.d("Instantiate command [command: $command, from: $from, to: $to]")
-    if (from == null || to == null) {
-        throw IllegalArgumentException(
-            "Cannot evaluate 'from' or 'to' expressions [command: $command, from: $from, to: $to]"
-        )
+    require(from != null && to != null) {
+        "Cannot evaluate 'from' or 'to' expressions [command: $command, from: $from, to: $to]"
     }
     val fileText = freemarkerConfiguration.resolveTemplate(from, resolvedParamsMap)
     save(fileText, File(to))

shared/feature/geminio-sdk/src/main/kotlin/ru/hh/plugins/geminio/sdk/template/executors/OpenCommandExecutor.kt

@@ -16,10 +16,8 @@ internal fun RecipeExecutor.execute(
     val filePath = command.file.evaluateString(targetDirectory, moduleTemplateData, existingParametersMap)
 
     HHLogger.d("Open command [filePath: $filePath]")
-    if (filePath == null) {
-        throw IllegalArgumentException(
-            "Cannot find file for Open command [command: $command, evaluated path: $filePath]"
-        )
+    require(filePath != null) {
+        "Cannot find file for Open command [command: $command, evaluated path: $filePath]"
     }
 
     open(File(filePath))

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

@@ -97,7 +97,6 @@ private fun getHardcodedParamsMap(
         )
     }
 
-
     return mapOf(
         HardcodedParams.PACKAGE_NAME to packageName,
         HardcodedParams.APPLICATION_PACKAGE to applicationPackage,

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

@@ -26,7 +26,9 @@ internal fun RecipeExpression.evaluateBoolean(
     return when (expressionCommands.size) {
         0 -> true
         1 -> expressionCommands[0].resolveBooleanValue(existingParametersMap)
-        else -> throw IllegalArgumentException("Unexpected commands for boolean parameter evaluation [$expressionCommands]")
+        else -> throw IllegalArgumentException(
+            "Unexpected commands for boolean parameter evaluation [$expressionCommands]"
+        )
     }
 }