Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Android Studio in utbot-intellij #1121

Merged
merged 6 commits into from
Oct 10, 2022
Merged

Support Android Studio in utbot-intellij #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7211bf3
Enable android support in kts
denis-fokin Oct 7, 2022
3ad71c6
Get rid of AS. Use the path only
denis-fokin Oct 7, 2022
cb89f7d
Better naming
denis-fokin Oct 7, 2022
02c65ec
Corrected comment
EgorkaKulikov Oct 10, 2022
c4c0529
Commented Android Studio for other users
EgorkaKulikov Oct 10, 2022
14edcb9
Merge branch 'main' into denis-fokin/android_support_in_kts
EgorkaKulikov Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
kotlin.code.style=official

# IU, IC, PC, PY, WS...
# IC for AndroidStudio
ideType=IC

# In order to run Android Studion instead of Intellij Community,
# specify the path to your Android Studio installation
//androidStudioPath=D:/AS2021

pythonCommunityPluginVersion=222.4167.37
#Version numbers: https://plugins.jetbrains.com/plugin/631-python/versions
pythonUltimatePluginVersion=222.4167.37
Expand Down
11 changes: 9 additions & 2 deletions utbot-intellij/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ val pythonUltimatePluginVersion: String? by rootProject
val sootCommitHash: String? by rootProject
val kryoVersion: String? by rootProject
val semVer: String? by rootProject
val androidStudioPath: String? by rootProject

// https://plugins.jetbrains.com/docs/intellij/android-studio.html#configuring-the-plugin-pluginxml-file
val ideTypeOrAndroidStudio = if (androidStudioPath == null) ideType else "IC"

plugins {
id("org.jetbrains.intellij") version "1.7.0"
Expand All @@ -17,11 +21,13 @@ intellij {

val androidPlugins = listOf("org.jetbrains.android")

val jvmPlugins = listOf(
val jvmPlugins = mutableListOf(
"java",
"org.jetbrains.kotlin:222-1.7.20-release-201-IJ4167.29"
)

androidStudioPath?.let { jvmPlugins += androidPlugins }

val pythonCommunityPlugins = listOf(
"PythonCore:${pythonCommunityPluginVersion}"
)
Expand All @@ -45,7 +51,7 @@ intellij {
)

version.set("222.4167.29")
type.set(ideType)
type.set(ideTypeOrAndroidStudio)
}

tasks {
Expand All @@ -64,6 +70,7 @@ tasks {

runIde {
jvmArgs("-Xmx2048m")
androidStudioPath?.let { ideDir.set(file(it)) }
}

patchPluginXml {
Expand Down