Skip to content

Commit a71bc65

Browse files
FeodorFitsneromamkazndonkoHenriInesaFitsner
authored
Flutter extensions: flet_* packages moved to separate repositories (#4721)
* Added deprecatation to Video control * Automatic registration of custom Flutter extensions * Add `flet` if no dependencies provided for `flet publish` command (#4508) Fix #4493 * Update project_dependencies.py (#4459) # `Fixed` when I get no markers key in the version_value variable. ```bash Traceback (most recent call last): File "/opt/hostedtoolcache/Python/3.12.5/x64/bin/flet", line 8, in <module> sys.exit(main()) ^^^^^^ File "/opt/hostedtoolcache/Python/3.12.5/x64/lib/python3.12/site-packages/flet/cli.py", line 12, in main flet_cli.cli.main() File "/opt/hostedtoolcache/Python/3.12.5/x64/lib/python3.12/site-packages/flet_cli/cli.py", line 89, in main args.handler(args) File "/opt/hostedtoolcache/Python/3.12.5/x64/lib/python3.12/site-packages/flet_cli/commands/build.py", line 557, in handle self.package_python_app() File "/opt/hostedtoolcache/Python/3.12.5/x64/lib/python3.12/site-packages/flet_cli/commands/build.py", line 1303, in package_python_app toml_dependencies = get_poetry_dependencies( ^^^^^^^^^^^^^^^^^^^^^^^^ File "/opt/hostedtoolcache/Python/3.12.5/x64/lib/python3.12/site-packages/flet_cli/utils/project_dependencies.py", line 41, in get_poetry_dependencies format_dependency_version(dependency, version) File "/opt/hostedtoolcache/Python/3.12.5/x64/lib/python3.12/site-packages/flet_cli/utils/project_dependencies.py", line 21, in format_dependency_version if version_value["markers"]: ~~~~~~~~~~~~~^^^^^^^^^^^ KeyError: 'markers' ``` * Fix PyInstaller hook to avoid download Flet app bundle on first run (#4552) * Fix PyInstaller hook to avoid download Flet app bundle on first run Fix #4549 * Fix web job * Support `git`, `path`, `url` Poetry-style dependencies in pyproject.toml (#4554) Fix #4547 * Prepare Flet 0.25.2 (#4541) * feat: implement `Window.ignore_mouse_events` (#4465) * Update project_dependencies.py (#4459) # `Fixed` when I get no markers key in the version_value variable. ```bash Traceback (most recent call last): File "/opt/hostedtoolcache/Python/3.12.5/x64/bin/flet", line 8, in <module> sys.exit(main()) ^^^^^^ File "/opt/hostedtoolcache/Python/3.12.5/x64/lib/python3.12/site-packages/flet/cli.py", line 12, in main flet_cli.cli.main() File "/opt/hostedtoolcache/Python/3.12.5/x64/lib/python3.12/site-packages/flet_cli/cli.py", line 89, in main args.handler(args) File "/opt/hostedtoolcache/Python/3.12.5/x64/lib/python3.12/site-packages/flet_cli/commands/build.py", line 557, in handle self.package_python_app() File "/opt/hostedtoolcache/Python/3.12.5/x64/lib/python3.12/site-packages/flet_cli/commands/build.py", line 1303, in package_python_app toml_dependencies = get_poetry_dependencies( ^^^^^^^^^^^^^^^^^^^^^^^^ File "/opt/hostedtoolcache/Python/3.12.5/x64/lib/python3.12/site-packages/flet_cli/utils/project_dependencies.py", line 41, in get_poetry_dependencies format_dependency_version(dependency, version) File "/opt/hostedtoolcache/Python/3.12.5/x64/lib/python3.12/site-packages/flet_cli/utils/project_dependencies.py", line 21, in format_dependency_version if version_value["markers"]: ~~~~~~~~~~~~~^^^^^^^^^^^ KeyError: 'markers' ``` * Remove `v0.26.0` deprecations (#4479) * delete deprecations on py end * delete deprecations on dart end * fix: `SafeArea` object has no attribute `_SafeArea__minimum` (#4500) * remove minimum from SafeArea * remove deprecated props * Changelog updated * Fix publishing flet-windows.zip to releases * Revert "Merge branch 'main' into feodor/prepare-0-25-2" This reverts commit 32a7343, reversing changes made to 3dc01e1. * Changelog updated * Update changelog. * Changelog updated with cherry-picked bug fixes * fix broken `Map.center_on()` and default animations (#4519) * fix center_on * get default animation duration and curve * fix: Tooltip corruption in `Segment` and `BarChartRod` on `update()` (#4525) * avoid jsonDecoding `Segment` and `BarChartRod` tooltips * avoid jsonEncoding `Segment` and `BarChartRod` tooltips * Unset theme visual density default * Unset `SegmentedButton` border side default * `TextField.hint_text` should be displayed if `label` is not specified * fix: Setting `CheckBox.border_side.stroke_align` to an Enum fails (#4526) * `BorderSideStrokeAlign` should inherit from float * properly parse `Chip.border_side` * fix:`ControlState` should be resolved based on user-defined order (#4556) * ControlState: rename "" to "default" * resolve ControlState on user-defined order * fix failing tests * remove breaking line * fix wrong attribute name (#4557) * Publish flet wheels to GitHub releases * remove redeclared `MapPointerDeviceType` --------- Co-authored-by: TheEthicalBoy <[email protected]> Co-authored-by: Osama Mohammed Al-zabidi <[email protected]> Co-authored-by: ndonkoHenri <[email protected]> * flet_video removed and replaced with git dependency * removed flet_audio * Install Flutter function * Install JDK * Update poetry.lock * platform-specific dependencies in `tool.flet.{platform}.dependencies` * deleted flet_ads folder * Fix __download_flet_client in dev mode * deleted flet_audio_recorder folder * Create android_sdk.py * accept_sdkmanager_licenses * Fix temp dir * removed flet_flashlight folder * deleted flet_geolocator folder * deleted flet_lottie * deleted flet_map * Update android_sdk.py * deleted flet_permissions_handler * Fix deprecated imports * deleted flet_rive * deleted flet_webview * Extract common utils * Replace tqdm with Rich * Replace print() with log() * Package app first * Build command logging, styling, progresses * Android SDK: cmdline-tools installation * Install cmdlinetools * Skip Android SDK installation if managed by Android Studio * Cleanup * flutter-extension choice for create * Nice way to install Android SDK packages * "sep" for template * fix badge bug * Fix process output * Disable Flutter/Dart version check and analytics * All extensions are from git tags * Flet desktop: load pre-build desktop client from build/{platform} dir * Change color theme to look nice in Ubuntu * Update poetry.lock * do not install virtualenv * do not install virtualenv in python tests * Pin virtualenv==20.28.1 * Add `flet=={version}` to requirements if no dependencies defined * Install poetry into virtual environment * add poetry to path * Remove Python 3.8 tests * Fix Windows job * Flutter 3.27.2, enable all CI jobs * update template choices * default template --------- Co-authored-by: Osama Mohammed Al-zabidi <[email protected]> Co-authored-by: TheEthicalBoy <[email protected]> Co-authored-by: ndonkoHenri <[email protected]> Co-authored-by: InesaFitsner <[email protected]>
1 parent 8c6b62b commit a71bc65

File tree

161 files changed

+1523
-7409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+1523
-7409
lines changed

.appveyor.yml

+8-9
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ skip_commits:
1010

1111
environment:
1212
python_stack: python 3.12
13-
FLUTTER_VERSION: 3.27.0
13+
FLUTTER_VERSION: 3.27.2
1414
GITHUB_TOKEN:
1515
secure: 9SKIwc3VSfYJ5IChvNR74hQprJ0DRmcV9pPX+8KyE6IXIdfMsX6ikeUmMhJGRu3ztkZaF45jmU7Xn/6tauXQXhDBxK1N8kFHFSAnq6LjUXyhS0TZKX/H+jDozBeVbCXp
1616
TWINE_USERNAME: __token__
@@ -70,11 +70,6 @@ environment:
7070
job_depends_on: build_flet_package
7171
APPVEYOR_BUILD_WORKER_IMAGE: ubuntu2004
7272

73-
- job_name: Test Python 3.8
74-
job_group: python_tests
75-
python_stack: python 3.8
76-
APPVEYOR_BUILD_WORKER_IMAGE: ubuntu2004
77-
7873
- job_name: Test Python 3.9
7974
job_group: python_tests
8075
python_stack: python 3.9
@@ -186,7 +181,10 @@ for:
186181

187182
install:
188183
- python --version
189-
- pip3 install --upgrade setuptools wheel twine poetry tomlkit virtualenv
184+
- pip3 install --upgrade setuptools wheel twine tomlkit
185+
- ps: (Invoke-WebRequest -Uri https://install.python-poetry.org -UseBasicParsing).Content | python -
186+
- ps: Add-SessionPath "$HOME\AppData\Roaming\Python\Scripts"
187+
- poetry --version
190188
- dart pub global activate fvm
191189
- set PATH=%LOCALAPPDATA%\Pub\Cache\bin;%USERPROFILE%\fvm\default\bin;%PATH%
192190
- fvm install %FLUTTER_VERSION%
@@ -461,8 +459,9 @@ for:
461459
- python --version
462460
- cd sdk/python
463461
- python -m ensurepip --upgrade
464-
- pip3 install --upgrade setuptools pip virtualenv
465-
- pip3 install poetry
462+
- pip3 install --upgrade setuptools pip
463+
- curl -sSL https://install.python-poetry.org | python -
464+
- export PATH="$HOME/.local/bin:$PATH"
466465
- poetry install
467466

468467
build: off

ci/clean-pypi.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# set PYPI_CLEANUP_PASSWORD with pypi.org password
2-
#VER="0\.22\.0\.dev"
2+
VER="0\.25\.0\.dev"
33
#VER="0\.21\.1"
44
pypi-cleanup -u flet -p flet -y -r $VER --do-it
55
pypi-cleanup -u flet -p flet-cli -y -r $VER --do-it

ci/common.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ export flet_sdk_root=$root/sdk/python
33
echo "flet_sdk_root: $flet_sdk_root"
44

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

810
function patch_python_package_versions() {
911
PYPI_VER="${APPVEYOR_BUILD_VERSION/+/.dev}"

client/.fvmrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"flutter": "3.27.1"
3+
}

client/lib/main.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'dart:io';
22

33
import 'package:flet/flet.dart';
4+
import 'package:flet_ads/flet_ads.dart' as flet_ads;
45
// --FAT_CLIENT_START--
56
import 'package:flet_audio/flet_audio.dart' as flet_audio;
67
// --FAT_CLIENT_END--
@@ -13,7 +14,6 @@ import 'package:flet_map/flet_map.dart' as flet_map;
1314
import 'package:flet_permission_handler/flet_permission_handler.dart'
1415
as flet_permission_handler;
1516
import 'package:flet_rive/flet_rive.dart' as flet_rive;
16-
import 'package:flet_ads/flet_ads.dart' as flet_ads;
1717
// --FAT_CLIENT_START--
1818
import 'package:flet_video/flet_video.dart' as flet_video;
1919
// --FAT_CLIENT_END--

client/pubspec.lock

+70-48
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ packages:
242242
source: hosted
243243
version: "0.69.0"
244244
flet:
245-
dependency: "direct main"
245+
dependency: "direct overridden"
246246
description:
247247
path: "../packages/flet"
248248
relative: true
@@ -251,80 +251,102 @@ packages:
251251
flet_ads:
252252
dependency: "direct main"
253253
description:
254-
path: "../packages/flet_ads"
255-
relative: true
256-
source: path
257-
version: "0.25.2"
254+
path: "src/flutter/flet_ads"
255+
ref: "0.1.0"
256+
resolved-ref: "01e7065fcbebb1317b3f16951e6cf0c5fcff658b"
257+
url: "https://github.com/flet-dev/flet-ads.git"
258+
source: git
259+
version: "0.1.0"
258260
flet_audio:
259261
dependency: "direct main"
260262
description:
261-
path: "../packages/flet_audio"
262-
relative: true
263-
source: path
264-
version: "0.25.2"
263+
path: "src/flutter/flet_audio"
264+
ref: "0.1.0"
265+
resolved-ref: a146bf580a211c6d1f5c45070d15532ea2e92af7
266+
url: "https://github.com/flet-dev/flet-audio.git"
267+
source: git
268+
version: "0.1.0"
265269
flet_audio_recorder:
266270
dependency: "direct main"
267271
description:
268-
path: "../packages/flet_audio_recorder"
269-
relative: true
270-
source: path
271-
version: "0.25.2"
272+
path: "src/flutter/flet_audio_recorder"
273+
ref: "0.1.0"
274+
resolved-ref: eb186cd49fde3136f65d0d074bca5ca688260e53
275+
url: "https://github.com/flet-dev/flet-audio-recorder.git"
276+
source: git
277+
version: "0.1.0"
272278
flet_flashlight:
273279
dependency: "direct main"
274280
description:
275-
path: "../packages/flet_flashlight"
276-
relative: true
277-
source: path
278-
version: "0.25.2"
281+
path: "src/flutter/flet_flashlight"
282+
ref: "0.1.0"
283+
resolved-ref: a12a12259eaac801ee99d465727ec4a9fe50121e
284+
url: "https://github.com/flet-dev/flet-flashlight.git"
285+
source: git
286+
version: "0.1.0"
279287
flet_geolocator:
280288
dependency: "direct main"
281289
description:
282-
path: "../packages/flet_geolocator"
283-
relative: true
284-
source: path
290+
path: "src/flutter/flet_geolocator"
291+
ref: "0.1.0"
292+
resolved-ref: "7b17d7aab169a7488da90fd73b3acd8e568f4f03"
293+
url: "https://github.com/flet-dev/flet-geolocator.git"
294+
source: git
285295
version: "0.25.2"
286296
flet_lottie:
287297
dependency: "direct main"
288298
description:
289-
path: "../packages/flet_lottie"
290-
relative: true
291-
source: path
292-
version: "0.25.2"
299+
path: "src/flutter/flet_lottie"
300+
ref: "0.1.0"
301+
resolved-ref: f28c767b5d43de650155a5a97e2d971fb833c9f8
302+
url: "https://github.com/flet-dev/flet-lottie.git"
303+
source: git
304+
version: "0.1.0"
293305
flet_map:
294306
dependency: "direct main"
295307
description:
296-
path: "../packages/flet_map"
297-
relative: true
298-
source: path
299-
version: "0.25.2"
308+
path: "src/flutter/flet_map"
309+
ref: "0.1.0"
310+
resolved-ref: dfa3cf6776b0dc5f238227d5f378cda7be190eaf
311+
url: "https://github.com/flet-dev/flet-map.git"
312+
source: git
313+
version: "0.1.0"
300314
flet_permission_handler:
301315
dependency: "direct main"
302316
description:
303-
path: "../packages/flet_permission_handler"
304-
relative: true
305-
source: path
306-
version: "0.25.2"
317+
path: "src/flutter/flet_permission_handler"
318+
ref: "0.1.0"
319+
resolved-ref: "4ead86b6c7e54b914215b6087fcb17b7e921d75c"
320+
url: "https://github.com/flet-dev/flet-permission-handler.git"
321+
source: git
322+
version: "0.1.0"
307323
flet_rive:
308324
dependency: "direct main"
309325
description:
310-
path: "../packages/flet_rive"
311-
relative: true
312-
source: path
313-
version: "0.25.2"
326+
path: "src/flutter/flet_rive"
327+
ref: "0.1.0"
328+
resolved-ref: "089f7ad923f747ad764aa2781eca9a36382bb912"
329+
url: "https://github.com/flet-dev/flet-rive.git"
330+
source: git
331+
version: "0.1.0"
314332
flet_video:
315333
dependency: "direct main"
316334
description:
317-
path: "../packages/flet_video"
318-
relative: true
319-
source: path
320-
version: "0.25.2"
335+
path: "src/flutter/flet_video"
336+
ref: "0.1.0"
337+
resolved-ref: "76f3f76f04c7573e047204648378ee2f31db7a15"
338+
url: "https://github.com/flet-dev/flet-video.git"
339+
source: git
340+
version: "0.1.0"
321341
flet_webview:
322342
dependency: "direct main"
323343
description:
324-
path: "../packages/flet_webview"
325-
relative: true
326-
source: path
327-
version: "0.25.2"
344+
path: "src/flutter/flet_webview"
345+
ref: "0.1.0"
346+
resolved-ref: b1cfb3155469bc0a9a7578afcd58e7f32669b164
347+
url: "https://github.com/flet-dev/flet-webview.git"
348+
source: git
349+
version: "0.1.0"
328350
flutter:
329351
dependency: "direct main"
330352
description: flutter
@@ -988,18 +1010,18 @@ packages:
9881010
dependency: transitive
9891011
description:
9901012
name: rive
991-
sha256: b44b62feb908610ca6c85e05f4573a66118a23867425926cf06152d171236141
1013+
sha256: "2551a44fa766a7ed3f52aa2b94feda6d18d00edc25dee5f66e72e9b365bb6d6c"
9921014
url: "https://pub.dev"
9931015
source: hosted
994-
version: "0.13.17"
1016+
version: "0.13.20"
9951017
rive_common:
9961018
dependency: transitive
9971019
description:
9981020
name: rive_common
999-
sha256: a3e5786f8d85c89977062b9ceeb3b72a7c28f81e32fb68497744042ce20bee2f
1021+
sha256: "2ba42f80d37a4efd0696fb715787c4785f8a13361e8aea9227c50f1e78cf763a"
10001022
url: "https://pub.dev"
10011023
source: hosted
1002-
version: "0.4.12"
1024+
version: "0.4.15"
10031025
safe_local_storage:
10041026
dependency: transitive
10051027
description:

client/pubspec.yaml

+51-13
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,68 @@ dependencies:
3131
flutter:
3232
sdk: flutter
3333

34-
flet:
35-
path: ../packages/flet
3634
# --FAT_CLIENT_START--
3735
flet_audio:
38-
path: ../packages/flet_audio
36+
git:
37+
url: https://github.com/flet-dev/flet-audio.git
38+
ref: 0.1.0
39+
path: src/flutter/flet_audio
3940
flet_video:
40-
path: ../packages/flet_video
41+
git:
42+
url: https://github.com/flet-dev/flet-video.git
43+
ref: 0.1.0
44+
path: src/flutter/flet_video
4145
# --FAT_CLIENT_END--
4246
flet_lottie:
43-
path: ../packages/flet_lottie
47+
git:
48+
url: https://github.com/flet-dev/flet-lottie.git
49+
ref: 0.1.0
50+
path: src/flutter/flet_lottie
4451
flet_map:
45-
path: ../packages/flet_map
52+
git:
53+
url: https://github.com/flet-dev/flet-map.git
54+
ref: 0.1.0
55+
path: src/flutter/flet_map
4656
flet_ads:
47-
path: ../packages/flet_ads
57+
git:
58+
url: https://github.com/flet-dev/flet-ads.git
59+
ref: 0.1.0
60+
path: src/flutter/flet_ads
61+
4862
flet_rive:
49-
path: ../packages/flet_rive
63+
git:
64+
url: https://github.com/flet-dev/flet-rive.git
65+
ref: 0.1.0
66+
path: src/flutter/flet_rive
67+
5068
flet_audio_recorder:
51-
path: ../packages/flet_audio_recorder
69+
git:
70+
url: https://github.com/flet-dev/flet-audio-recorder.git
71+
ref: 0.1.0
72+
path: src/flutter/flet_audio_recorder
73+
5274
flet_permission_handler:
53-
path: ../packages/flet_permission_handler
75+
git:
76+
url: https://github.com/flet-dev/flet-permission-handler.git
77+
ref: 0.1.0
78+
path: src/flutter/flet_permission_handler
79+
5480
flet_geolocator:
55-
path: ../packages/flet_geolocator
81+
git:
82+
url: https://github.com/flet-dev/flet-geolocator.git
83+
ref: 0.1.0
84+
path: src/flutter/flet_geolocator
85+
5686
flet_webview:
57-
path: ../packages/flet_webview
87+
git:
88+
url: https://github.com/flet-dev/flet-webview.git
89+
ref: 0.1.0
90+
path: src/flutter/flet_webview
5891
flet_flashlight:
59-
path: ../packages/flet_flashlight
92+
git:
93+
url: https://github.com/flet-dev/flet-flashlight.git
94+
ref: 0.1.0
95+
path: src/flutter/flet_flashlight
6096

6197
url_strategy: ^0.2.0
6298
cupertino_icons: ^1.0.6
@@ -65,6 +101,8 @@ dependencies:
65101
sdk: flutter
66102

67103
dependency_overrides:
104+
flet:
105+
path: ../packages/flet
68106
webview_flutter_android: ^4.0.0
69107

70108
dev_dependencies:

packages/flet_ads/.gitignore

-31
This file was deleted.

packages/flet_ads/.metadata

-10
This file was deleted.

0 commit comments

Comments
 (0)