Skip to content

Commit

Permalink
Mob 30327 support for android studio flamingo (#85)
Browse files Browse the repository at this point in the history
* [MOB-30327] Обновляет зависимости проекта

* [MOB-30327] Обновляет Github Actions для скачивания нужного архива

* [MOB-30327] Обновляет версии плагинов

* [MOB-30327] Триггерит пересборку

* [MOB-30327] Повышает версию Java

* [MOB-30327] Повышаем максимальный размер heap
  • Loading branch information
PStrelchenko committed May 3, 2023
1 parent 8fe351e commit 456eb0c
Show file tree
Hide file tree
Showing 14 changed files with 38 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-а

### Чтобы собрать любой из плагинов, нужно

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -24,7 +24,7 @@ configure<IntelliJPluginExtension> {
plugins.set(currentVersion.pluginsNames)
}

tasks.getByName<IntelliJInstrumentCodeTask>("instrumentCode") {
tasks.getByName<InstrumentCodeTask>("instrumentCode") {
val currentVersion = Libs.chosenIdeaVersion
if (currentVersion is ExternalLibrariesExtension.Product.LocalIde) {
compilerVersion.set(currentVersion.compilerVersion)
Expand Down
7 changes: 4 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ abstract class ExternalLibrariesExtension @Inject constructor(private val provid
)
}

@Suppress("UnstableApiUsage")
private fun systemProperty(name: String): Provider<String> {
return providers.systemProperty(name).forUseAtConfigurationTime()
}
Expand Down
4 changes: 4 additions & 0 deletions plugins/hh-carnival/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion plugins/hh-carnival/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
pluginVersion=1.3.0
pluginVersion=1.4.0

pluginGroup=ru.hh.plugins
pluginName=hh-carnival

pluginSinceBuild=212.5712.43

4 changes: 4 additions & 0 deletions plugins/hh-garcon/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/hh-garcon/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pluginVersion=1.2.0
pluginVersion=1.3.0

pluginGroup=ru.hh.plugins
pluginName=hh-garcon
Expand Down
6 changes: 6 additions & 0 deletions plugins/hh-geminio/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Geminio

## [1.5.0]

### Added

- Support for Android Studio Flamingo | 2022.2.1

## [1.4.2]

### Added
Expand Down
2 changes: 1 addition & 1 deletion plugins/hh-geminio/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pluginVersion=1.4.2
pluginVersion=1.5.0

pluginGroup=ru.hh.plugins
pluginName=hh-geminio
Expand Down

0 comments on commit 456eb0c

Please sign in to comment.