From adc5ed612127f89aea5cbe73712884ee2011542e Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 4 Feb 2025 13:50:56 -0800 Subject: [PATCH 1/3] ignore gradle.properties and .idea/misc.xml to reduce friction creating prs --- .gitignore | 3 +++ .idea/misc.xml | 14 -------------- gradle.properties | 14 -------------- 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 .idea/misc.xml delete mode 100644 gradle.properties diff --git a/.gitignore b/.gitignore index 1d60eacf89..39ef64030d 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,6 @@ lib/kotlin* gradle gradlew gradlew.bat +# User specific configuration based on current Intellij SDKs. +gradle.properties +.idea/misc.xml \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 2d7c04ef94..0000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 2fca522b46..0000000000 --- a/gradle.properties +++ /dev/null @@ -1,14 +0,0 @@ -name=flutter-intellij -buildSpec=2024.3 -flutterPluginVersion=SNAPSHOT -ideaProduct=android-studio -ideaVersion=2024.3.1.2 -baseVersion=243.21565.23 -dartPluginVersion= 243.21565.120 -androidPluginVersion= -sinceBuild=243 -untilBuild=253.* -testing=false -kotlin.stdlib.default.dependency=false -org.gradle.parallel=true -org.gradle.jvmargs=-Xms1024m -Xmx4048m From 853bdc07d1a8325d6042b88da58b545d5ec9e9a5 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 4 Feb 2025 13:52:28 -0800 Subject: [PATCH 2/3] add newline --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 39ef64030d..ea2567ba14 100644 --- a/.gitignore +++ b/.gitignore @@ -45,4 +45,4 @@ gradlew gradlew.bat # User specific configuration based on current Intellij SDKs. gradle.properties -.idea/misc.xml \ No newline at end of file +.idea/misc.xml From a1e79137e579f5e7192cda75839ce42836f9908d Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 4 Feb 2025 14:20:42 -0800 Subject: [PATCH 3/3] be resilient to non-existent gradle.properties files --- tool/plugin/lib/runner.dart | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tool/plugin/lib/runner.dart b/tool/plugin/lib/runner.dart index 54ac194fd6..cab6538b20 100644 --- a/tool/plugin/lib/runner.dart +++ b/tool/plugin/lib/runner.dart @@ -78,7 +78,9 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xms1024m -Xmx4048m '''; final propertiesFile = File("$rootPath/gradle.properties"); - final source = propertiesFile.readAsStringSync(); + final source = propertiesFile.existsSync() + ? propertiesFile.readAsStringSync() + : null; propertiesFile.writeAsStringSync(contents); int result; // Using the Gradle daemon causes a strange problem. @@ -99,7 +101,7 @@ org.gradle.jvmargs=-Xms1024m -Xmx4048m } } } finally { - propertiesFile.writeAsStringSync(source); + if (source != null) propertiesFile.writeAsStringSync(source); } return result; }