Skip to content

Commit c11a391

Browse files
authored
Merge pull request #2017 from rmartin16/bootstrap-bumps
Bump versions in Toga bootstrap
2 parents 618fbc5 + e2fd9c5 commit c11a391

File tree

3 files changed

+28
-27
lines changed

3 files changed

+28
-27
lines changed

changes/2017.misc.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The versions for Toga's dependencies in its bootstrap were bumped to their latest versions.

src/briefcase/bootstraps/toga.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ def pyproject_table_macOS(self):
5151
return """\
5252
universal_build = true
5353
requires = [
54-
"toga-cocoa~=0.4.6",
54+
"toga-cocoa~=0.4.7",
5555
"std-nslog~=1.0.3",
5656
]
5757
"""
5858

5959
def pyproject_table_linux(self):
6060
return """\
6161
requires = [
62-
"toga-gtk~=0.4.6",
62+
"toga-gtk~=0.4.7",
6363
]
6464
"""
6565

@@ -181,46 +181,46 @@ def pyproject_table_linux_appimage(self):
181181
def pyproject_table_linux_flatpak(self):
182182
return """\
183183
flatpak_runtime = "org.gnome.Platform"
184-
flatpak_runtime_version = "46"
184+
flatpak_runtime_version = "47"
185185
flatpak_sdk = "org.gnome.Sdk"
186186
"""
187187

188188
def pyproject_table_windows(self):
189189
return """\
190190
requires = [
191-
"toga-winforms~=0.4.6",
191+
"toga-winforms~=0.4.7",
192192
]
193193
"""
194194

195195
def pyproject_table_iOS(self):
196196
return """\
197197
requires = [
198-
"toga-iOS~=0.4.6",
198+
"toga-iOS~=0.4.7",
199199
"std-nslog~=1.0.3",
200200
]
201201
"""
202202

203203
def pyproject_table_android(self):
204204
return """\
205205
requires = [
206-
"toga-android~=0.4.6",
206+
"toga-android~=0.4.7",
207207
]
208208
209209
base_theme = "Theme.MaterialComponents.Light.DarkActionBar"
210210
211211
build_gradle_dependencies = [
212-
"com.google.android.material:material:1.11.0",
212+
"com.google.android.material:material:1.12.0",
213213
# Needed for DetailedList
214214
# "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
215215
# Needed for MapView
216-
# "org.osmdroid:osmdroid-android:6.1.0",
216+
# "org.osmdroid:osmdroid-android:6.1.20",
217217
]
218218
"""
219219

220220
def pyproject_table_web(self):
221221
return """\
222222
requires = [
223-
"toga-web~=0.4.6",
223+
"toga-web~=0.4.7",
224224
]
225225
style_framework = "Shoelace v2.3"
226226
"""

tests/commands/new/test_build_context.py

+18-18
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,13 @@ def main():
161161
pyproject_table_macOS="""\
162162
universal_build = true
163163
requires = [
164-
"toga-cocoa~=0.4.6",
164+
"toga-cocoa~=0.4.7",
165165
"std-nslog~=1.0.3",
166166
]
167167
""",
168168
pyproject_table_linux="""\
169169
requires = [
170-
"toga-gtk~=0.4.6",
170+
"toga-gtk~=0.4.7",
171171
]
172172
""",
173173
pyproject_table_linux_system_debian="""\
@@ -277,38 +277,38 @@ def main():
277277
""",
278278
pyproject_table_linux_flatpak="""\
279279
flatpak_runtime = "org.gnome.Platform"
280-
flatpak_runtime_version = "46"
280+
flatpak_runtime_version = "47"
281281
flatpak_sdk = "org.gnome.Sdk"
282282
""",
283283
pyproject_table_windows="""\
284284
requires = [
285-
"toga-winforms~=0.4.6",
285+
"toga-winforms~=0.4.7",
286286
]
287287
""",
288288
pyproject_table_iOS="""\
289289
requires = [
290-
"toga-iOS~=0.4.6",
290+
"toga-iOS~=0.4.7",
291291
"std-nslog~=1.0.3",
292292
]
293293
""",
294294
pyproject_table_android="""\
295295
requires = [
296-
"toga-android~=0.4.6",
296+
"toga-android~=0.4.7",
297297
]
298298
299299
base_theme = "Theme.MaterialComponents.Light.DarkActionBar"
300300
301301
build_gradle_dependencies = [
302-
"com.google.android.material:material:1.11.0",
302+
"com.google.android.material:material:1.12.0",
303303
# Needed for DetailedList
304304
# "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
305305
# Needed for MapView
306-
# "org.osmdroid:osmdroid-android:6.1.0",
306+
# "org.osmdroid:osmdroid-android:6.1.20",
307307
]
308308
""",
309309
pyproject_table_web="""\
310310
requires = [
311-
"toga-web~=0.4.6",
311+
"toga-web~=0.4.7",
312312
]
313313
style_framework = "Shoelace v2.3"
314314
""",
@@ -1058,13 +1058,13 @@ def main():
10581058
pyproject_table_macOS="""\
10591059
universal_build = true
10601060
requires = [
1061-
"toga-cocoa~=0.4.6",
1061+
"toga-cocoa~=0.4.7",
10621062
"std-nslog~=1.0.3",
10631063
]
10641064
""",
10651065
pyproject_table_linux="""\
10661066
requires = [
1067-
"toga-gtk~=0.4.6",
1067+
"toga-gtk~=0.4.7",
10681068
]
10691069
""",
10701070
pyproject_table_linux_system_debian="""\
@@ -1174,38 +1174,38 @@ def main():
11741174
""",
11751175
pyproject_table_linux_flatpak="""\
11761176
flatpak_runtime = "org.gnome.Platform"
1177-
flatpak_runtime_version = "46"
1177+
flatpak_runtime_version = "47"
11781178
flatpak_sdk = "org.gnome.Sdk"
11791179
""",
11801180
pyproject_table_windows="""\
11811181
requires = [
1182-
"toga-winforms~=0.4.6",
1182+
"toga-winforms~=0.4.7",
11831183
]
11841184
""",
11851185
pyproject_table_iOS="""\
11861186
requires = [
1187-
"toga-iOS~=0.4.6",
1187+
"toga-iOS~=0.4.7",
11881188
"std-nslog~=1.0.3",
11891189
]
11901190
""",
11911191
pyproject_table_android="""\
11921192
requires = [
1193-
"toga-android~=0.4.6",
1193+
"toga-android~=0.4.7",
11941194
]
11951195
11961196
base_theme = "Theme.MaterialComponents.Light.DarkActionBar"
11971197
11981198
build_gradle_dependencies = [
1199-
"com.google.android.material:material:1.11.0",
1199+
"com.google.android.material:material:1.12.0",
12001200
# Needed for DetailedList
12011201
# "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
12021202
# Needed for MapView
1203-
# "org.osmdroid:osmdroid-android:6.1.0",
1203+
# "org.osmdroid:osmdroid-android:6.1.20",
12041204
]
12051205
""",
12061206
pyproject_table_web="""\
12071207
requires = [
1208-
"toga-web~=0.4.6",
1208+
"toga-web~=0.4.7",
12091209
]
12101210
style_framework = "Shoelace v2.3"
12111211
""",

0 commit comments

Comments
 (0)