Skip to content

Flutter extensions: flet_* packages moved to separate repositories #4721

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

Merged
merged 72 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
9c0fd67
Added deprecatation to Video control
FeodorFitsner Dec 5, 2024
e6ff9a9
Merge branch 'main' into feodor/flutter-extensions
FeodorFitsner Dec 6, 2024
dcf4b1c
Automatic registration of custom Flutter extensions
FeodorFitsner Dec 6, 2024
b190d0b
Add `flet` if no dependencies provided for `flet publish` command (#4…
FeodorFitsner Dec 10, 2024
12f2490
Update project_dependencies.py (#4459)
omamkaz Dec 3, 2024
be58db6
Fix PyInstaller hook to avoid download Flet app bundle on first run (…
FeodorFitsner Dec 12, 2024
3916011
Support `git`, `path`, `url` Poetry-style dependencies in pyproject.t…
FeodorFitsner Dec 12, 2024
717424a
Prepare Flet 0.25.2 (#4541)
FeodorFitsner Dec 13, 2024
963fac5
Merge branch 'main' into feodor/flutter-extensions
FeodorFitsner Jan 7, 2025
4f69d6e
flet_video removed and replaced with git dependency
FeodorFitsner Jan 7, 2025
e8ea26a
Merge branch '0.25.2' into feodor/flutter-extensions
FeodorFitsner Jan 7, 2025
df1409f
removed flet_audio
InesaFitsner Jan 7, 2025
2e34dbf
Install Flutter function
FeodorFitsner Oct 16, 2024
a7bfa88
Install JDK
FeodorFitsner Oct 18, 2024
1fcf8e3
Update poetry.lock
FeodorFitsner Jan 7, 2025
a7ee2ca
platform-specific dependencies in `tool.flet.{platform}.dependencies`
FeodorFitsner Jan 7, 2025
4830c5e
Merge branch 'feodor/flutter-extensions' of https://github.com/flet-d…
InesaFitsner Jan 7, 2025
50059ca
deleted flet_ads folder
InesaFitsner Jan 7, 2025
666905e
Fix __download_flet_client in dev mode
FeodorFitsner Jan 8, 2025
4343d08
deleted flet_audio_recorder folder
InesaFitsner Jan 8, 2025
54c9b87
Create android_sdk.py
FeodorFitsner Jan 8, 2025
47b42d9
Merge branch 'feodor/flutter-extensions' of https://github.com/flet-d…
FeodorFitsner Jan 8, 2025
7d1d3ed
Merge branch 'feodor/flutter-extensions' of https://github.com/flet-d…
FeodorFitsner Jan 8, 2025
50436a9
accept_sdkmanager_licenses
FeodorFitsner Jan 8, 2025
a6a2ef5
Fix temp dir
FeodorFitsner Jan 8, 2025
88bcd07
Merge branch 'feodor/flutter-extensions' of https://github.com/flet-d…
FeodorFitsner Jan 8, 2025
6ef65ba
removed flet_flashlight folder
InesaFitsner Jan 8, 2025
3566791
deleted flet_geolocator folder
InesaFitsner Jan 8, 2025
287643d
deleted flet_lottie
InesaFitsner Jan 8, 2025
e288b89
deleted flet_map
InesaFitsner Jan 8, 2025
6d64378
Update android_sdk.py
FeodorFitsner Jan 8, 2025
bcb8ea3
Merge branch 'feodor/flutter-extensions' of https://github.com/flet-d…
FeodorFitsner Jan 8, 2025
f5940b7
deleted flet_permissions_handler
InesaFitsner Jan 8, 2025
52f519b
Merge branch 'feodor/flutter-extensions' of https://github.com/flet-d…
InesaFitsner Jan 8, 2025
b7f3404
Merge branch 'main' into feodor/flutter-extensions
FeodorFitsner Jan 9, 2025
f6b7197
Fix deprecated imports
FeodorFitsner Jan 9, 2025
65bcc23
deleted flet_rive
InesaFitsner Jan 9, 2025
86b4b00
deleted flet_webview
InesaFitsner Jan 9, 2025
f42d358
Extract common utils
FeodorFitsner Jan 9, 2025
7f6ba45
Replace tqdm with Rich
FeodorFitsner Jan 9, 2025
b0ef43d
Replace print() with log()
FeodorFitsner Jan 9, 2025
f3b2008
Merge branch 'feodor/flutter-extensions' of https://github.com/flet-d…
FeodorFitsner Jan 9, 2025
66b7f1e
Package app first
FeodorFitsner Jan 9, 2025
0a931ab
Merge branch 'main' into feodor/flutter-extensions
FeodorFitsner Jan 10, 2025
2127aaa
Build command logging, styling, progresses
FeodorFitsner Jan 11, 2025
e0cdf41
Android SDK: cmdline-tools installation
FeodorFitsner Jan 13, 2025
69e386b
Install cmdlinetools
FeodorFitsner Jan 13, 2025
d46e570
Skip Android SDK installation if managed by Android Studio
FeodorFitsner Jan 13, 2025
87ac432
Cleanup
FeodorFitsner Jan 13, 2025
efd24e0
flutter-extension choice for create
InesaFitsner Jan 14, 2025
037a5c4
Nice way to install Android SDK packages
FeodorFitsner Jan 14, 2025
0f6ce9b
Merge branch 'feodor/flutter-extensions' of https://github.com/flet-d…
FeodorFitsner Jan 14, 2025
a49008e
"sep" for template
InesaFitsner Jan 14, 2025
cc2f9a9
fix badge bug
InesaFitsner Jan 14, 2025
7b4f8de
Fix process output
FeodorFitsner Jan 14, 2025
7d24508
Merge branch 'feodor/flutter-extensions' of https://github.com/flet-d…
FeodorFitsner Jan 14, 2025
5cd5d9c
Disable Flutter/Dart version check and analytics
FeodorFitsner Jan 14, 2025
590337c
All extensions are from git tags
FeodorFitsner Jan 15, 2025
c14a867
Flet desktop: load pre-build desktop client from build/{platform} dir
FeodorFitsner Jan 15, 2025
2ba4cd5
Change color theme to look nice in Ubuntu
FeodorFitsner Jan 15, 2025
2ae8518
Update poetry.lock
FeodorFitsner Jan 16, 2025
1e7614d
do not install virtualenv
FeodorFitsner Jan 16, 2025
6e6d1a6
do not install virtualenv in python tests
FeodorFitsner Jan 16, 2025
5a96035
Pin virtualenv==20.28.1
FeodorFitsner Jan 16, 2025
4fa2dc8
Add `flet=={version}` to requirements if no dependencies defined
FeodorFitsner Jan 16, 2025
06defc6
Install poetry into virtual environment
FeodorFitsner Jan 16, 2025
11498b0
add poetry to path
FeodorFitsner Jan 16, 2025
fd61604
Remove Python 3.8 tests
FeodorFitsner Jan 16, 2025
4bc3307
Fix Windows job
FeodorFitsner Jan 16, 2025
3b66261
Flutter 3.27.2, enable all CI jobs
FeodorFitsner Jan 16, 2025
93f358e
update template choices
InesaFitsner Jan 16, 2025
afc98ce
default template
InesaFitsner Jan 16, 2025
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
17 changes: 8 additions & 9 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ skip_commits:

environment:
python_stack: python 3.12
FLUTTER_VERSION: 3.27.0
FLUTTER_VERSION: 3.27.2
GITHUB_TOKEN:
secure: 9SKIwc3VSfYJ5IChvNR74hQprJ0DRmcV9pPX+8KyE6IXIdfMsX6ikeUmMhJGRu3ztkZaF45jmU7Xn/6tauXQXhDBxK1N8kFHFSAnq6LjUXyhS0TZKX/H+jDozBeVbCXp
TWINE_USERNAME: __token__
Expand Down Expand Up @@ -70,11 +70,6 @@ environment:
job_depends_on: build_flet_package
APPVEYOR_BUILD_WORKER_IMAGE: ubuntu2004

- job_name: Test Python 3.8
job_group: python_tests
python_stack: python 3.8
APPVEYOR_BUILD_WORKER_IMAGE: ubuntu2004

- job_name: Test Python 3.9
job_group: python_tests
python_stack: python 3.9
Expand Down Expand Up @@ -186,7 +181,10 @@ for:

install:
- python --version
- pip3 install --upgrade setuptools wheel twine poetry tomlkit virtualenv
- pip3 install --upgrade setuptools wheel twine tomlkit
- ps: (Invoke-WebRequest -Uri https://install.python-poetry.org -UseBasicParsing).Content | python -
- ps: Add-SessionPath "$HOME\AppData\Roaming\Python\Scripts"
- poetry --version
- dart pub global activate fvm
- set PATH=%LOCALAPPDATA%\Pub\Cache\bin;%USERPROFILE%\fvm\default\bin;%PATH%
- fvm install %FLUTTER_VERSION%
Expand Down Expand Up @@ -461,8 +459,9 @@ for:
- python --version
- cd sdk/python
- python -m ensurepip --upgrade
- pip3 install --upgrade setuptools pip virtualenv
- pip3 install poetry
- pip3 install --upgrade setuptools pip
- curl -sSL https://install.python-poetry.org | python -
- export PATH="$HOME/.local/bin:$PATH"
- poetry install

build: off
Expand Down
2 changes: 1 addition & 1 deletion ci/clean-pypi.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# set PYPI_CLEANUP_PASSWORD with pypi.org password
#VER="0\.22\.0\.dev"
VER="0\.25\.0\.dev"
#VER="0\.21\.1"
pypi-cleanup -u flet -p flet -y -r $VER --do-it
pypi-cleanup -u flet -p flet-cli -y -r $VER --do-it
Expand Down
4 changes: 3 additions & 1 deletion ci/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ export flet_sdk_root=$root/sdk/python
echo "flet_sdk_root: $flet_sdk_root"

python --version
pip install --upgrade setuptools wheel twine poetry tomlkit virtualenv
pip install --upgrade setuptools wheel twine tomlkit
curl -sSL https://install.python-poetry.org | python3 -
export PATH="$HOME/.local/bin:$PATH"

function patch_python_package_versions() {
PYPI_VER="${APPVEYOR_BUILD_VERSION/+/.dev}"
Expand Down
3 changes: 3 additions & 0 deletions client/.fvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"flutter": "3.27.1"
}
2 changes: 1 addition & 1 deletion client/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'dart:io';

import 'package:flet/flet.dart';
import 'package:flet_ads/flet_ads.dart' as flet_ads;
// --FAT_CLIENT_START--
import 'package:flet_audio/flet_audio.dart' as flet_audio;
// --FAT_CLIENT_END--
Expand All @@ -13,7 +14,6 @@ import 'package:flet_map/flet_map.dart' as flet_map;
import 'package:flet_permission_handler/flet_permission_handler.dart'
as flet_permission_handler;
import 'package:flet_rive/flet_rive.dart' as flet_rive;
import 'package:flet_ads/flet_ads.dart' as flet_ads;
// --FAT_CLIENT_START--
import 'package:flet_video/flet_video.dart' as flet_video;
// --FAT_CLIENT_END--
Expand Down
118 changes: 70 additions & 48 deletions client/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ packages:
source: hosted
version: "0.69.0"
flet:
dependency: "direct main"
dependency: "direct overridden"
description:
path: "../packages/flet"
relative: true
Expand All @@ -251,80 +251,102 @@ packages:
flet_ads:
dependency: "direct main"
description:
path: "../packages/flet_ads"
relative: true
source: path
version: "0.25.2"
path: "src/flutter/flet_ads"
ref: "0.1.0"
resolved-ref: "01e7065fcbebb1317b3f16951e6cf0c5fcff658b"
url: "https://github.com/flet-dev/flet-ads.git"
source: git
version: "0.1.0"
flet_audio:
dependency: "direct main"
description:
path: "../packages/flet_audio"
relative: true
source: path
version: "0.25.2"
path: "src/flutter/flet_audio"
ref: "0.1.0"
resolved-ref: a146bf580a211c6d1f5c45070d15532ea2e92af7
url: "https://github.com/flet-dev/flet-audio.git"
source: git
version: "0.1.0"
flet_audio_recorder:
dependency: "direct main"
description:
path: "../packages/flet_audio_recorder"
relative: true
source: path
version: "0.25.2"
path: "src/flutter/flet_audio_recorder"
ref: "0.1.0"
resolved-ref: eb186cd49fde3136f65d0d074bca5ca688260e53
url: "https://github.com/flet-dev/flet-audio-recorder.git"
source: git
version: "0.1.0"
flet_flashlight:
dependency: "direct main"
description:
path: "../packages/flet_flashlight"
relative: true
source: path
version: "0.25.2"
path: "src/flutter/flet_flashlight"
ref: "0.1.0"
resolved-ref: a12a12259eaac801ee99d465727ec4a9fe50121e
url: "https://github.com/flet-dev/flet-flashlight.git"
source: git
version: "0.1.0"
flet_geolocator:
dependency: "direct main"
description:
path: "../packages/flet_geolocator"
relative: true
source: path
path: "src/flutter/flet_geolocator"
ref: "0.1.0"
resolved-ref: "7b17d7aab169a7488da90fd73b3acd8e568f4f03"
url: "https://github.com/flet-dev/flet-geolocator.git"
source: git
version: "0.25.2"
flet_lottie:
dependency: "direct main"
description:
path: "../packages/flet_lottie"
relative: true
source: path
version: "0.25.2"
path: "src/flutter/flet_lottie"
ref: "0.1.0"
resolved-ref: f28c767b5d43de650155a5a97e2d971fb833c9f8
url: "https://github.com/flet-dev/flet-lottie.git"
source: git
version: "0.1.0"
flet_map:
dependency: "direct main"
description:
path: "../packages/flet_map"
relative: true
source: path
version: "0.25.2"
path: "src/flutter/flet_map"
ref: "0.1.0"
resolved-ref: dfa3cf6776b0dc5f238227d5f378cda7be190eaf
url: "https://github.com/flet-dev/flet-map.git"
source: git
version: "0.1.0"
flet_permission_handler:
dependency: "direct main"
description:
path: "../packages/flet_permission_handler"
relative: true
source: path
version: "0.25.2"
path: "src/flutter/flet_permission_handler"
ref: "0.1.0"
resolved-ref: "4ead86b6c7e54b914215b6087fcb17b7e921d75c"
url: "https://github.com/flet-dev/flet-permission-handler.git"
source: git
version: "0.1.0"
flet_rive:
dependency: "direct main"
description:
path: "../packages/flet_rive"
relative: true
source: path
version: "0.25.2"
path: "src/flutter/flet_rive"
ref: "0.1.0"
resolved-ref: "089f7ad923f747ad764aa2781eca9a36382bb912"
url: "https://github.com/flet-dev/flet-rive.git"
source: git
version: "0.1.0"
flet_video:
dependency: "direct main"
description:
path: "../packages/flet_video"
relative: true
source: path
version: "0.25.2"
path: "src/flutter/flet_video"
ref: "0.1.0"
resolved-ref: "76f3f76f04c7573e047204648378ee2f31db7a15"
url: "https://github.com/flet-dev/flet-video.git"
source: git
version: "0.1.0"
flet_webview:
dependency: "direct main"
description:
path: "../packages/flet_webview"
relative: true
source: path
version: "0.25.2"
path: "src/flutter/flet_webview"
ref: "0.1.0"
resolved-ref: b1cfb3155469bc0a9a7578afcd58e7f32669b164
url: "https://github.com/flet-dev/flet-webview.git"
source: git
version: "0.1.0"
flutter:
dependency: "direct main"
description: flutter
Expand Down Expand Up @@ -988,18 +1010,18 @@ packages:
dependency: transitive
description:
name: rive
sha256: b44b62feb908610ca6c85e05f4573a66118a23867425926cf06152d171236141
sha256: "2551a44fa766a7ed3f52aa2b94feda6d18d00edc25dee5f66e72e9b365bb6d6c"
url: "https://pub.dev"
source: hosted
version: "0.13.17"
version: "0.13.20"
rive_common:
dependency: transitive
description:
name: rive_common
sha256: a3e5786f8d85c89977062b9ceeb3b72a7c28f81e32fb68497744042ce20bee2f
sha256: "2ba42f80d37a4efd0696fb715787c4785f8a13361e8aea9227c50f1e78cf763a"
url: "https://pub.dev"
source: hosted
version: "0.4.12"
version: "0.4.15"
safe_local_storage:
dependency: transitive
description:
Expand Down
64 changes: 51 additions & 13 deletions client/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,68 @@ dependencies:
flutter:
sdk: flutter

flet:
path: ../packages/flet
# --FAT_CLIENT_START--
flet_audio:
path: ../packages/flet_audio
git:
url: https://github.com/flet-dev/flet-audio.git
ref: 0.1.0
path: src/flutter/flet_audio
flet_video:
path: ../packages/flet_video
git:
url: https://github.com/flet-dev/flet-video.git
ref: 0.1.0
path: src/flutter/flet_video
# --FAT_CLIENT_END--
flet_lottie:
path: ../packages/flet_lottie
git:
url: https://github.com/flet-dev/flet-lottie.git
ref: 0.1.0
path: src/flutter/flet_lottie
flet_map:
path: ../packages/flet_map
git:
url: https://github.com/flet-dev/flet-map.git
ref: 0.1.0
path: src/flutter/flet_map
flet_ads:
path: ../packages/flet_ads
git:
url: https://github.com/flet-dev/flet-ads.git
ref: 0.1.0
path: src/flutter/flet_ads

flet_rive:
path: ../packages/flet_rive
git:
url: https://github.com/flet-dev/flet-rive.git
ref: 0.1.0
path: src/flutter/flet_rive

flet_audio_recorder:
path: ../packages/flet_audio_recorder
git:
url: https://github.com/flet-dev/flet-audio-recorder.git
ref: 0.1.0
path: src/flutter/flet_audio_recorder

flet_permission_handler:
path: ../packages/flet_permission_handler
git:
url: https://github.com/flet-dev/flet-permission-handler.git
ref: 0.1.0
path: src/flutter/flet_permission_handler

flet_geolocator:
path: ../packages/flet_geolocator
git:
url: https://github.com/flet-dev/flet-geolocator.git
ref: 0.1.0
path: src/flutter/flet_geolocator

flet_webview:
path: ../packages/flet_webview
git:
url: https://github.com/flet-dev/flet-webview.git
ref: 0.1.0
path: src/flutter/flet_webview
flet_flashlight:
path: ../packages/flet_flashlight
git:
url: https://github.com/flet-dev/flet-flashlight.git
ref: 0.1.0
path: src/flutter/flet_flashlight

url_strategy: ^0.2.0
cupertino_icons: ^1.0.6
Expand All @@ -65,6 +101,8 @@ dependencies:
sdk: flutter

dependency_overrides:
flet:
path: ../packages/flet
webview_flutter_android: ^4.0.0

dev_dependencies:
Expand Down
31 changes: 0 additions & 31 deletions packages/flet_ads/.gitignore

This file was deleted.

10 changes: 0 additions & 10 deletions packages/flet_ads/.metadata

This file was deleted.

Loading