Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump android testbed dependencies. #2890

Merged
merged 2 commits into from
Oct 7, 2024
Merged

Bump android testbed dependencies. #2890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c2dc03
Bump android testbed dependencies.
freakboy3742 Oct 7, 2024
84ae6e8
Update examples to use updated Android dependencies.
freakboy3742 Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/src/toga_android/widgets/mapview.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading