Skip to content

Commit

Permalink
Upgrade Expo to 52 (#42)
Browse files Browse the repository at this point in the history
The minimum iOS deployment target has been bumped to 15.5. The patch may be reverted if we want a lower target.
  • Loading branch information
zhxie authored Nov 25, 2024
1 parent 811d742 commit 2d69e30
Show file tree
Hide file tree
Showing 9 changed files with 2,125 additions and 3,261 deletions.
14 changes: 13 additions & 1 deletion app.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,19 @@ const config = {
"zh-Hant": "./i18n/locales/zh-Hant.json",
},
assetBundlePatterns: ["**/*"],
plugins: [withAndroidLargeHeap, withAndroidLocalizedName, "expo-localization"],
plugins: [
withAndroidLargeHeap,
withAndroidLocalizedName,
"expo-localization",
[
"expo-build-properties",
{
ios: {
deploymentTarget: "15.5",
},
},
],
],
splash: {
image: "./assets/splash.png",
backgroundColor: "#FAFAFA",
Expand Down
4 changes: 2 additions & 2 deletions components/Icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import createIconSet from "@expo/vector-icons/createIconSet";
import { StyleProp, ViewStyle } from "react-native";
import { StyleProp, TextStyle } from "react-native";
import { Lucide } from "../assets/fonts/Lucide";
import glyphMap from "../assets/fonts/Lucide.json";

Expand All @@ -10,7 +10,7 @@ interface IconProps {
name: Lucide;
size: number;
color?: string;
style?: StyleProp<ViewStyle>;
style?: StyleProp<TextStyle>;
}

const Icon = (props: IconProps) => {
Expand Down
3 changes: 2 additions & 1 deletion eas.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"cli": {
"version": ">= 3.0.0",
"promptToConfigurePushNotifications": false
"promptToConfigurePushNotifications": false,
"appVersionSource": "local"
},
"build": {
"development": {
Expand Down
72 changes: 40 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,48 +23,49 @@
"@react-native-async-storage/async-storage": "1.23.1",
"@react-native-community/hooks": "^3.0.0",
"@react-native-cookies/cookies": "^6.2.1",
"@react-native-segmented-control/segmented-control": "2.5.2",
"@shopify/flash-list": "1.6.4",
"@react-native-segmented-control/segmented-control": "2.5.4",
"@shopify/flash-list": "1.7.1",
"axios": "^1.7.3",
"base64-js": "^1.5.1",
"dayjs": "^1.11.12",
"expo": "~51.0.31",
"expo-background-fetch": "~12.0.1",
"expo-blur": "~13.0.2",
"expo-clipboard": "~6.0.3",
"expo-crypto": "~13.0.2",
"expo-dev-client": "~4.0.26",
"expo-device": "~6.0.2",
"expo-document-picker": "~12.0.2",
"expo-image": "~1.12.15",
"expo-intent-launcher": "~11.0.1",
"expo-localization": "~15.0.3",
"expo-mail-composer": "~13.0.1",
"expo-notifications": "~0.28.16",
"expo-sharing": "~12.0.1",
"expo-sqlite": "~14.0.6",
"expo-status-bar": "~1.12.1",
"expo-system-ui": "~3.0.7",
"expo-web-browser": "~13.0.3",
"expo": "~52.0.11",
"expo-background-fetch": "~13.0.3",
"expo-blur": "~14.0.1",
"expo-build-properties": "~0.13.1",
"expo-clipboard": "~7.0.0",
"expo-crypto": "~14.0.1",
"expo-dev-client": "~5.0.4",
"expo-device": "~7.0.1",
"expo-document-picker": "~13.0.1",
"expo-image": "~2.0.2",
"expo-intent-launcher": "~12.0.1",
"expo-localization": "~16.0.0",
"expo-mail-composer": "~14.0.1",
"expo-notifications": "~0.29.8",
"expo-sharing": "~13.0.0",
"expo-sqlite": "~15.0.3",
"expo-status-bar": "~2.0.0",
"expo-system-ui": "~4.0.4",
"expo-web-browser": "~14.0.1",
"i18n-js": "4.2.0",
"lru-cache": "^10.4.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.74.5",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-native": "0.76.3",
"react-native-error-boundary": "^1.2.4",
"react-native-gesture-handler": "~2.16.1",
"react-native-gesture-handler": "~2.20.2",
"react-native-json-tree": "^1.3.0",
"react-native-mmkv": "^2.12.2",
"react-native-progress": "^5.0.1",
"react-native-reanimated": "~3.10.1",
"react-native-reanimated": "~3.16.1",
"react-native-responsive-linechart": "^5.7.1",
"react-native-safe-area-context": "4.10.5",
"react-native-svg": "15.2.0",
"react-native-safe-area-context": "4.12.0",
"react-native-svg": "15.8.0",
"react-native-text-ticker": "^1.14.0",
"react-native-toast-banner": "^1.1.0",
"react-native-view-shot": "^3.8.0",
"react-native-webview": "13.8.6",
"react-native-zip-archive": "6.1.0",
"react-native-view-shot": "~4.0.2",
"react-native-webview": "13.12.2",
"react-native-zip-archive": "~7.0.1",
"semver": "^7.6.3",
"splatnet3-types": "0.2.20231119210145"
},
Expand All @@ -74,7 +75,7 @@
"@mmomtchev/expo-android-localized-app-name": "^1.0.1",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/color-convert": "^2.0.3",
"@types/react": "~18.2.79",
"@types/react": "~18.3.12",
"@types/semver": "^7.5.8",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
Expand All @@ -88,7 +89,14 @@
"typescript": "~5.3.3"
},
"resolutions": {
"@expo/config-plugins": "~8.0.0"
"@expo/config-plugins": "~9.0.0"
},
"expo": {
"doctor": {
"reactNativeDirectoryCheck": {
"enabled": false
}
}
},
"author": "Sketch",
"private": true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Prefetch with certain cache keys after the hashtag of each URLs.
diff --git a/node_modules/expo-image/android/src/main/java/expo/modules/image/ExpoImageModule.kt b/node_modules/expo-image/android/src/main/java/expo/modules/image/ExpoImageModule.kt
index 95a9615..8ddb38f 100644
index ee9f440..442cbd6 100644
--- a/node_modules/expo-image/android/src/main/java/expo/modules/image/ExpoImageModule.kt
+++ b/node_modules/expo-image/android/src/main/java/expo/modules/image/ExpoImageModule.kt
@@ -17,6 +17,7 @@ import com.facebook.react.uimanager.ViewProps
import com.facebook.yoga.YogaConstants
@@ -21,6 +21,7 @@ import com.github.penfeizhou.animation.gif.GifDrawable
import com.github.penfeizhou.animation.webp.WebPDrawable
import expo.modules.image.enums.ContentFit
import expo.modules.image.enums.Priority
+import expo.modules.image.okhttp.GlideUrlWithCustomCacheKey
import expo.modules.image.records.CachePolicy
import expo.modules.image.records.ContentPosition
import expo.modules.image.records.DecodeFormat
@@ -54,9 +55,14 @@ class ExpoImageModule : Module() {
@@ -68,9 +69,14 @@ class ExpoImageModule : Module() {
} ?: Headers.DEFAULT

urls.forEach {
Expand All @@ -28,10 +28,10 @@ index 95a9615..8ddb38f 100644
.encodeQuality(100)
.downsample(NoopDownsampleStrategy)
diff --git a/node_modules/expo-image/ios/ImageModule.swift b/node_modules/expo-image/ios/ImageModule.swift
index e4b7fca..d320407 100644
index 4bab386..478a826 100644
--- a/node_modules/expo-image/ios/ImageModule.swift
+++ b/node_modules/expo-image/ios/ImageModule.swift
@@ -119,6 +119,13 @@ public final class ImageModule: Module {
@@ -127,6 +127,13 @@ public final class ImageModule: Module {
context[.storeCacheType] = SDImageCacheType.none.rawValue
context[.originalQueryCacheType] = sdCacheType
context[.originalStoreCacheType] = sdCacheType
Expand Down
1 change: 1 addition & 0 deletions views/ErrorView.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as Application from "expo-application";
// TODO: migrate to expo-file-system/next.
import * as FileSystem from "expo-file-system";
import * as MailComposer from "expo-mail-composer";
import * as Sharing from "expo-sharing";
Expand Down
1 change: 1 addition & 0 deletions views/ImportView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Buffer } from "buffer";
import dayjs from "dayjs";
import * as Device from "expo-device";
import * as DocumentPicker from "expo-document-picker";
// TODO: migrate to expo-file-system/next.
import * as FileSystem from "expo-file-system";
import * as SQLite from "expo-sqlite";
import * as WebBrowser from "expo-web-browser";
Expand Down
1 change: 1 addition & 0 deletions views/MainView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { BlurView } from "expo-blur";
import * as Clipboard from "expo-clipboard";
import * as DevClient from "expo-dev-client";
import { registerDevMenuItems } from "expo-dev-menu";
// TODO: migrate to expo-file-system/next.
import * as FileSystem from "expo-file-system";
import { Image } from "expo-image";
import * as IntentLauncher from "expo-intent-launcher";
Expand Down
Loading

0 comments on commit 2d69e30

Please sign in to comment.