Skip to content

Commit 8b3e997

Browse files
committed
Convert to Gradle project with Kotlin DSL
1 parent c045a53 commit 8b3e997

File tree

688 files changed

+63
-9307
lines changed

Some content is hidden

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

688 files changed

+63
-9307
lines changed

.idea/libraries/Dart.xml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

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

.idea/runConfigurations/Flutter_Plugin.xml

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

.idea/runConfigurations/Flutter_Tests__integration_.xml

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

.idea/runConfigurations/flutter_intellij__runIde_.xml

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions

build.gradle

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ allprojects {
4444
options.encoding = 'UTF-8'
4545
}
4646
tasks.withType(Test) {
47-
systemProperty "file.encoding", "UTF-8"
47+
systemProperty("file.encoding", "UTF-8")
4848
}
4949
}
5050

@@ -76,9 +76,9 @@ intellij {
7676
}
7777

7878
dependencies {
79-
implementation project('flutter-idea')
79+
implementation(project('flutter-idea'))
8080
if (ide == 'android-studio') {
81-
implementation project('flutter-studio')
81+
implementation(project('flutter-studio'))
8282
}
8383
}
8484

@@ -102,12 +102,3 @@ test {
102102
// Uncomment this line to disable tests on the bots.
103103
//ignoreFailures true
104104
}
105-
106-
buildSearchableOptions.enabled = false
107-
108-
// See https://github.com/gradle/gradle/issues/9202
109-
// This does not clean sub-projects.
110-
buildPlugin.dependsOn clean
111-
112-
// Need to delete cache so sub-project tests get run.
113-
test.dependsOn clean

flutter-idea/README.md

Lines changed: 2 additions & 0 deletions

flutter-idea/build.gradle

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,24 +78,22 @@ dependencies {
7878
/* Need to swizzle source and resource paths to match standard or buildPlugin does nothing. */
7979
sourceSets {
8080
main.java.srcDirs = [
81-
"src/main/java",
82-
"gen",
81+
"src",
8382
"third_party/vmServiceDrivers",
84-
"src/main/resources"
83+
"resources"
8584
]
8685
// Add main.kotlin.srcDirs if we start using Kotlin in the main plugin.
8786
main.resources.srcDirs = [
88-
"src/main/java",
89-
"src/main/resources",
87+
"src",
88+
"resources",
9089
]
9190
test.java.srcDirs = [
92-
"gen",
93-
"src/main/java",
91+
"src",
9492
"testSrc/unit",
9593
"third_party/vmServiceDrivers"
9694
]
9795
test.resources.srcDirs = [
98-
"src/main/resources",
96+
"resources",
9997
"testData",
10098
"testSrc/unit"
10199
]

flutter-idea/gen

Lines changed: 0 additions & 1 deletion
This file was deleted.

flutter-idea/resources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../resources

0 commit comments

Comments
 (0)