Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Commit 65c1159

Browse files
authored
Merge pull request #43 from clerkinc/fix--Add-with-modify-gradle.js-and-update-packages
Updating packages and adding
2 parents c28a6ab + e085020 commit 65c1159

File tree

4 files changed

+95
-114
lines changed

4 files changed

+95
-114
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
//@ts-check
2+
3+
// This plugin is required for fixing `.apk` build issue
4+
// It appends Expo and RN versions into the `build.gradle` file
5+
// References:
6+
// https://github.com/t3-oss/create-t3-turbo/issues/120
7+
// https://github.com/expo/expo/issues/18129
8+
9+
const { withProjectBuildGradle } = require("@expo/config-plugins");
10+
11+
module.exports = (config) => {
12+
return withProjectBuildGradle(config, (config) => {
13+
if (!config.modResults.contents.includes("ext.getPackageJsonVersion =")) {
14+
config.modResults.contents = config.modResults.contents.replace(
15+
"buildscript {",
16+
`buildscript {
17+
ext.getPackageJsonVersion = { packageName ->
18+
new File(['node', '--print', "JSON.parse(require('fs').readFileSync(require.resolve('\${packageName}/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
19+
}`,
20+
);
21+
}
22+
23+
if (!config.modResults.contents.includes("reactNativeVersion =")) {
24+
config.modResults.contents = config.modResults.contents.replace(
25+
"ext {",
26+
`ext {
27+
reactNativeVersion = "\${ext.getPackageJsonVersion('react-native')}"`,
28+
);
29+
}
30+
31+
if (!config.modResults.contents.includes("expoPackageVersion =")) {
32+
config.modResults.contents = config.modResults.contents.replace(
33+
"ext {",
34+
`ext {
35+
expoPackageVersion = "\${ext.getPackageJsonVersion('expo')}"`,
36+
);
37+
}
38+
39+
return config;
40+
});
41+
};

apps/expo/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"expo-secure-store": "^12.0.0",
2727
"expo-status-bar": "~1.4.2",
2828
"nativewind": "^2.0.11",
29-
"react": "18.1.0",
30-
"react-dom": "18.1.0",
29+
"react": "18.2.0",
30+
"react-dom": "18.2.0",
3131
"react-native": "0.70.5",
3232
"react-native-safe-area-context": "4.4.1",
3333
"react-native-web": "~0.18.10"

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
"@manypkg/cli": "^0.19.2",
1919
"@typescript-eslint/eslint-plugin": "^5.48.2",
2020
"@typescript-eslint/parser": "^5.48.2",
21-
"eslint": "^8.32.0",
21+
"eslint": "^8.28.0",
2222
"prettier": "^2.8.3",
2323
"prettier-plugin-tailwindcss": "^0.1.13",
2424
"turbo": "^1.7.0",
25-
"typescript": "^4.9.4"
25+
"typescript": "^4.9.3"
2626
},
2727
"pnpm": {
2828
"patchedDependencies": {

0 commit comments

Comments
 (0)