Skip to content

Commit

Permalink
Revert "Added ChromeOS, Linux GS" (flutter#10313)
Browse files Browse the repository at this point in the history
Reverts flutter#10302

Needs more time for copy review.

PTAL @sfshaza2 !
  • Loading branch information
atsansone committed Mar 19, 2024
1 parent 51bc2b8 commit 47f5f53
Show file tree
Hide file tree
Showing 81 changed files with 466 additions and 1,619 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ targetmin:
## Software current versions

appnow:
flutter: '3.19.3'
flutter: '3.19.0'
vscode: '1.86'
android_studio: '2023.1 (Hedgehog) or later'
android_sdk: '34.0.0'
Expand Down
48 changes: 0 additions & 48 deletions src/_data/doctor.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,3 @@
ChromeOSWeb:
degree: 1
windows: 'X'
linux: 'X'
android-toolchain: 'N'
chrome: 'Y'
xcode: 'X'
visual-studio: 'X'
android-studio: 'N'
errors: 3
add-android: 'Y'
add-chrome: 'N'
add-simulator: 'X'
add-xcode: 'X'
add-linux-tools: 'X'
add-visual-studio: 'X'
ChromeOSAndroid:
degree: 1
windows: 'X'
linux: 'X'
android-toolchain: 'Y'
chrome: 'N'
xcode: 'X'
visual-studio: 'X'
android-studio: 'Y'
errors: 2
add-android: 'N'
add-chrome: 'Y'
add-simulator: 'X'
add-xcode: 'X'
add-linux-tools: 'X'
add-visual-studio: 'X'
ChromeOSAndroidWeb:
degree: 2
windows: 'X'
linux: 'X'
android-toolchain: 'Y'
chrome: 'Y'
xcode: 'X'
visual-studio: 'X'
android-studio: 'Y'
errors: 0
add-android: 'N'
add-chrome: 'N'
add-simulator: 'X'
add-xcode: 'X'
add-linux-tools: 'X'
add-visual-studio: 'X'
LinuxAndroid:
degree: 1
windows: 'X'
Expand Down
14 changes: 0 additions & 14 deletions src/_data/shells.yml

This file was deleted.

2 changes: 0 additions & 2 deletions src/_data/sidenav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,6 @@
- title: Linux
permalink: /platform-integration/linux
children:
- title: Add Linux as build target
permalink: /platform-integration/linux/install-linux
- title: Build a Linux app
permalink: /platform-integration/linux/building
- title: macOS
Expand Down
14 changes: 0 additions & 14 deletions src/_includes/docs/install/accordions/install-chrome-from-cli.md

This file was deleted.

25 changes: 5 additions & 20 deletions src/_includes/docs/install/compiler/android.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% assign devos = include.devos %}
{% assign target = include.target %}
{% assign compiler = include.compiler %}
{% assign attempt-time = include.attempt %}
{% assign time = include.time %}

{% case devos %}
{% when 'Windows' -%}
Expand All @@ -21,23 +21,8 @@

{% include docs/help-link.md location='android-studio' section='#android-setup' %}

To create Android apps with Flutter, verify that the following Android
components have been installed.

* **Android SDK Platform, API {{ site.appnow.android_sdk }}**
* **Android SDK Command-line Tools**
* **Android SDK Build-Tools**
* **Android SDK Platform-Tools**
* **Android Emulator**

If you haven't or don't know, continue with the following procedure.

Otherwise, you can skip to the [next section][check-dev].

[check-dev]: #check-your-development-setup

{% comment %} Nav tabs {% endcomment -%}
<ul class="nav nav-tabs" id="android-studio-start" role="tablist">
<ul class="nav nav-tabs" id="android-studio-start-{{devos | downcase}}" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="first-start-tab" href="#first-start" role="tab" aria-controls="first-start" aria-selected="true">First time using Android Studio</a>
</li>
Expand All @@ -55,7 +40,7 @@ Otherwise, you can skip to the [next section][check-dev].
aria-labelledby="first-start-tab"
markdown="1">

1. Launch **Android Studio**.
1. Start **Android Studio**.

The **Welcome to Android Studio** dialog displays.

Expand All @@ -77,7 +62,7 @@ Otherwise, you can skip to the [next section][check-dev].
aria-labelledby="later-start-tab"
markdown="1">

1. Launch **Android Studio**.
1. Start **Android Studio**.

1. Go to the **Settings** dialog to view the **SDK Manager**.

Expand Down Expand Up @@ -168,7 +153,7 @@ Otherwise, you can skip to the [next section][check-dev].
</div>
{% comment %} End: Tab panes. {% endcomment -%}

{% if attempt-time == 'first' %}
{% if time=="first" %}

### Agree to Android licenses

Expand Down
8 changes: 4 additions & 4 deletions src/_includes/docs/install/compiler/xcode.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
{% assign prompt1='$' %}
{% assign devos = include.devos %}
{% assign target = include.target %}
{% assign attempt = include.attempt %}
{% assign time = include.time %}

### Configure Xcode

{% if attempt=="first" %}
{% if time=="first" %}

To develop Flutter apps for {{target}}, install Xcode to compile to native bytecode.

Expand Down Expand Up @@ -82,9 +82,9 @@ With Xcode, you can run Flutter apps on an iOS device or on the simulator.

{% endif %}

{% if attempt=="first" %}
{% if time=="first" %}

### Install CocoaPods (Optional)
### Install CocoaPods

If your apps depend on [Flutter plugins][] with native {{target}} code,
install [CocoaPods][cocoapods].
Expand Down
23 changes: 11 additions & 12 deletions src/_includes/docs/install/devices/android-emulator.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
{% assign devos = include.devos %}
{% assign target = include.target %}
{% assign compiler = include.compiler %}
{% assign attempt = include.attempt %}
{% assign time = include.time %}

{% case devos %}
{% when 'Windows','Linux' -%}
{% if devos=='Windows' -%}
{% assign images = '**x86 Images**' -%}
{% when 'macOS' -%}
{% elsif devos=='macOS' -%}
{% assign images = '**x86 Images** if your Mac runs on an Intel CPU or **ARM Images** if your Mac runs on an Apple CPU' -%}
{% endcase -%}
{% endif -%}

To configure your Flutter app to run in an Android emulator,
follow these steps to create and select an emulator.
To configure your Flutter app to run in the Android emulator,
follow these steps:

1. Enable
[VM acceleration]({{site.android-dev}}/studio/run/emulator-acceleration#accel-vm)
Expand Down Expand Up @@ -66,11 +65,13 @@ follow these steps to create and select an emulator.
1. To rename the Android Virtual Device (AVD), change the value in the
**AVD Name** box.

1. Click **Show Advanced Settings** and scroll to **Emulated Performance**.
1. Click **Show Advanced Settings**.

1. Scroll to **Emulated Performance**.

1. From the **Graphics** dropdown menu, select **Hardware - GLES 2.0**.

This enables [hardware acceleration][] and improves rendering performance.
This enables [hardware acceleration]({{site.android-dev}}/studio/run/emulator-acceleration).

1. Verify your AVD configuration. If it is correct, click **Finish**.

Expand All @@ -80,6 +81,4 @@ follow these steps to create and select an emulator.
1. In the **Device Manager** dialog, click the **Run** icon to the right
of your desired AVD.
The emulator starts up and displays the default canvas for your
selected Android OS version and device.

[hardware acceleration]: {{site.android-dev}}/studio/run/emulator-acceleration
selected OS version and device.
2 changes: 1 addition & 1 deletion src/_includes/docs/install/devices/android-physical.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% assign devos = include.devos %}
{% assign target = include.target %}
{% assign compiler = include.compiler %}
{% assign attempt = include.attempt %}
{% assign time = include.time %}

To configure your Flutter app to run on a physical Android device,
you need an Android device running {{site.targetmin.android}} or later.
Expand Down
66 changes: 21 additions & 45 deletions src/_includes/docs/install/flutter-doctor-success.md
Original file line number Diff line number Diff line change
@@ -1,64 +1,40 @@
{% assign doctor = site.data.doctor %}
{% assign config = site.data.doctor[include.config] %}
{% case include.devos %}
{% when 'macOS' %}
{% assign displayos = 'macOS 14.4.0 23E214 darwin-arm64' %}
{% when 'Windows' %}
{% assign displayos = 'Microsoft Windows 11 [Version 10.0.22621.3155]' %}
{% when 'Linux' %}
{% assign displayos = 'Ubuntu 20.04 (LTS)' %}
{% endcase %}

{% comment %}
Don't change the whitespace control dashes in this list.
It took about two hours to get exactly right. @atsansone
{% endcomment %}

```terminal
Running flutter doctor...
Doctor summary (to see all details, run flutter doctor -v):
[✓] Flutter (Channel stable, {{site.appnow.flutter}}, on {{displayos}}, locale en)
[✓] Flutter (Channel stable, {{site.appnow.flutter}}, on {{os}} A.B chipset, locale en)
{%- if config.windows == 'Y' %}
[✓] Windows version (Installed version of Windows is version 10 or higher)
{%- endif %}
{% case config.android-toolchain %}
{% when 'Y' %}[✓] Android toolchain - develop for Android devices (Android SDK version {{site.appnow.android_sdk}})
{% when 'N' %}[!] Android toolchain - develop for Android devices
{% endcase %}
{%- case config.chrome %}
{% when 'Y' %}[✓] Chrome - develop for the web
{% when 'N' %}[!] Chrome - develop for the web
{% endcase -%}
{% unless config.xcode == 'X' -%}
{%- when 'Y' %}[✓] Android toolchain - develop for Android devices (Android SDK version {{site.appnow.android_sdk}})
{%- when 'N' %}[!] Android toolchain - develop for Android devices
{%- endcase %}
{% case config.chrome %}
{%- when 'Y' %}[✓] Chrome - develop for the web
{%- when 'N' %}[!] Chrome - develop for the web
{%- endcase %}
{% case config.xcode %}
{% when 'Y' %}[✓] Xcode - develop for iOS and macOS (Xcode {{site.appnow.xcode}})
{% when 'N' %}[!] Xcode - develop for iOS and macOS (Xcode not installed)
{% endcase %}
{%- endunless -%}
{% unless config.visual-studio == 'X' -%}
{%- when 'Y' %}[✓] Xcode - develop for iOS and macOS (Xcode {{site.appnow.xcode}})
{%- when 'N' %}[!] Xcode - develop for iOS and macOS (Xcode not installed)
{%- endcase -%}
{% case config.visual-studio %}
{% when 'Y' %}[✓] Visual Studio - develop Windows apps (version 2022)
{% when 'N' %}[!] Visual Studio - develop Windows apps
{% endcase %}
{%- endunless %}
{%- case config.android-studio %}
{% when 'Y' %}[✓] Android Studio (version {{site.appnow.android_studio}})
{% when 'N' %}[!] Android Studio (not installed)
{% endcase -%}
{% unless config.linux == 'X' -%}
{%- when 'Y' %}[✓] Visual Studio - develop Windows apps (version 2022)
{%- when 'N' %}[!] Visual Studio - develop Windows apps
{%- endcase %}
{% case config.android-studio %}
{%- when 'Y' %}[✓] Android Studio (version {{site.appnow.android_studio}})
{%- when 'N' %}[!] Android Studio (not installed)
{%- endcase %}
{% case config.linux %}
{% when 'Y' %}[✓] Linux toolchain - develop for Linux desktop
{% when 'N' %}[!] Linux toolchain - develop for Linux desktop
{% endcase %}
{%- endunless -%}
{%- when 'Y' %}[✓] Linux toolchain - develop for Linux desktop
{%- when 'N' %}[!] Linux toolchain - develop for Linux desktop
{%- endcase -%}
[✓] VS Code (version {{site.appnow.vscode}})
[✓] Connected device (1 available)
[✓] Network resources
{% unless config.errors == 0 %}
! Doctor found issues in {{config.errors}} categories.
{% else %}
∙ No issues found!
{% endunless -%}
```
19 changes: 4 additions & 15 deletions src/_includes/docs/install/flutter-doctor.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,6 @@
{% else %}
{% assign work-target = target | append: ' on ' | append: devos %}
{% endcase %}
{% case work-target %}
{% when 'macOS desktop','Web on macOS','iOS on macOS' %}
{% assign compiler = 'Xcode' %}
{% when 'Android on Windows','Android on macOS','Android on Linux' %}
{% assign compiler = 'Android Studio' %}
{% when 'Linux desktop','Web on Linux' %}
{% assign compiler = 'one of the Linux libraries' %}
{% when 'Windows desktop','Web on Windows' %}
{% assign compiler = 'Visual Studio' %}
{% endcase %}

### Run Flutter doctor

Expand All @@ -54,7 +44,7 @@ As you chose to develop for {{target}},
you do not need _all_ components.
If you followed this guide, the result of your command should resemble:

{% include docs/install/flutter-doctor-success.md config=include.config devos=devos -%}
{% include docs/install/flutter-doctor-success.md config=include.config -%}

### Troubleshoot Flutter doctor issues

Expand All @@ -72,11 +62,10 @@ Check the output for other software you might need to install
or further tasks to perform.

If you change the configuration of your Flutter SDK or its related components,
run `flutter doctor` _again_ to verify the installation.
run `flutter doctor` again to verify the installation.

## Start developing {{work-target}} apps with Flutter
## Start developing {{work-target}} apps on Flutter

Congratulations!
Now that you have installed all prerequisites and the Flutter SDK,
you should be able to start developing Flutter apps for
{{work-target}}.
you should be able to start developing Flutter apps for {{work-target}}.
1 change: 0 additions & 1 deletion src/_includes/docs/install/flutter-sdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ or download and install the Flutter bundle yourself.
</div>
</div>
{% comment %} End: Tab panes. {% endcomment -%}

Loading

0 comments on commit 47f5f53

Please sign in to comment.