From 456eb0c257d4f54308c3baec1600f31566e69431 Mon Sep 17 00:00:00 2001 From: Pavel Strelchenko <40827829+PStrelchenko@users.noreply.github.com> Date: Wed, 3 May 2023 14:01:45 +0600 Subject: [PATCH] Mob 30327 support for android studio flamingo (#85) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [MOB-30327] Обновляет зависимости проекта * [MOB-30327] Обновляет Github Actions для скачивания нужного архива * [MOB-30327] Обновляет версии плагинов * [MOB-30327] Триггерит пересборку * [MOB-30327] Повышает версию Java * [MOB-30327] Повышаем максимальный размер heap --- .github/workflows/build.yml | 4 ++-- .github/workflows/release_build.yml | 4 ++-- .idea/kotlinc.xml | 6 ++++++ .idea/misc.xml | 2 +- README.md | 6 +++--- .../src/main/kotlin/convention.idea-plugin-base.gradle.kts | 4 ++-- gradle.properties | 7 ++++--- .../kotlin/ru/hh/plugins/ExternalLibrariesExtension.kt | 1 - plugins/hh-carnival/CHANGELOG.md | 4 ++++ plugins/hh-carnival/gradle.properties | 3 ++- plugins/hh-garcon/CHANGELOG.md | 4 ++++ plugins/hh-garcon/gradle.properties | 2 +- plugins/hh-geminio/CHANGELOG.md | 6 ++++++ plugins/hh-geminio/gradle.properties | 2 +- 14 files changed, 38 insertions(+), 17 deletions(-) create mode 100644 .idea/kotlinc.xml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9c71624..dea9e8c0 100644 --- 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/2022.1.1.20/android-studio-2022.1.1.20-linux.tar.gz - COMPILER_VERSION: 221.6008.13 + ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2022.2.1.19/android-studio-2022.2.1.19-linux.tar.gz + COMPILER_VERSION: 222.4459.24 jobs: build: diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index a2a937e0..ed57dfa9 100644 --- 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/2022.1.1.20/android-studio-2022.1.1.20-linux.tar.gz - COMPILER_VERSION: 221.6008.13 + ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2022.2.1.19/android-studio-2022.2.1.19-linux.tar.gz + COMPILER_VERSION: 222.4459.24 jobs: build: diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 00000000..69e86158 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 4b0a7b87..2093826c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/README.md b/README.md index 66e916ff..923b411a 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ ### Список плагинов в репозитории -- [hh-carnival](/plugins/hh-carnival) - плагин для быстрого создания нового feature-модуля, который также добавляет ещё немного полезных вещей -- [hh-garcon](/plugins/hh-garcon) - плагин для быстрого создания Page Object-ов из XML-вёрстки -- [hh-geminio](/plugins/hh-geminio) - плагин, добавляющий возможность создавать свои шаблоны кода на основе FreeMarker-а +- [hh-carnival](./plugins/hh-carnival) - плагин для быстрого создания нового feature-модуля, который также добавляет ещё немного полезных вещей +- [hh-garcon](./plugins/hh-garcon) - плагин для быстрого создания Page Object-ов из XML-вёрстки +- [hh-geminio](./plugins/hh-geminio) - плагин, добавляющий возможность создавать свои шаблоны кода на основе FreeMarker-а ### Чтобы собрать любой из плагинов, нужно 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 index ef8f63c6..b2644cf2 100644 --- 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 @@ -1,6 +1,6 @@ import org.gradle.kotlin.dsl.configure import org.jetbrains.intellij.IntelliJPluginExtension -import org.jetbrains.intellij.tasks.IntelliJInstrumentCodeTask +import org.jetbrains.intellij.tasks.InstrumentCodeTask import ru.hh.plugins.ExternalLibrariesExtension plugins { @@ -24,7 +24,7 @@ configure { plugins.set(currentVersion.pluginsNames) } -tasks.getByName("instrumentCode") { +tasks.getByName("instrumentCode") { val currentVersion = Libs.chosenIdeaVersion if (currentVersion is ExternalLibrariesExtension.Product.LocalIde) { compilerVersion.set(currentVersion.compilerVersion) diff --git a/gradle.properties b/gradle.properties index 3c73adc5..71b29c7d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,17 @@ +org.gradle.jvmargs=-Xmx4g org.gradle.parallel=true org.gradle.caching=false kotlin.parallel.tasks.in.project=true kotlin.code.style=official -systemProp.gradleIntellijPluginVersion=1.12.0 +systemProp.gradleIntellijPluginVersion=1.13.3 systemProp.gradleChangelogPluginVersion=1.3.1 -systemProp.kotlinVersion=1.8.0 +systemProp.kotlinVersion=1.8.20 systemProp.detektVersion=1.22.0 systemProp.androidStudioPath=/Applications/Android Studio.app/Contents -systemProp.androidStudioCompilerVersion=221.6008.13 +systemProp.androidStudioCompilerVersion=222.4459.24 systemProp.androidStudioPluginsNames=android,Kotlin,java,Groovy,git4idea,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 index 2da8321a..e8ad3b00 100644 --- a/libraries/src/main/kotlin/ru/hh/plugins/ExternalLibrariesExtension.kt +++ b/libraries/src/main/kotlin/ru/hh/plugins/ExternalLibrariesExtension.kt @@ -168,7 +168,6 @@ abstract class ExternalLibrariesExtension @Inject constructor(private val provid ) } - @Suppress("UnstableApiUsage") private fun systemProperty(name: String): Provider { return providers.systemProperty(name).forUseAtConfigurationTime() } diff --git a/plugins/hh-carnival/CHANGELOG.md b/plugins/hh-carnival/CHANGELOG.md index e16452ae..d5b2bb13 100644 --- a/plugins/hh-carnival/CHANGELOG.md +++ b/plugins/hh-carnival/CHANGELOG.md @@ -1,5 +1,9 @@ # Carnival +## [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 diff --git a/plugins/hh-carnival/gradle.properties b/plugins/hh-carnival/gradle.properties index cbeddc0a..76a5f948 100644 --- a/plugins/hh-carnival/gradle.properties +++ b/plugins/hh-carnival/gradle.properties @@ -1,6 +1,7 @@ -pluginVersion=1.3.0 +pluginVersion=1.4.0 pluginGroup=ru.hh.plugins pluginName=hh-carnival pluginSinceBuild=212.5712.43 + diff --git a/plugins/hh-garcon/CHANGELOG.md b/plugins/hh-garcon/CHANGELOG.md index 8aeb68ae..718d4dad 100644 --- a/plugins/hh-garcon/CHANGELOG.md +++ b/plugins/hh-garcon/CHANGELOG.md @@ -1,5 +1,9 @@ # Garcon +## [1.3.0] +### Added +- Support for Android Studio Flamingo | 2022.2.1 + ## [1.2.0] ### Added - Support for Android Studio Electric Eel | 2022.1.1 diff --git a/plugins/hh-garcon/gradle.properties b/plugins/hh-garcon/gradle.properties index b25576b4..1afe1382 100644 --- a/plugins/hh-garcon/gradle.properties +++ b/plugins/hh-garcon/gradle.properties @@ -1,4 +1,4 @@ -pluginVersion=1.2.0 +pluginVersion=1.3.0 pluginGroup=ru.hh.plugins pluginName=hh-garcon diff --git a/plugins/hh-geminio/CHANGELOG.md b/plugins/hh-geminio/CHANGELOG.md index 3e2e4004..a53fcbbd 100644 --- a/plugins/hh-geminio/CHANGELOG.md +++ b/plugins/hh-geminio/CHANGELOG.md @@ -1,5 +1,11 @@ # Geminio +## [1.5.0] + +### Added + +- Support for Android Studio Flamingo | 2022.2.1 + ## [1.4.2] ### Added diff --git a/plugins/hh-geminio/gradle.properties b/plugins/hh-geminio/gradle.properties index 5358e9f3..db8bc46e 100644 --- a/plugins/hh-geminio/gradle.properties +++ b/plugins/hh-geminio/gradle.properties @@ -1,4 +1,4 @@ -pluginVersion=1.4.2 +pluginVersion=1.5.0 pluginGroup=ru.hh.plugins pluginName=hh-geminio