Skip to content

Commit

Permalink
chore: update [email protected] (expo#22898)
Browse files Browse the repository at this point in the history
# Why

0.72.0-rc.6 coming with some meaningful fixes, let bump this version for sdk 49 development & testing.

# How

- update [email protected]
- [react-native-lab] cherry-picks commits between rc.5..rc.6
- [templates][go][bare-expo][fabric-tester] apply workaround for gradle 8 + java 17 build error
- [go] update to gradle 8 (i missed this one when updating 0.72)

# Test Plan

ci passed
  • Loading branch information
Kudo authored Jun 16, 2023
1 parent 5a20e3f commit 7603b8a
Show file tree
Hide file tree
Showing 29 changed files with 135 additions and 122 deletions.
3 changes: 3 additions & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ excludeAppGlideModule=true

# This version should align to stripe-react-native's settings when upgrade the vendoring module
StripeSdk_stripeVersion=[20.19.2, 20.20.0[

# Remove this workaround when upgrading to [email protected]
kotlin.jvm.target.validation.mode=warning
3 changes: 2 additions & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 3 additions & 0 deletions apps/bare-expo/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ newArchEnabled=false
expo.jsEngine=hermes

EX_DEV_CLIENT_NETWORK_INSPECTOR=true

# Remove this workaround when upgrading to [email protected]
kotlin.jvm.target.validation.mode=warning
2 changes: 1 addition & 1 deletion apps/bare-expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"native-component-list": "*",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.72.0-rc.5",
"react-native": "0.72.0-rc.6",
"react-native-gesture-handler": "~2.10.1",
"react-native-pager-view": "6.2.0",
"react-native-reanimated": "~3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/eas-expo-go/eas.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"ios": {
"cache": {
"key": "sdk49-0.72.0",
"key": "sdk49-0.72.0-rc.6",
"customPaths": [
"../../ios/Pods"
]
Expand Down
3 changes: 3 additions & 0 deletions apps/fabric-tester/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,6 @@ expo.webp.enabled=true
# Enable animated webp support (~3.4 MB increase)
# Disabled by default because iOS doesn't support animated webp
expo.webp.animated=false

# Remove this workaround when upgrading to [email protected]
kotlin.jvm.target.validation.mode=warning
2 changes: 1 addition & 1 deletion apps/fabric-tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"expo-status-bar": "~1.5.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.72.0-rc.5",
"react-native": "0.72.0-rc.6",
"react-native-web": "~0.18.10"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion apps/jest-expo-mock-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"expo": "~49.0.0-alpha.1",
"expo-clipboard": "~4.2.0",
"react": "18.2.0",
"react-native": "0.72.0-rc.5",
"react-native": "0.72.0-rc.6",
"uuid": "^3.4.0"
}
}
2 changes: 1 addition & 1 deletion apps/native-component-list/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"processing-js": "^1.6.6",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.72.0-rc.5",
"react-native": "0.72.0-rc.6",
"react-native-dropdown-picker": "^5.3.0",
"react-native-gesture-handler": "~2.10.1",
"react-native-maps": "1.3.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/native-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"native-component-list": "*",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.72.0-rc.5"
"react-native": "0.72.0-rc.6"
},
"devDependencies": {
"@babel/core": "^7.12.9"
Expand Down
2 changes: 1 addition & 1 deletion apps/sandbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"expo": "~49.0.0-alpha.1",
"expo-router": "^1.5.3",
"react": "18.2.0",
"react-native": "0.72.0-rc.5"
"react-native": "0.72.0-rc.6"
},
"devDependencies": {
"babel-preset-expo": "~9.4.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/test-suite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"jasmine-core": "^2.4.1",
"lodash": "^4.17.19",
"react": "18.2.0",
"react-native": "0.72.0-rc.5",
"react-native": "0.72.0-rc.6",
"react-native-gesture-handler": "~2.10.1",
"sinon": "^7.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion home/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"prop-types": "^15.7.2",
"querystring": "^0.2.0",
"react": "18.2.0",
"react-native": "0.72.0-rc.5",
"react-native": "0.72.0-rc.6",
"react-native-fade-in-image": "^1.6.1",
"react-native-gesture-handler": "~2.10.1",
"react-native-infinite-scroll-view": "^0.4.5",
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3716,7 +3716,7 @@ SPEC CHECKSUMS:
EXSplashScreen: 8d00c7b625ec0f952a17ab685e1f03ac0e5c1795
EXStructuredHeaders: f3a6d417d5d12ef369fd1a31320d1c188a1b0f4b
EXTaskManager: a7a387c4e222176988261341680aa7e3f621a335
EXUpdates: 61a44f682e0805d64953017f411918d7acbb1041
EXUpdates: d01f25d40e711ac9b52f64c36410c1b30ac54e3b
EXUpdatesInterface: c08eaa7e4d1fdafff3820e0539a6d42a75fa0258
FBAEMKit: c7efe06720a8b15b1d25b68921ba46dee20996e0
FBAudienceNetwork: e0fcc9091fced34910ed0b6da06f129db46ac9e6
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
]
},
"resolutions": {
"react-native": "0.72.0-rc.5",
"react-native": "0.72.0-rc.6",
"**/util": "~0.12.4"
},
"dependencies": {
Expand Down

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions packages/expo-dev-launcher/ios/main.jsbundle

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/expo-dev-launcher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"graphql": "^16.0.1",
"graphql-request": "^3.6.1",
"react": "18.2.0",
"react-native": "0.72.0-rc.5",
"react-native": "0.72.0-rc.6",
"react-query": "^3.34.16",
"url": "^0.11.0"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/expo-dev-menu/assets/EXDevMenuApp.android.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions packages/expo-dev-menu/assets/EXDevMenuApp.ios.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/expo-dev-menu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"graphql": "^15.3.0",
"graphql-tag": "^2.10.1",
"react": "18.2.0",
"react-native": "0.72.0-rc.5",
"react-native": "0.72.0-rc.6",
"use-subscription": "^1.8.0",
"url": "^0.11.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/expo/bundledNativeModules.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"lottie-react-native": "5.1.6",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.72.0-rc.5",
"react-native": "0.72.0-rc.6",
"react-native-web": "~0.18.10",
"react-native-branch": "^5.4.0",
"react-native-gesture-handler": "~2.10.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@
"expo-module-scripts": "^3.0.9",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.72.0-rc.5"
"react-native": "0.72.0-rc.6"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,6 @@ expo.webp.enabled=true
# Enable animated webp support (~3.4 MB increase)
# Disabled by default because iOS doesn't support animated webp
expo.webp.animated=false

# Remove this workaround when upgrading to [email protected]
kotlin.jvm.target.validation.mode=warning
2 changes: 1 addition & 1 deletion templates/expo-template-bare-minimum/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"expo-splash-screen": "~0.19.0",
"expo-status-bar": "~1.5.0",
"react": "18.2.0",
"react-native": "0.72.0-rc.5"
"react-native": "0.72.0-rc.6"
},
"devDependencies": {
"@babel/core": "^7.20.0"
Expand Down
2 changes: 1 addition & 1 deletion templates/expo-template-blank-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"expo": "~49.0.0-alpha.1",
"expo-status-bar": "~1.5.0",
"react": "18.2.0",
"react-native": "0.72.0-rc.5"
"react-native": "0.72.0-rc.6"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand Down
2 changes: 1 addition & 1 deletion templates/expo-template-blank/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"expo": "~49.0.0-alpha.1",
"expo-status-bar": "~1.5.0",
"react": "18.2.0",
"react-native": "0.72.0-rc.5"
"react-native": "0.72.0-rc.6"
},
"devDependencies": {
"@babel/core": "^7.20.0"
Expand Down
2 changes: 1 addition & 1 deletion templates/expo-template-tabs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"expo-router": "^1.0.0-rc5",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.72.0-rc.5",
"react-native": "0.72.0-rc.6",
"react-native-safe-area-context": "4.5.0",
"react-native-screens": "~3.20.0",
"react-native-web": "~0.18.10"
Expand Down
Loading

0 comments on commit 7603b8a

Please sign in to comment.