Support for Android Studio Jellyfish (#109)

hhru · May 13, 2024 · 56a6a4b · 56a6a4b
1 parent e45f1a1
commit 56a6a4b
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.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/2023.2.1.23/android-studio-2023.2.1.23-linux.tar.gz
-  COMPILER_VERSION: 232.10227.8
+  ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2023.3.1.18/android-studio-2023.3.1.18-linux.tar.gz
+  COMPILER_VERSION: 233.14808.21
 
 jobs:
   build:

diff --git a/.github/workflows/release_build.yml b/.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/2023.2.1.23/android-studio-2023.2.1.23-linux.tar.gz
-  COMPILER_VERSION: 232.10227.8
+  ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2023.3.1.18/android-studio-2023.3.1.18-linux.tar.gz
+  COMPILER_VERSION: 233.14808.21
 
 jobs:
   build:

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=232.10227.8
+systemProp.androidStudioCompilerVersion=233.14808.21
 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/plugins/hh-carnival/CHANGELOG.md b/plugins/hh-carnival/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Carnival
 
+## [1.8.0]
+### Added
+- Support for Android Studio Jellyfish | 2023.3.1
+
 ## [1.7.0]
 ### Added
 - Support for Android Studio Iguana | 2023.2.1

diff --git a/plugins/hh-carnival/gradle.properties b/plugins/hh-carnival/gradle.properties
@@ -1,4 +1,4 @@
-pluginVersion=1.7.0
+pluginVersion=1.8.0
 
 pluginGroup=ru.hh.plugins
 pluginName=hh-carnival

diff --git a/plugins/hh-garcon/CHANGELOG.md b/plugins/hh-garcon/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Garcon
 
+## [1.7.0]
+### Added
+- Support for Android Studio Jellyfish | 2023.3.1
+
 ## [1.6.0]
 ### Added
 - Support for Android Studio Iguana | 2023.2.1

diff --git a/plugins/hh-garcon/gradle.properties b/plugins/hh-garcon/gradle.properties
@@ -1,4 +1,4 @@
-pluginVersion=1.6.0
+pluginVersion=1.7.0
 
 pluginGroup=ru.hh.plugins
 pluginName=hh-garcon

diff --git a/plugins/hh-geminio/CHANGELOG.md b/plugins/hh-geminio/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Geminio
 
+## [1.9.0]
+### Added
+- Support for Android Studio Jellyfish | 2023.3.1
+
 ## [1.8.0]
 ### Added
 - Support for Android Studio Iguana | 2023.2.1

diff --git a/plugins/hh-geminio/gradle.properties b/plugins/hh-geminio/gradle.properties
@@ -1,4 +1,4 @@
-pluginVersion=1.8.0
+pluginVersion=1.9.0
 
 pluginGroup=ru.hh.plugins
 pluginName=hh-geminio

diff --git a/shared/core/psi-utils/src/main/kotlin/ru/hh/plugins/psi_utils/kotlin/KtFileExt.kt b/shared/core/psi-utils/src/main/kotlin/ru/hh/plugins/psi_utils/kotlin/KtFileExt.kt
@@ -1,8 +1,8 @@
 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.idea.formatter.commitAndUnblockDocument
 import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtPsiFactory