Skip to content

Commit 4c7dcef

Browse files
authored
Move contents of flutter-idea and flutter-studio to top level (#8343)
1 parent 7c9c8e1 commit 4c7dcef

File tree

588 files changed

+14
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

588 files changed

+14
-257
lines changed

build.gradle.kts

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ dependencies {
128128
pluginVerifier()
129129
}
130130

131-
// TODO(helin24): The rest in this block was pulled over from flutter-idea; potentially parts could be deleted.
132131
compileOnly("org.jetbrains:annotations:24.0.0")
133132
testImplementation("org.jetbrains:annotations:24.0.0")
134133
compileOnly("com.google.guava:guava:32.0.1-android")
@@ -198,37 +197,31 @@ sourceSets {
198197
main {
199198
java.srcDirs(
200199
listOf(
201-
"flutter-idea/src",
202-
"flutter-idea/third_party/vmServiceDrivers"
200+
"src",
201+
"third_party/vmServiceDrivers"
203202
)
204203
)
205204
// Add kotlin.srcDirs if we start using Kotlin in the main plugin.
206205
resources.srcDirs(
207206
listOf(
208-
"flutter-idea/src",
207+
"src",
209208
"resources"
210209
)
211210
)
212-
java.srcDirs(
213-
listOf(
214-
"flutter-studio/src",
215-
"flutter-studio/third_party/vmServiceDrivers"
216-
)
217-
)
218211
}
219212
test {
220213
java.srcDirs(
221214
listOf(
222-
"flutter-idea/src",
223-
"flutter-idea/testSrc/unit",
224-
"flutter-idea/third_party/vmServiceDrivers"
215+
"src",
216+
"testSrc/unit",
217+
"third_party/vmServiceDrivers"
225218
)
226219
)
227220
resources.srcDirs(
228221
listOf(
229222
"resources",
230-
"flutter-idea/testData",
231-
"flutter-idea/testSrc/unit"
223+
"testData",
224+
"testSrc/unit"
232225
)
233226
)
234227
}

flutter-idea/README.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

flutter-studio/README.md

Lines changed: 0 additions & 111 deletions
This file was deleted.

flutter-studio/flutter-studio.iml

Lines changed: 0 additions & 52 deletions
This file was deleted.

flutter-studio/src/org/jetbrains/idea/maven/wizards/MavenWizardBundle.java

Lines changed: 0 additions & 8 deletions
This file was deleted.

flutter-studio/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleBuilder.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)