Skip to content

Commit

Permalink
Merge branch 'main' into react/bump-react-types
Browse files Browse the repository at this point in the history
  • Loading branch information
calebpollman authored Dec 6, 2024
2 parents efc4bfc + 9069cac commit 1721702
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 25 deletions.
5 changes: 5 additions & 0 deletions .changeset/gentle-countries-kneel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@aws-amplify/ui-react-geo": patch
---

fix: bump maplibre-gl-js-amplify dep
7 changes: 3 additions & 4 deletions .github/workflows/reusable-build-system-test-react-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ jobs:
fail-fast: false
matrix:
framework: [react-native]
framework-version:
[
framework-version: [
# uncomment to enable
# { formatted: latest, value: latest },
{ formatted: 075, value: 0.75 },
Expand Down Expand Up @@ -53,8 +52,8 @@ jobs:
platform: android
framework-version: { formatted: '071', value: '0.71' }
include:
# Expo makes you specify a version of the SDK that supports that a particular version of React Native
# https://stackoverflow.com/questions/63463373/create-an-expo-project-with-a-specific-version
# Expo makes you specify a version of the SDK that supports a specific version of React Native
# https://stackoverflow.com/questions/63463373/create-an-expo-project-with-a-specific-version
- framework: react-native
framework-version: { formatted: 070, value: '0.70' }
build-tool: expo
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/reusable-build-system-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ jobs:
fail-fast: false
matrix:
framework: [react]
framework-version: [latest]
# temporarily pointing all react tests to v18
# framework-version: [latest]
framework-version: [18]
build-tool: [next, vite]
build-tool-version: [latest]
pkg-manager: [npm]
Expand Down
2 changes: 1 addition & 1 deletion packages/react-geo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@aws-amplify/ui-react-core": "3.1.1",
"mapbox-gl": "1.13.1",
"maplibre-gl": "2.1.9",
"maplibre-gl-js-amplify": "^4.0.1",
"maplibre-gl-js-amplify": "4.0.2",
"react-map-gl": "7.0.23",
"tslib": "^2.5.2"
},
Expand Down
25 changes: 6 additions & 19 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1721702

Please sign in to comment.