Skip to content

Commit

Permalink
Merge pull request #2890 from freakboy3742/testbed-bump
Browse files Browse the repository at this point in the history
Bump android testbed dependencies.
  • Loading branch information
freakboy3742 authored Oct 7, 2024
2 parents 6b45249 + 84ae6e8 commit 45374cb
Show file tree
Hide file tree
Showing 56 changed files with 60 additions and 58 deletions.
2 changes: 1 addition & 1 deletion android/src/toga_android/widgets/mapview.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def create(self):
if OSMMapView is None: # pragma: no cover
raise RuntimeError(
"Unable to import MapView. Ensure that the OSMDroid Android "
"system package (org.osmdroid:osmdroid-android:6.1.0) "
"system package (org.osmdroid:osmdroid-android:6.1.20) "
"is listed in your app's dependencies."
)

Expand Down
2 changes: 1 addition & 1 deletion android/src/toga_android/widgets/optioncontainer.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def create(self):
if BottomNavigationView is None: # pragma: no cover
raise RuntimeError(
"Unable to import BottomNavigationView. Ensure that the Material "
"system package (com.google.android.material:material:1.11.0) "
"system package (com.google.android.material:material:1.12.0) "
"is listed in your app's dependencies."
)

Expand Down
1 change: 1 addition & 0 deletions changes/2890.removal.1.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Android applications should update their Gradle requirements to use version 1.12.0 of the Material library (``com.google.android.material:material:1.12.0``).
1 change: 1 addition & 0 deletions changes/2890.removal.2.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Android applications should update their Gradle requirements to use version 6.1.20 of the OSMDroid library (``org.osmdroid:osmdroid-android:6.1.20``).
2 changes: 1 addition & 1 deletion demo/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ requires = [
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",
"androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
]

Expand Down
2 changes: 1 addition & 1 deletion docs/reference/api/containers/optioncontainer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ System requirements

* Using OptionContainer on Android requires the Material package in your project's
Gradle dependencies. Ensure your app declares a dependency on
``com.google.android.material:material:1.11.0`` or later.
``com.google.android.material:material:1.12.0`` or later.

Notes
-----
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/api/widgets/mapview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ System requirements

* Using MapView on Android requires the OSMDroid package in your project's Gradle
dependencies. Ensure your app declares a dependency on
``org.osmdroid:osmdroid-android:6.1.0`` or later.
``org\.osmdroid:osmdroid-android:6.1.20`` or later.

Notes
-----
Expand Down
2 changes: 1 addition & 1 deletion examples/.template/{{ cookiecutter.name }}/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
"androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
]

Expand Down
2 changes: 1 addition & 1 deletion examples/activityindicator/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/beeliza/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
"androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
]

Expand Down
2 changes: 1 addition & 1 deletion examples/box/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/button/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/canvas/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/colors/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/command/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/date_and_time/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/detailedlist/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
"androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
]

Expand Down
2 changes: 1 addition & 1 deletion examples/dialogs/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/divider/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/examples_overview/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/focus/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/font/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/font_size/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/handlers/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ requires = [
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",
]

# Web deployment
Expand Down
4 changes: 2 additions & 2 deletions examples/hardware/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ requires = [
base_theme = "Theme.MaterialComponents.Light.DarkActionBar"

build_gradle_dependencies = [
"com.google.android.material:material:1.11.0",
"org.osmdroid:osmdroid-android:6.1.0",
"com.google.android.material:material:1.12.0",
"org.osmdroid:osmdroid-android:6.1.20",
]
2 changes: 1 addition & 1 deletion examples/imageview/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/layout/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
4 changes: 2 additions & 2 deletions examples/mapview/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ requires = [
base_theme = "Theme.MaterialComponents.Light.DarkActionBar"

build_gradle_dependencies = [
"com.google.android.material:material:1.11.0",
"org.osmdroid:osmdroid-android:6.1.0",
"com.google.android.material:material:1.12.0",
"org.osmdroid:osmdroid-android:6.1.20",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/multilinetextinput/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/numberinput/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/optioncontainer/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/passwordinput/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/positron-django/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/positron-static/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/progressbar/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/resize/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
4 changes: 2 additions & 2 deletions examples/screenshot/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ requires = [
base_theme = "Theme.MaterialComponents.Light.DarkActionBar"

build_gradle_dependencies = [
"com.google.android.material:material:1.11.0",
"org.osmdroid:osmdroid-android:6.1.0",
"com.google.android.material:material:1.12.0",
"org.osmdroid:osmdroid-android:6.1.20",
]
2 changes: 1 addition & 1 deletion examples/scrollcontainer/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/selection/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/simpleapp/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/slider/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/splitcontainer/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/switch_demo/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/table/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ requires = [
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",
]

# Web deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/table_source/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requires = [
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",
]

# Web deployment
Expand Down
Loading

0 comments on commit 45374cb

Please sign in to comment.