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.

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

⚙️ Flip org.jetbrains.android to optional #7949

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ChangJoo Park <[email protected]>
Amol Grover <[email protected]>
Jeremy Judeaux <[email protected]>
Letticia Nicoli <[email protected]>
Alex Li <google@alexv525.com>
Alex Li <alexv.525.li@gmail.com>
Marcus Tomlinson <[email protected]>
Juyeong Lee <[email protected]>
Hrishikesh Kadam <[email protected]>
Expand Down
13 changes: 8 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -14,7 +18,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)
<!-- TOC -->

## Contributing code
Expand Down Expand Up @@ -177,21 +180,21 @@ 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:
```
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
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Did you mean to remove "Flutter is a multi-platform"? Right now there's no space between platform and Flutter.

The updates to the README look good other than the above nit. However, I might split out the changes to the README into a separate PR as they seem unrelated to the the changes to make org.jetbrains.android optional and could be merged separately.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the catch. I was trying to copy the latest description from the Flutter repo but seems not make it clean. I'll split changes to another PR later.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done revert

fast user experiences for mobile, web, and desktop from a single codebase.

## Documentation

Expand All @@ -14,9 +15,8 @@ app SDK to help developers and designers build modern apps for iOS, Android and

## Fast development

Flutter's <em>hot reload</em> 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.

<img src="https://user-images.githubusercontent.com/919717/28131204-0f8c3cda-66ee-11e7-9428-6a0513eac75d.gif" alt="Make a change in your code, and your app is changed instantly.">

Expand Down Expand Up @@ -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
9 changes: 9 additions & 0 deletions resources/META-INF/android-contribs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!--
~ Copyright 2025 The Chromium Authors. All rights reserved.
~ Use of this source code is governed by a BSD-style license that can be
~ found in the LICENSE file.
-->

<!-- Defines Android-supported IDE-specific contributions and implementations. -->
<idea-plugin>
</idea-plugin>
2 changes: 1 addition & 1 deletion resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<depends>com.intellij.modules.lang</depends>
<depends>com.intellij.modules.xdebugger</depends>
<depends>org.jetbrains.plugins.yaml</depends>
<depends>org.jetbrains.android</depends>
<depends optional="true" config-file="android-contribs.xml">org.jetbrains.android</depends>
<depends>Dart</depends>
<depends>Git4Idea</depends>

Expand Down
2 changes: 1 addition & 1 deletion resources/META-INF/plugin_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<depends>com.intellij.modules.lang</depends>
<depends>com.intellij.modules.xdebugger</depends>
<depends>org.jetbrains.plugins.yaml</depends>
<depends>org.jetbrains.android</depends>
<depends optional="true" config-file="android-contribs.xml">org.jetbrains.android</depends>
<depends>Dart</depends>
<depends>Git4Idea</depends>

Expand Down