Skip to content

Commit b815ba2

Browse files
committed
refactor: 更新Python版本并调整依赖项
1 parent 008db3d commit b815ba2

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

.github/workflows/desktop-and-mobile-builds.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ env:
1919
# # https://flet.dev/docs/publish#versioning
2020
# BUILD_NUMBER: 1
2121
# BUILD_VERSION: 1.0.0
22-
PYTHON_VERSION: 3.12
23-
FLUTTER_VERSION: 3.24.0
22+
PYTHON_VERSION: 3.13
23+
# FLUTTER_VERSION: 3.24.0
2424
KEYSTORE_FILE: /home/runner/work/PhiStore/PhiStore/html5syt.jks
2525
KEYSTORE_ALIAS: html5syt
2626
# PROJECT_NAME: PhiStore
@@ -125,10 +125,10 @@ jobs:
125125
python -m pip install --upgrade pip
126126
pip install -r requirements.txt
127127
128-
- name: Setup Flutter ${{ env.FLUTTER_VERSION }}
129-
uses: subosito/flutter-action@v2
130-
with:
131-
flutter-version: ${{ env.FLUTTER_VERSION }}
128+
# - name: Setup Flutter ${{ env.FLUTTER_VERSION }}
129+
# uses: subosito/flutter-action@v2
130+
# with:
131+
# flutter-version: ${{ env.FLUTTER_VERSION }}
132132

133133
- name: Flet Build Windows
134134
run: |
@@ -161,10 +161,10 @@ jobs:
161161
python -m pip install --upgrade pip
162162
pip install -r requirements.txt
163163
164-
- name: Setup Flutter ${{ env.FLUTTER_VERSION }}
165-
uses: subosito/flutter-action@v2
166-
with:
167-
flutter-version: ${{ env.FLUTTER_VERSION }}
164+
# - name: Setup Flutter ${{ env.FLUTTER_VERSION }}
165+
# uses: subosito/flutter-action@v2
166+
# with:
167+
# flutter-version: ${{ env.FLUTTER_VERSION }}
168168

169169
- name: Set up JDK 18
170170
uses: actions/setup-java@v4
@@ -209,10 +209,10 @@ jobs:
209209
python -m pip install --upgrade pip
210210
pip install -r requirements.txt
211211
212-
- name: Setup Flutter ${{ env.FLUTTER_VERSION }}
213-
uses: subosito/flutter-action@v2
214-
with:
215-
flutter-version: ${{ env.FLUTTER_VERSION }}
212+
# - name: Setup Flutter ${{ env.FLUTTER_VERSION }}
213+
# uses: subosito/flutter-action@v2
214+
# with:
215+
# flutter-version: ${{ env.FLUTTER_VERSION }}
216216

217217
- name: Patch for Android APK build
218218
run: |
@@ -266,10 +266,10 @@ jobs:
266266
python -m pip install --upgrade pip
267267
pip install -r requirements.txt
268268
269-
- name: Setup Flutter ${{ env.FLUTTER_VERSION }}
270-
uses: subosito/flutter-action@v2
271-
with:
272-
flutter-version: ${{ env.FLUTTER_VERSION }}
269+
# - name: Setup Flutter ${{ env.FLUTTER_VERSION }}
270+
# uses: subosito/flutter-action@v2
271+
# with:
272+
# flutter-version: ${{ env.FLUTTER_VERSION }}
273273

274274
- name: Flet Build IPA
275275
run: |

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ description = "PhiStore"
55
# readme = "README.md"
66
# requires-python = ">=3.8"
77
dependencies = [
8-
"flet",
9-
# "flet-audio"
8+
"flet>=0.26.0",
9+
"flet-audio"
1010
]
1111

1212

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
flet==0.25.2
2-
flet-audio==0.1.0
1+
flet>=0.26.0
2+
flet-audio
File renamed without changes.

src/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# import flet_audio as ft_a
66
# TODO: flet_audio分离
77
import PhiControls as Phi
8-
import assets.default_json as default_json
8+
import default_json as default_json
99

1010
lock = asyncio.Lock() # 防止连续点击单抽
1111
lock2 = False # 防止连抽时点击单抽
@@ -288,4 +288,4 @@ async def DEL(e, page=ft.Page):
288288
page.update()
289289

290290

291-
ft.app(target=main, view=ft.AppView.FLET_APP_WEB, port=2085)
291+
ft.app(target=main)

0 commit comments

Comments
 (0)