Skip to content

Commit

Permalink
Merge pull request #2017 from rmartin16/bootstrap-bumps
Browse files Browse the repository at this point in the history
Bump versions in Toga bootstrap
  • Loading branch information
freakboy3742 authored Oct 7, 2024
2 parents 618fbc5 + e2fd9c5 commit c11a391
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 27 deletions.
1 change: 1 addition & 0 deletions changes/2017.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The versions for Toga's dependencies in its bootstrap were bumped to their latest versions.
18 changes: 9 additions & 9 deletions src/briefcase/bootstraps/toga.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ def pyproject_table_macOS(self):
return """\
universal_build = true
requires = [
"toga-cocoa~=0.4.6",
"toga-cocoa~=0.4.7",
"std-nslog~=1.0.3",
]
"""

def pyproject_table_linux(self):
return """\
requires = [
"toga-gtk~=0.4.6",
"toga-gtk~=0.4.7",
]
"""

Expand Down Expand Up @@ -181,46 +181,46 @@ def pyproject_table_linux_appimage(self):
def pyproject_table_linux_flatpak(self):
return """\
flatpak_runtime = "org.gnome.Platform"
flatpak_runtime_version = "46"
flatpak_runtime_version = "47"
flatpak_sdk = "org.gnome.Sdk"
"""

def pyproject_table_windows(self):
return """\
requires = [
"toga-winforms~=0.4.6",
"toga-winforms~=0.4.7",
]
"""

def pyproject_table_iOS(self):
return """\
requires = [
"toga-iOS~=0.4.6",
"toga-iOS~=0.4.7",
"std-nslog~=1.0.3",
]
"""

def pyproject_table_android(self):
return """\
requires = [
"toga-android~=0.4.6",
"toga-android~=0.4.7",
]
base_theme = "Theme.MaterialComponents.Light.DarkActionBar"
build_gradle_dependencies = [
"com.google.android.material:material:1.11.0",
"com.google.android.material:material:1.12.0",
# Needed for DetailedList
# "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
# Needed for MapView
# "org.osmdroid:osmdroid-android:6.1.0",
# "org.osmdroid:osmdroid-android:6.1.20",
]
"""

def pyproject_table_web(self):
return """\
requires = [
"toga-web~=0.4.6",
"toga-web~=0.4.7",
]
style_framework = "Shoelace v2.3"
"""
36 changes: 18 additions & 18 deletions tests/commands/new/test_build_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,13 @@ def main():
pyproject_table_macOS="""\
universal_build = true
requires = [
"toga-cocoa~=0.4.6",
"toga-cocoa~=0.4.7",
"std-nslog~=1.0.3",
]
""",
pyproject_table_linux="""\
requires = [
"toga-gtk~=0.4.6",
"toga-gtk~=0.4.7",
]
""",
pyproject_table_linux_system_debian="""\
Expand Down Expand Up @@ -277,38 +277,38 @@ def main():
""",
pyproject_table_linux_flatpak="""\
flatpak_runtime = "org.gnome.Platform"
flatpak_runtime_version = "46"
flatpak_runtime_version = "47"
flatpak_sdk = "org.gnome.Sdk"
""",
pyproject_table_windows="""\
requires = [
"toga-winforms~=0.4.6",
"toga-winforms~=0.4.7",
]
""",
pyproject_table_iOS="""\
requires = [
"toga-iOS~=0.4.6",
"toga-iOS~=0.4.7",
"std-nslog~=1.0.3",
]
""",
pyproject_table_android="""\
requires = [
"toga-android~=0.4.6",
"toga-android~=0.4.7",
]
base_theme = "Theme.MaterialComponents.Light.DarkActionBar"
build_gradle_dependencies = [
"com.google.android.material:material:1.11.0",
"com.google.android.material:material:1.12.0",
# Needed for DetailedList
# "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
# Needed for MapView
# "org.osmdroid:osmdroid-android:6.1.0",
# "org.osmdroid:osmdroid-android:6.1.20",
]
""",
pyproject_table_web="""\
requires = [
"toga-web~=0.4.6",
"toga-web~=0.4.7",
]
style_framework = "Shoelace v2.3"
""",
Expand Down Expand Up @@ -1058,13 +1058,13 @@ def main():
pyproject_table_macOS="""\
universal_build = true
requires = [
"toga-cocoa~=0.4.6",
"toga-cocoa~=0.4.7",
"std-nslog~=1.0.3",
]
""",
pyproject_table_linux="""\
requires = [
"toga-gtk~=0.4.6",
"toga-gtk~=0.4.7",
]
""",
pyproject_table_linux_system_debian="""\
Expand Down Expand Up @@ -1174,38 +1174,38 @@ def main():
""",
pyproject_table_linux_flatpak="""\
flatpak_runtime = "org.gnome.Platform"
flatpak_runtime_version = "46"
flatpak_runtime_version = "47"
flatpak_sdk = "org.gnome.Sdk"
""",
pyproject_table_windows="""\
requires = [
"toga-winforms~=0.4.6",
"toga-winforms~=0.4.7",
]
""",
pyproject_table_iOS="""\
requires = [
"toga-iOS~=0.4.6",
"toga-iOS~=0.4.7",
"std-nslog~=1.0.3",
]
""",
pyproject_table_android="""\
requires = [
"toga-android~=0.4.6",
"toga-android~=0.4.7",
]
base_theme = "Theme.MaterialComponents.Light.DarkActionBar"
build_gradle_dependencies = [
"com.google.android.material:material:1.11.0",
"com.google.android.material:material:1.12.0",
# Needed for DetailedList
# "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
# Needed for MapView
# "org.osmdroid:osmdroid-android:6.1.0",
# "org.osmdroid:osmdroid-android:6.1.20",
]
""",
pyproject_table_web="""\
requires = [
"toga-web~=0.4.6",
"toga-web~=0.4.7",
]
style_framework = "Shoelace v2.3"
""",
Expand Down

0 comments on commit c11a391

Please sign in to comment.