Merge pull request #117 from hhru/support-as-ladybug-242.21829.142

ikarenkov · web-flow · commit 0b3f4fe4da3e · 2024-12-17T19:08:55.000+07:00
Support as ladybug 242.21829.142
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,8 +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.1.1.11/android-studio-2024.1.1.11-linux.tar.gz
-  COMPILER_VERSION: 241.15989.15
+  ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.3.1.2/android-studio-2024.3.1.2-linux.tar.gz
 
 jobs:
   build:
@@ -25,6 +24,4 @@ jobs:
       - name: Build plugins
         run: |
           ./gradlew buildAllPlugins \
-            -DandroidStudioPath="$(pwd)/android-studio" \
-            -DandroidStudioCompilerVersion="$COMPILER_VERSION" \
-            -DandroidStudioPluginsNames="org.jetbrains.android,org.jetbrains.kotlin,com.intellij.java,org.intellij.groovy,Git4Idea,org.intellij.intelliLang"
+            -DandroidStudioPath="$(pwd)/android-studio"
diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -7,8 +7,7 @@ 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/2024.1.1.11/android-studio-2024.1.1.11-linux.tar.gz
-  COMPILER_VERSION: 241.15989.15
+  ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.2.1.9/android-studio-2024.2.1.9-linux.tar.gz
 
 jobs:
   build:
@@ -29,9 +28,7 @@ jobs:
       - name: Build plugins
         run: |
           ./gradlew buildAllPlugins \
-            -DandroidStudioPath="$(pwd)/android-studio" \
-            -DandroidStudioCompilerVersion="$COMPILER_VERSION" \
-            -DandroidStudioPluginsNames="org.jetbrains.android,org.jetbrains.kotlin,com.intellij.java,org.intellij.groovy,Git4Idea,org.intellij.intelliLang"
+            -DandroidStudioPath="$(pwd)/android-studio"
       - name: Publish plugins
         uses: softprops/action-gh-release@v1
         env:
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@
 
 1. Убедитесь, что у вас есть Intellij IDEA (минимум CE) с подключенным Plugin Dev Kit
 2. Склонировать проект
-3. Если вы скачивали Android Studio через Toolbox, или у вас не Mac OS, то вероятно вам потребуется изменить путь к локальной версии Android Studio, который указывается [вот здесь](/libraries/src/main/kotlin/ru/hh/plugins/ExternalLibrariesExtension.kt) - объект `Product.LOCAL`
+3. Если вы скачивали Android Studio через Toolbox, или у вас не Mac OS, то вероятно вам потребуется изменить путь к локальной версии Android Studio, который указывается [вот здесь](./libraries/src/main/kotlin/ru/hh/plugins/ExternalLibrariesExtension.kt) - объект `Product.LOCAL`
 4. Запустить gradle-таску `buildPlugin` в проекте нужного плагина
 5. Собранный zip-архив плагина можно подключить в Android Studio через `Preferences -> Plugins -> Install from disk`
 
diff --git a/build-logic/idea-convention/src/main/kotlin/convention.idea-plugin-base.gradle.kts b/build-logic/idea-convention/src/main/kotlin/convention.idea-plugin-base.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 configure<IntelliJPluginExtension> {
-    type.set("IC")
+    type.set("AI")
 
     val currentVersion = Libs.chosenIdeaVersion
     when (currentVersion) {
diff --git a/docs/geminio/geminio_support_new_android_studio.md b/docs/geminio/geminio_support_new_android_studio.md
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ systemProp.kotlinVersion=1.9.21
 systemProp.detektVersion=1.23.4
 
 systemProp.androidStudioPath=/Applications/Android Studio.app/Contents
-systemProp.androidStudioCompilerVersion=241.15989.15
+systemProp.androidStudioCompilerVersion=242.21829.142
 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
diff --git a/libraries/src/main/kotlin/ru/hh/plugins/ExternalLibrariesExtension.kt b/libraries/src/main/kotlin/ru/hh/plugins/ExternalLibrariesExtension.kt
@@ -31,7 +31,7 @@ abstract class ExternalLibrariesExtension @Inject constructor(private val provid
     val kotlinStdlibJdk7 = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     val kotlinStdlibJdk8 = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
     val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
-    val kotlinHtml = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2"
+    val kotlinHtml = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3"
     val kotlinCompilerEmbeddable = "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion"
 
     val freemarker = "org.freemarker:freemarker:2.3.30"
diff --git a/plugins/hh-carnival/CHANGELOG.md b/plugins/hh-carnival/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Carnival
 
+## [1.10.0]
+
+Support for Android Studio Ladybug | 2024.2.1 Patch 2. Older versions are not supported.
+
 ## [1.9.0]
 
 ### Added
@@ -20,71 +24,105 @@
   from https://github.com/hhru/android-multimodule-plugin/pull/95 .
 
 ## [1.8.0]
+
 ### Added
+
 - Support for Android Studio Jellyfish | 2023.3.1
 
 ## [1.7.0]
+
 ### Added
+
 - Support for Android Studio Iguana | 2023.2.1
 
 ## [1.6.0]
+
 ### Added
+
 - Support for Android Studio Hedgehog | 2023.1.1
 
 ## [1.5.0]
+
 ### Added
+
 - Support for Android Studio Giraffe | 2022.3.1
 
 ## [1.4.0]
+
 ### Added
+
 - Support for Android Studio Flamingo | 2022.2.1
 
 ## [1.3.0]
+
 ### Added
+
 - Support for Android Studio Electric Eel | 2022.1.1
 
 ## [1.2.0]
+
 ### Added
+
 - Support compilation for Android Studio Dolphin | 2021.3.1
 
 ## [1.1.7]
+
 ### Added
+
 - Support for Android Studio Chipmunk | 2021.2.1
 
 ## [1.1.6]
+
 ### Added
+
 - Support for Android Studio Bumblebee | 2021.1.1
 
 ## [1.1.5]
+
 ### Added
+
 - Support for Android Studio Arctic Fox | 2020.3.1
 
 ## [1.1.4]
+
 ### Added
+
 - [Gradle Changelog Plugin](https://github.com/JetBrains/gradle-changelog-plugin) integration.
 - Support for Android Studio 4.2
 
 ### Changed
-- Now we configure plugin modules with [gradle convention plugins](https://docs.gradle.org/current/samples/sample_convention_plugins.html);
+
+- Now we configure plugin modules
+  with [gradle convention plugins](https://docs.gradle.org/current/samples/sample_convention_plugins.html);
 - Upgrade Gradle Wrapper to `7.0`;
 
 ## [1.1.3]
+
 ### Fixed
+
 - Fix bug with duplicated service.
 
 ## [1.1.2]
+
 ### Added
+
 - Generate ViewModel for BaseFragment. All code was hardcoded inside plugin.
 
 ## [1.1.0]
+
 ### Changed
-- Remove action for generating new module - this functionality will be available through Geminio plugin.
+
+- Remove action for generating new module - this functionality will be available through Geminio
+  plugin.
 
 ## [1.0.0]
+
 ### Added
+
 - Initial project release;
 - Action for generating new feature module;
-- Small actions for quick code generation: EMPTY object generator, @SerializedName annotations generator
+- Small actions for quick code generation: EMPTY object generator, @SerializedName annotations
+  generator
 - Action for creating new JIRA issue for develop branch merge;
 - Lint inspections for resources;
 - Annotator for deprecated XML-resources.
diff --git a/plugins/hh-carnival/gradle.properties b/plugins/hh-carnival/gradle.properties
@@ -1,6 +1,6 @@
-pluginVersion=1.9.0
+pluginVersion=1.10.0
 
 pluginGroup=ru.hh.plugins
 pluginName=hh-carnival
 
-pluginSinceBuild=241.15989.15
+pluginSinceBuild=242.21829.142
diff --git a/plugins/hh-geminio/CHANGELOG.md b/plugins/hh-geminio/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Geminio
 
+## [1.11.0]
+
+Support for Android Studio Ladybug | 2024.2.1 Patch 2. Older versions are not supported.
+
 ## [1.10.0]
 
 ### Added
@@ -64,8 +68,10 @@
 
 ### Added
 
-- New `currentDirPackageName` parameter in FTL - add package name from selected folder in specified module.
-- New `currentDirOut` parameter in recipes - path to selected directory that launched Geminio's action.
+- New `currentDirPackageName` parameter in FTL - add package name from selected folder in specified
+  module.
+- New `currentDirOut` parameter in recipes - path to selected directory that launched Geminio's
+  action.
 - Improvements for docs.
 
 ## [1.4.1]
@@ -209,7 +215,8 @@
 ### Added
 
 - Add new command for recipe: `addDependencies` for adding dependencies into build.gradle file;
-- New hardcoded parameter in FTL-files: `applicationPackage` - it is package name from AndroidManifest.xml file.
+- New hardcoded parameter in FTL-files: `applicationPackage` - it is package name from
+  AndroidManifest.xml file.
 
 ## [1.0.0]
 
diff --git a/plugins/hh-geminio/gradle.properties b/plugins/hh-geminio/gradle.properties
@@ -1,6 +1,6 @@
-pluginVersion=1.10.0
+pluginVersion=1.11.0
 
 pluginGroup=ru.hh.plugins
 pluginName=hh-geminio
 
-pluginSinceBuild=241.15989.15
+pluginSinceBuild=242.21829.142
diff --git a/shared/core/ui/src/main/kotlin/ru/hh/plugins/views/layouts/FileChooserButton.kt b/shared/core/ui/src/main/kotlin/ru/hh/plugins/views/layouts/FileChooserButton.kt
diff --git a/shared/core/utils/src/main/kotlin/ru/hh/plugins/extensions/openapi/ModuleExt.kt b/shared/core/utils/src/main/kotlin/ru/hh/plugins/extensions/openapi/ModuleExt.kt
@@ -29,7 +29,7 @@ fun Module.isAndroidAppModule(): Boolean {
      *
      * To remove these submodules we add this condition.
      */
-    val isHolderModule = this == androidFacet?.holderModule
+    val isHolderModule = this == androidFacet?.module
 
     return isAppProject && isHolderModule
 }
diff --git a/shared/core/utils/src/main/kotlin/ru/hh/plugins/extensions/openapi/ProjectExt.kt b/shared/core/utils/src/main/kotlin/ru/hh/plugins/extensions/openapi/ProjectExt.kt
@@ -3,8 +3,8 @@ package ru.hh.plugins.extensions.openapi
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.modules
 import com.intellij.psi.codeStyle.CodeStyleManager
-import org.jetbrains.kotlin.idea.util.projectStructure.allModules
 import ru.hh.plugins.extensions.SPACE
 import ru.hh.plugins.extensions.UNDERSCORE
 import ru.hh.plugins.logger.HHLogger
@@ -29,7 +29,7 @@ fun Project.executeWithoutCodeStyle(action: () -> Unit) {
  * Application module - module with applied `com.android.application` gradle plugin.
  */
 fun Project.getAndroidApplicationsModules(): List<Module> {
-    return allModules().filter { it.isAndroidAppModule() }
+    return modules.asList().filter { it.isAndroidAppModule() }
 }
 
 /**
@@ -38,7 +38,7 @@ fun Project.getAndroidApplicationsModules(): List<Module> {
  * Library module - module with applied `com.android.library` or `java-library` gradle plugins.
  */
 fun Project.getLibrariesModules(): List<Module> {
-    return allModules().filter { it.isAndroidLibraryModule() }
+    return modules.asList().filter { it.isAndroidLibraryModule() }
 }
 
 fun Project.getRootModule(): Module {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ plugins {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`configure<IntelliJPluginExtension> {`
`13`		`- type.set("IC")`
	`13`	`+ type.set("AI")`
`14`	`14`
`15`	`15`	`val currentVersion = Libs.chosenIdeaVersion`
`16`	`16`	`when (currentVersion) {`