From c5760a17bfa65e3d2fab586945e0505fc63d1746 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Fri, 21 Feb 2025 13:03:45 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Flip=20`org.jetbrains.?= =?UTF-8?q?android`=20to=20optional?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/META-INF/plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml index 9e93c4cab..5d6a23dbc 100644 --- a/resources/META-INF/plugin.xml +++ b/resources/META-INF/plugin.xml @@ -27,7 +27,7 @@ com.intellij.modules.lang com.intellij.modules.xdebugger org.jetbrains.plugins.yaml - org.jetbrains.android + org.jetbrains.android Dart Git4Idea From aeea61f7bfb35dcfae2ce350cf80e5d059c4e98a Mon Sep 17 00:00:00 2001 From: Alex Li Date: Fri, 21 Feb 2025 13:24:29 +0800 Subject: [PATCH 2/8] Update plugin_template.xml --- resources/META-INF/plugin_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/META-INF/plugin_template.xml b/resources/META-INF/plugin_template.xml index efd50598b..f8b5cb730 100644 --- a/resources/META-INF/plugin_template.xml +++ b/resources/META-INF/plugin_template.xml @@ -25,7 +25,7 @@ com.intellij.modules.lang com.intellij.modules.xdebugger org.jetbrains.plugins.yaml - org.jetbrains.android + org.jetbrains.android Dart Git4Idea From f0bb84eaffe441bc62202bdf241a8591286a4cdf Mon Sep 17 00:00:00 2001 From: Alex Li Date: Sat, 22 Feb 2025 01:18:38 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=F0=9F=94=A7=20Apply=20config=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/META-INF/android-contribs.xml | 9 +++++++++ resources/META-INF/plugin.xml | 2 +- resources/META-INF/plugin_template.xml | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 resources/META-INF/android-contribs.xml diff --git a/resources/META-INF/android-contribs.xml b/resources/META-INF/android-contribs.xml new file mode 100644 index 000000000..43036f232 --- /dev/null +++ b/resources/META-INF/android-contribs.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml index 5d6a23dbc..e0474fefb 100644 --- a/resources/META-INF/plugin.xml +++ b/resources/META-INF/plugin.xml @@ -27,7 +27,7 @@ com.intellij.modules.lang com.intellij.modules.xdebugger org.jetbrains.plugins.yaml - org.jetbrains.android + org.jetbrains.android Dart Git4Idea diff --git a/resources/META-INF/plugin_template.xml b/resources/META-INF/plugin_template.xml index f8b5cb730..a52fda80f 100644 --- a/resources/META-INF/plugin_template.xml +++ b/resources/META-INF/plugin_template.xml @@ -25,7 +25,7 @@ com.intellij.modules.lang com.intellij.modules.xdebugger org.jetbrains.plugins.yaml - org.jetbrains.android + org.jetbrains.android Dart Git4Idea From 66e40e414c4f9d00c2be1e420d0b95c6f9027e2f Mon Sep 17 00:00:00 2001 From: Alex Li Date: Sat, 22 Feb 2025 01:31:19 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=F0=9F=93=9D=20Align=20docs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTING.md | 1 - README.md | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c24a55bba..6bfb4e348 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,6 @@ Contributing to Flutter Plugin for IntelliJ * [Adding platform sources](#adding-platform-sources) * [Working with Android Studio](#working-with-android-studio) * [Working with Embedded DevTools (JxBrowser)](#working-with-embedded-devtools-jxbrowser) - * [Signing commits](#signing-commits) ## Contributing code diff --git a/README.md b/README.md index b6ebf330a..1d79738c7 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,9 @@ [![Latest plugin version](https://img.shields.io/jetbrains/plugin/v/9212)](https://plugins.jetbrains.com/plugin/9212-flutter) [![Build Status](https://github.com/flutter/flutter-intellij/workflows/presubmit/badge.svg)](https://github.com/flutter/flutter-intellij/actions?query=branch%3Amaster+workflow%3Apresubmit) -An IntelliJ plugin for [Flutter](https://flutter.dev/) development. Flutter is a multi-platform -app SDK to help developers and designers build modern apps for iOS, Android and the web. +An IntelliJ plugin for [Flutter](https://flutter.dev/) development. +Flutter is a multi-platformFlutter is Google's SDK for crafting beautiful, +fast user experiences for mobile, web, and desktop from a single codebase. ## Documentation @@ -14,9 +15,8 @@ app SDK to help developers and designers build modern apps for iOS, Android and ## Fast development -Flutter's hot reload helps you quickly and easily experiment, build UIs, add features, -and fix bugs faster. Experience sub-second reload times, without losing state, on emulators, -simulators, and hardware for iOS and Android. +Flutter offers [stateful hot reload][Hot reload], allowing you to make changes to your code +and see the results instantly without restarting your app or losing its state. Make a change in your code, and your app is changed instantly. @@ -66,3 +66,5 @@ If you like getting new features as soon as they've been added to the code then might want to try out the dev channel. It is updated weekly with the latest contents from the "master" branch. It has minimal testing. Set up instructions are in the wiki's [dev channel page](./docs/Dev-Channel.md). + +[Hot reload]: https://docs.flutter.dev/development/tools/hot-reload From a23d5fd87296a601574ba0713bf9dc8d16d9a1fe Mon Sep 17 00:00:00 2001 From: Alex Li Date: Sat, 22 Feb 2025 01:31:45 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=F0=9F=9B=82=20Update=20AUTHORS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 67872636d..94c914ea3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,7 +13,7 @@ ChangJoo Park Amol Grover Jeremy Judeaux Letticia Nicoli -Alex Li +Alex Li Marcus Tomlinson Juyeong Lee Hrishikesh Kadam From 5dcab7c73714e81a6561341c1ecfa44fb221fae4 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Mon, 10 Mar 2025 13:18:37 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=F0=9F=93=9D=20Fix=20CONTRIBUTING?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTING.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7c410f666..0cdfdde8a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,11 @@ Contributing to Flutter Plugin for IntelliJ * [Contributing to Flutter Plugin for IntelliJ](#contributing-to-flutter-plugin-for-intellij) * [Contributing code](#contributing-code) * [Getting started](#getting-started) - * [Setting environments](#setting-environments) + * [Environment set-up](#environment-set-up) + * [IntelliJ set-up](#intellij-set-up) + * [Configure "Project Structure" settings](#configure-project-structure-settings) + * [Configure the Gradle settings](#configure-the-gradle-settings) + * [Build and run the plugin](#build-and-run-the-plugin) * [Handle symlinks](#handle-symlinks) * [Provision Tool](#provision-tool) * [Running plugin tests](#running-plugin-tests) @@ -176,7 +180,7 @@ name and contact info to the [AUTHORS](AUTHORS) file. Internal Java Platform: IDEA JBR 21 ``` -3. Set the SDK for the Project +4. Set the SDK for the Project - Select "Project Settings > Project" - Change the "SDK" selection to the **IntelliJ Platform Plugin SDK** you added in step 3. - When you are done, your settings should look something like: @@ -184,13 +188,13 @@ name and contact info to the [AUTHORS](AUTHORS) file. SDK: IntelliJ IDEA Community Edition IC-243.23654.189 ``` -4. Configure the modules for the Project +5. Configure the modules for the Project - Select "Project Settings > Modules" - Select the `flutter-intellij > flutter-idea` module - Switch to the "Paths" window - Select the **Inherit project compile output path** option then apply. -5. Change the modules SDK to the Project SDK +6. Change the modules SDK to the Project SDK - Select "Project Settings > Modules" - Select all the sub-directories under the `flutter-intellij > flutter-idea` module - Switch to the "Dependencies" window From 9291a37848ab254e7c6628d79c1f01f5b9a4d48b Mon Sep 17 00:00:00 2001 From: Alex Li Date: Sat, 15 Mar 2025 12:47:03 +0800 Subject: [PATCH 7/8] =?UTF-8?q?Revert=20"=F0=9F=93=9D=20Fix=20CONTRIBUTING?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5dcab7c73714e81a6561341c1ecfa44fb221fae4. --- CONTRIBUTING.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0cdfdde8a..7c410f666 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,11 +5,7 @@ Contributing to Flutter Plugin for IntelliJ * [Contributing to Flutter Plugin for IntelliJ](#contributing-to-flutter-plugin-for-intellij) * [Contributing code](#contributing-code) * [Getting started](#getting-started) - * [Environment set-up](#environment-set-up) - * [IntelliJ set-up](#intellij-set-up) - * [Configure "Project Structure" settings](#configure-project-structure-settings) - * [Configure the Gradle settings](#configure-the-gradle-settings) - * [Build and run the plugin](#build-and-run-the-plugin) + * [Setting environments](#setting-environments) * [Handle symlinks](#handle-symlinks) * [Provision Tool](#provision-tool) * [Running plugin tests](#running-plugin-tests) @@ -180,7 +176,7 @@ name and contact info to the [AUTHORS](AUTHORS) file. Internal Java Platform: IDEA JBR 21 ``` -4. Set the SDK for the Project +3. Set the SDK for the Project - Select "Project Settings > Project" - Change the "SDK" selection to the **IntelliJ Platform Plugin SDK** you added in step 3. - When you are done, your settings should look something like: @@ -188,13 +184,13 @@ name and contact info to the [AUTHORS](AUTHORS) file. SDK: IntelliJ IDEA Community Edition IC-243.23654.189 ``` -5. Configure the modules for the Project +4. Configure the modules for the Project - Select "Project Settings > Modules" - Select the `flutter-intellij > flutter-idea` module - Switch to the "Paths" window - Select the **Inherit project compile output path** option then apply. -6. Change the modules SDK to the Project SDK +5. Change the modules SDK to the Project SDK - Select "Project Settings > Modules" - Select all the sub-directories under the `flutter-intellij > flutter-idea` module - Switch to the "Dependencies" window From 7ff257bd905f0d75c9aa864104386f1ef7e12b3b Mon Sep 17 00:00:00 2001 From: Alex Li Date: Sat, 15 Mar 2025 12:47:19 +0800 Subject: [PATCH 8/8] =?UTF-8?q?Revert=20"=F0=9F=93=9D=20Align=20docs"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 66e40e414c4f9d00c2be1e420d0b95c6f9027e2f. --- CONTRIBUTING.md | 1 + README.md | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7c410f666..865ff9efe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,6 +14,7 @@ Contributing to Flutter Plugin for IntelliJ * [Adding platform sources](#adding-platform-sources) * [Working with Android Studio](#working-with-android-studio) * [Working with Embedded DevTools (JxBrowser)](#working-with-embedded-devtools-jxbrowser) + * [Signing commits](#signing-commits) ## Contributing code diff --git a/README.md b/README.md index 1d79738c7..b6ebf330a 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,8 @@ [![Latest plugin version](https://img.shields.io/jetbrains/plugin/v/9212)](https://plugins.jetbrains.com/plugin/9212-flutter) [![Build Status](https://github.com/flutter/flutter-intellij/workflows/presubmit/badge.svg)](https://github.com/flutter/flutter-intellij/actions?query=branch%3Amaster+workflow%3Apresubmit) -An IntelliJ plugin for [Flutter](https://flutter.dev/) development. -Flutter is a multi-platformFlutter is Google's SDK for crafting beautiful, -fast user experiences for mobile, web, and desktop from a single codebase. +An IntelliJ plugin for [Flutter](https://flutter.dev/) development. Flutter is a multi-platform +app SDK to help developers and designers build modern apps for iOS, Android and the web. ## Documentation @@ -15,8 +14,9 @@ fast user experiences for mobile, web, and desktop from a single codebase. ## Fast development -Flutter offers [stateful hot reload][Hot reload], allowing you to make changes to your code -and see the results instantly without restarting your app or losing its state. +Flutter's hot reload helps you quickly and easily experiment, build UIs, add features, +and fix bugs faster. Experience sub-second reload times, without losing state, on emulators, +simulators, and hardware for iOS and Android. Make a change in your code, and your app is changed instantly. @@ -66,5 +66,3 @@ If you like getting new features as soon as they've been added to the code then might want to try out the dev channel. It is updated weekly with the latest contents from the "master" branch. It has minimal testing. Set up instructions are in the wiki's [dev channel page](./docs/Dev-Channel.md). - -[Hot reload]: https://docs.flutter.dev/development/tools/hot-reload