Skip to content

Commit

Permalink
Revert "Merge branch 'upgrade_expo' of https://github.com/andrew-bier…
Browse files Browse the repository at this point in the history 
…man/PackRat into development"

This reverts commit 266a690, reversing
changes made to 37c784a.
  • Loading branch information
@pinocchio-life-like
pinocchio-life-like committed Dec 22, 2024
1 parent 8435d06 commit 8644aa4
Show file tree
Hide file tree
Showing 7 changed files with 94 additions and 127 deletions.
6 changes: 3 additions & 3 deletions apps/expo/app.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
"expo-build-properties",
{
"android": {
"compileSdkVersion": 35,
"targetSdkVersion": 35,
"compileSdkVersion": 34,
"targetSdkVersion": 34,
"buildToolsVersion": "34.0.0"
},
"ios": {
"deploymentTarget": "15.1",
"deploymentTarget": "13.4",
"buildNumber": "3",
"infoPlist": {
"ITSAppUsesNonExemptEncryption": false
Expand Down
Binary file modified apps/expo/assets/adaptive-icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
107 changes: 47 additions & 60 deletions apps/expo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,26 @@
"@babel/runtime": "^7.21.0",
"@bugsnag/expo": "^50.0.0",
"@expo/match-media": "^0.4.0",
"@expo/metro-runtime": "~4.0.0",
"@expo/metro-runtime": "~3.1.3",
"@expo/vector-icons": "^14.0.0",
"@expo/webpack-config": "^19.0.0",
"@fortawesome/fontawesome-svg-core": "^6.3.0",
"@fortawesome/free-solid-svg-icons": "^6.3.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@hookform/resolvers": "^3.3.4",
"@react-native-async-storage/async-storage": "1.23.1",
"@react-native-async-storage/async-storage": "1.21.0",
"@react-native-community/geolocation": "^3.0.6",
"@react-native-community/netinfo": "11.4.1",
"@react-native-community/netinfo": "11.1.0",
"@react-native-google-signin/google-signin": "^9.0.2",
"@react-native-menu/menu": "^1.1.7",
"@react-navigation/bottom-tabs": "^7.0.0",
"@react-navigation/drawer": "^7.0.0",
"@react-navigation/native": "^7.0.0",
"@react-navigation/native-stack": "^7.0.0",
"@react-native-menu/menu": "^0.9.1",
"@react-navigation/bottom-tabs": "^6.5.11",
"@react-navigation/drawer": "^6.6.6",
"@react-navigation/native": "^6.1.6",
"@react-navigation/native-stack": "^6.9.12",
"@reduxjs/toolkit": "^1.9.3",
"@rneui/base": "^4.0.0-rc.8",
"@rneui/themed": "^4.0.0-rc.8",
"@rnmapbox/maps": "^10.1.29",
"@shopify/flash-list": "1.7.1",
"@tamagui/animations-react-native": "1.96.0",
"@tamagui/babel-plugin": "1.96.0",
"@tamagui/config": "1.96.0",
Expand Down Expand Up @@ -85,34 +84,34 @@
"dotenv": "^16.0.3",
"env": "^0.0.2",
"eslint-plugin-react-native": "^4.0.0",
"expo": "^52.0.21",
"expo-application": "~6.0.1",
"expo-auth-session": "~6.0.1",
"expo-blur": "~14.0.1",
"expo-build-properties": "~0.13.1",
"expo-checkbox": "~4.0.0",
"expo-clipboard": "~7.0.0",
"expo-constants": "~17.0.3",
"expo-crypto": "~14.0.1",
"expo-dev-client": "~5.0.6",
"expo-device": "~7.0.1",
"expo-document-picker": "~13.0.1",
"expo-file-system": "~18.0.6",
"expo-font": "~13.0.2",
"expo-haptics": "~14.0.0",
"expo-image-picker": "~16.0.3",
"expo-linear-gradient": "~14.0.1",
"expo-linking": "~7.0.3",
"expo-local-authentication": "~15.0.1",
"expo-location": "~18.0.4",
"expo-random": "~14.0.1",
"expo-router": "~4.0.14",
"expo-secure-store": "~14.0.0",
"expo-splash-screen": "~0.29.18",
"expo": "^50.0.14",
"expo-application": "~5.8.4",
"expo-auth-session": "~5.4.0",
"expo-blur": "~12.9.2",
"expo-build-properties": "~0.11.1",
"expo-checkbox": "~2.7.0",
"expo-clipboard": "~5.0.1",
"expo-constants": "~15.4.6",
"expo-crypto": "~12.8.1",
"expo-dev-client": "~3.3.11",
"expo-device": "~5.9.4",
"expo-document-picker": "~11.10.1",
"expo-file-system": "~16.0.9",
"expo-font": "~11.10.3",
"expo-haptics": "~12.8.1",
"expo-image-picker": "~14.7.1",
"expo-linear-gradient": "~12.7.2",
"expo-linking": "~6.2.2",
"expo-local-authentication": "~13.8.0",
"expo-location": "~16.5.5",
"expo-random": "~13.6.0",
"expo-router": "~3.4.10",
"expo-secure-store": "~12.8.1",
"expo-splash-screen": "~0.26.4",
"expo-standard-web-crypto": "^1.7.0",
"expo-status-bar": "~2.0.0",
"expo-system-ui": "~4.0.6",
"expo-web-browser": "~14.0.1",
"expo-status-bar": "~1.11.1",
"expo-system-ui": "~2.9.3",
"expo-web-browser": "~12.8.2",
"file-saver": "^2.0.5",
"firebase": "^9.19.1",
"fuse.js": "^6.6.2",
Expand All @@ -121,30 +120,30 @@
"native-base": "^3.4.28",
"normalize-css-color": "^1.0.2",
"osmtogeojson": "^3.0.0-beta.5",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-hook-form": "^7.51.0",
"react-native": "0.76.5",
"react-native": "0.73.6",
"react-native-dotenv": "^3.4.8",
"react-native-elements": "^3.4.3",
"react-native-fast-image": "^8.6.3",
"react-native-flash-message": "^0.4.2",
"react-native-gesture-handler": "~2.20.2",
"react-native-gesture-handler": "~2.14.0",
"react-native-google-places-autocomplete": "^2.5.1",
"react-native-ios-context-menu": "^2.4.1",
"react-native-ios-utilities": "^4.3.0",
"react-native-paper": "^5.10.6",
"react-native-paper-dates": "^0.18.12",
"react-native-reanimated": "~3.16.1",
"react-native-safe-area-context": "4.12.0",
"react-native-screens": "~4.1.0",
"react-native-reanimated": "~3.6.2",
"react-native-safe-area-context": "4.8.2",
"react-native-screens": "~3.29.0",
"react-native-select-dropdown": "^3.3.4",
"react-native-svg": "15.8.0",
"react-native-svg": "14.1.0",
"react-native-table-component": "https://github.com/slice312/react-native-table-component.git",
"react-native-url-polyfill": "^2.0.0",
"react-native-vector-icons": "^10.0.3",
"react-native-web": "^0.19.10",
"react-native-webview": "13.12.5",
"react-native-webview": "13.6.4",
"react-redux": "^9.0.4",
"react-responsive": "^9.0.2",
"redux-persist": "^6.0.0",
Expand All @@ -165,11 +164,11 @@
"@types/jest": "^29.5.11",
"@types/lodash": "^4.14.202",
"@types/node": "^20.14.2",
"@types/react": "~18.3.12",
"@types/react": "~18.2.55",
"@types/react-test-renderer": "^18.0.0",
"@types/server": "^1.0.5",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"babel-preset-expo": "~12.0.0",
"babel-preset-expo": "^10.0.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-standard-with-typescript": "^38.0.0",
Expand All @@ -179,7 +178,7 @@
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.33.2",
"prettier": "^3.2.5",
"typescript": "~5.3.3"
"typescript": "^5.5.3"
},
"overrides": {
"metro": "0.73.7",
Expand All @@ -201,17 +200,5 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"expo": {
"plugins": [
[
"expo-build-properties",
{
"ios": {
"deploymentTarget": "15.1"
}
}
]
]
}
}
15 changes: 1 addition & 14 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,11 @@
"@babel/runtime": "^7.21.0",
"@manypkg/cli": "^0.21.0",
"@prisma/extension-accelerate": "^0.6.2",
"@react-native-async-storage/async-storage": "1.21.0",
"@react-native-async-storage/async-storage": "^1.23.1",
"check-dependency-version-consistency": "^4.1.0",
"cross-env": "^7.0.3",
"dotenv-cli": "^7.3.0",
"eslint": "^8.56.0",
"expo": "^52.0.21",
"husky": "^8.0.0",
"lint-staged": "^14.0.1",
"npm-run-all": "^4.1.5",
Expand Down Expand Up @@ -147,17 +146,5 @@
},
"devDependencies": {
"@changesets/cli": "^2.27.7"
},
"expo": {
"plugins": [
[
"expo-build-properties",
{
"ios": {
"deploymentTarget": "15.1"
}
}
]
]
}
}
7 changes: 0 additions & 7 deletions packages/app/app.json
View file

This file was deleted.

70 changes: 35 additions & 35 deletions packages/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
"@packrat/crosspath": "*",
"@packrat/ui": "*",
"@packrat/validations": "*",
"@react-native-async-storage/async-storage": "1.23.1",
"@react-native-async-storage/async-storage": "^1.23.1",
"@react-native-community/geolocation": "^3.0.6",
"@react-native-community/netinfo": "11.4.1",
"@react-native-community/netinfo": "11.1.0",
"@react-native-google-signin/google-signin": "^9.0.2",
"@react-navigation/drawer": "^7.0.0",
"@react-navigation/native": "^7.0.0",
"@react-navigation/native-stack": "^7.0.0",
"@react-navigation/drawer": "^6.6.6",
"@react-navigation/native": "^6.1.6",
"@react-navigation/native-stack": "^6.9.12",
"@reduxjs/toolkit": "^1.9.3",
"@rehookify/datepicker": "^6.6.1",
"@rneui/base": "^4.0.0-rc.8",
Expand Down Expand Up @@ -76,26 +76,26 @@
"date-fns": "^2.29.3",
"dotenv": "^16.0.3",
"eslint-plugin-react-native": "^4.0.0",
"expo": "^52.0.21",
"expo-application": "~6.0.1",
"expo-auth-session": "~6.0.1",
"expo-checkbox": "~4.0.0",
"expo-constants": "~17.0.3",
"expo-crypto": "~14.0.1",
"expo-document-picker": "~13.0.1",
"expo-file-system": "~18.0.6",
"expo-font": "~13.0.2",
"expo-image-picker": "~16.0.3",
"expo-linking": "~7.0.3",
"expo-location": "~18.0.4",
"expo-random": "~14.0.1",
"expo-router": "~4.0.14",
"expo-secure-store": "~14.0.0",
"expo-splash-screen": "~0.29.18",
"expo": "^50.0.14",
"expo-application": "~5.8.4",
"expo-auth-session": "~5.4.0",
"expo-checkbox": "~2.7.0",
"expo-constants": "~15.4.6",
"expo-crypto": "~12.8.1",
"expo-document-picker": "^12.0.2",
"expo-file-system": "~16.0.9",
"expo-font": "~11.10.3",
"expo-image-picker": "~14.7.1",
"expo-linking": "~6.2.2",
"expo-location": "~16.5.5",
"expo-random": "~13.6.0",
"expo-router": "~3.4.10",
"expo-secure-store": "~12.8.1",
"expo-splash-screen": "~0.26.4",
"expo-standard-web-crypto": "^1.7.0",
"expo-status-bar": "~2.0.0",
"expo-system-ui": "~4.0.6",
"expo-web-browser": "~14.0.1",
"expo-status-bar": "~1.11.1",
"expo-system-ui": "~2.9.3",
"expo-web-browser": "~12.8.2",
"file-saver": "^2.0.5",
"firebase": "^9.19.1",
"fuse.js": "^6.6.2",
Expand All @@ -110,29 +110,29 @@
"normalize-css-color": "^1.0.2",
"osmtogeojson": "^3.0.0-beta.5",
"papaparse": "^5.4.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-error-boundary": "^4.0.13",
"react-hook-form": "^7.51.0",
"react-map-gl": "^7.1.7",
"react-native": "0.76.5",
"react-native": "0.73.6",
"react-native-action-button": "^2.8.5",
"react-native-dotenv": "^3.4.8",
"react-native-elements": "^3.4.3",
"react-native-flash-message": "^0.4.2",
"react-native-gesture-handler": "~2.20.2",
"react-native-gesture-handler": "~2.14.0",
"react-native-google-places-autocomplete": "^2.5.1",
"react-native-paper": "^5.10.6",
"react-native-paper-dates": "^0.18.12",
"react-native-reanimated": "~3.16.1",
"react-native-safe-area-context": "4.12.0",
"react-native-screens": "~4.1.0",
"react-native-reanimated": "~3.6.2",
"react-native-safe-area-context": "4.8.2",
"react-native-screens": "~3.29.0",
"react-native-select-dropdown": "^3.3.4",
"react-native-svg": "15.8.0",
"react-native-svg": "14.1.0",
"react-native-table-component": "https://github.com/slice312/react-native-table-component.git",
"react-native-vector-icons": "^10.0.3",
"react-native-web": "^0.19.10",
"react-native-webview": "13.12.5",
"react-native-webview": "13.6.4",
"react-redux": "^9.0.4",
"react-responsive": "^9.0.2",
"redux-persist": "^6.0.0",
Expand All @@ -154,7 +154,7 @@
"@types/lodash": "^4.14.202",
"@types/node": "^20.14.2",
"@types/papaparse": "^5",
"@types/react": "~18.3.12",
"@types/react": "~18.2.55",
"@types/react-native": "^0.72.5",
"@types/react-test-renderer": "^18.0.0",
"@types/server": "^1.0.5",
Expand All @@ -168,7 +168,7 @@
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.33.2",
"prettier": "^3.2.5",
"typescript": "~5.3.3"
"typescript": "^5.5.3"
},
"overrides": {
"metro": "0.73.7",
Expand Down
Loading

0 comments on commit 8644aa4

Please sign in to comment.