Merge pull request #1845 from freakboy3742/toga-android-gradle-deps

Flag optional Toga gradle dependencies.

changes/1845.feature.rst

@@ -0,0 +1 @@
+The default Gradle dependenencies for a Toga project no longer includes SwipeRefreshLayout.

src/briefcase/bootstraps/toga.py

@@ -51,15 +51,15 @@ def pyproject_table_macOS(self):
         return """\
 universal_build = true
 requires = [
-    "toga-cocoa~=0.4.0",
+    "toga-cocoa~=0.4.5",
     "std-nslog~=1.0.0",
 ]
 """
 
     def pyproject_table_linux(self):
         return """\
 requires = [
-    "toga-gtk~=0.4.0",
+    "toga-gtk~=0.4.5",
 ]
 """
 
@@ -188,38 +188,39 @@ def pyproject_table_linux_flatpak(self):
     def pyproject_table_windows(self):
         return """\
 requires = [
-    "toga-winforms~=0.4.0",
+    "toga-winforms~=0.4.5",
 ]
 """
 
     def pyproject_table_iOS(self):
         return """\
 requires = [
-    "toga-iOS~=0.4.0",
+    "toga-iOS~=0.4.5",
     "std-nslog~=1.0.0",
 ]
 """
 
     def pyproject_table_android(self):
         return """\
 requires = [
-    "toga-android~=0.4.0",
+    "toga-android~=0.4.5",
 ]
 
 base_theme = "Theme.MaterialComponents.Light.DarkActionBar"
 
 build_gradle_dependencies = [
-    "androidx.appcompat:appcompat:1.6.1",
     "com.google.android.material:material:1.11.0",
     # Needed for DetailedList
-    "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
+    # "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
+    # Needed for MapView
+    # "org.osmdroid:osmdroid-android:6.1.0",
 ]
 """
 
     def pyproject_table_web(self):
         return """\
 requires = [
-    "toga-web~=0.4.0",
+    "toga-web~=0.4.5",
 ]
 style_framework = "Shoelace v2.3"
 """

tests/commands/new/test_build_context.py

@@ -98,13 +98,13 @@ def main():
         pyproject_table_macOS="""\
 universal_build = true
 requires = [
-    "toga-cocoa~=0.4.0",
+    "toga-cocoa~=0.4.5",
     "std-nslog~=1.0.0",
 ]
 """,
         pyproject_table_linux="""\
 requires = [
-    "toga-gtk~=0.4.0",
+    "toga-gtk~=0.4.5",
 ]
 """,
         pyproject_table_linux_system_debian="""\
@@ -219,32 +219,33 @@ def main():
 """,
         pyproject_table_windows="""\
 requires = [
-    "toga-winforms~=0.4.0",
+    "toga-winforms~=0.4.5",
 ]
 """,
         pyproject_table_iOS="""\
 requires = [
-    "toga-iOS~=0.4.0",
+    "toga-iOS~=0.4.5",
     "std-nslog~=1.0.0",
 ]
 """,
         pyproject_table_android="""\
 requires = [
-    "toga-android~=0.4.0",
+    "toga-android~=0.4.5",
 ]
 
 base_theme = "Theme.MaterialComponents.Light.DarkActionBar"
 
 build_gradle_dependencies = [
-    "androidx.appcompat:appcompat:1.6.1",
     "com.google.android.material:material:1.11.0",
     # Needed for DetailedList
-    "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
+    # "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
+    # Needed for MapView
+    # "org.osmdroid:osmdroid-android:6.1.0",
 ]
 """,
         pyproject_table_web="""\
 requires = [
-    "toga-web~=0.4.0",
+    "toga-web~=0.4.5",
 ]
 style_framework = "Shoelace v2.3"
 """,
@@ -994,13 +995,13 @@ def main():
         pyproject_table_macOS="""\
 universal_build = true
 requires = [
-    "toga-cocoa~=0.4.0",
+    "toga-cocoa~=0.4.5",
     "std-nslog~=1.0.0",
 ]
 """,
         pyproject_table_linux="""\
 requires = [
-    "toga-gtk~=0.4.0",
+    "toga-gtk~=0.4.5",
 ]
 """,
         pyproject_table_linux_system_debian="""\
@@ -1115,32 +1116,33 @@ def main():
 """,
         pyproject_table_windows="""\
 requires = [
-    "toga-winforms~=0.4.0",
+    "toga-winforms~=0.4.5",
 ]
 """,
         pyproject_table_iOS="""\
 requires = [
-    "toga-iOS~=0.4.0",
+    "toga-iOS~=0.4.5",
     "std-nslog~=1.0.0",
 ]
 """,
         pyproject_table_android="""\
 requires = [
-    "toga-android~=0.4.0",
+    "toga-android~=0.4.5",
 ]
 
 base_theme = "Theme.MaterialComponents.Light.DarkActionBar"
 
 build_gradle_dependencies = [
-    "androidx.appcompat:appcompat:1.6.1",
     "com.google.android.material:material:1.11.0",
     # Needed for DetailedList
-    "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
+    # "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
+    # Needed for MapView
+    # "org.osmdroid:osmdroid-android:6.1.0",
 ]
 """,
         pyproject_table_web="""\
 requires = [
-    "toga-web~=0.4.0",
+    "toga-web~=0.4.5",
 ]
 style_framework = "Shoelace v2.3"
 """,