Skip to content

Commit

Permalink
Merge branch 'refactor-project-structure'
Browse files Browse the repository at this point in the history
  • Loading branch information
vitalyiegorov committed Jan 7, 2025
2 parents 531e0a0 + 6f677e0 commit af4ce0e
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 5 deletions.
Binary file not shown.
13 changes: 13 additions & 0 deletions .yarn/patches/react-native-version-npm-4.0.0-521a73b041.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/index.js b/index.js
index 345f3d410750317151296c8c7e57a98d444bbdcb..da3479406bdf8df4d3fd560dfdcd03dc2becb040 100644
--- a/index.js
+++ b/index.js
@@ -119,7 +119,7 @@ function isExpoProject(projPath) {
let module = resolveFrom(projPath, "expo");
let appInfo = require(`${projPath}/app.json`);

- return !!(module && appInfo.expo);
+ return !!(module && appInfo);
} catch (err) {
return false;
}
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ android {
applicationId 'com.vitaliiyehorov.suuudokuuu'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 11
versionName "1.14.1"
versionCode 13
versionName "1.15.0"
}
signingConfigs {
debug {
Expand Down
9 changes: 9 additions & 0 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,14 @@
],
"experiments": {
"reactCompiler": true
},
"expo": {
"version": "1.15.0",
"android": {
"versionCode": 1
},
"ios": {
"buildNumber": "1"
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"knip": "^5.41.1",
"lint-staged": "^15.3.0",
"prettier": "^3.4.2",
"react-native-version": "^4.0.0",
"react-native-version": "patch:react-native-version@npm%3A4.0.0#~/.yarn/patches/react-native-version-npm-4.0.0-521a73b041.patch",
"release-it": "^17.11.0",
"sort-package-json": "^2.12.0",
"turbo": "^2.3.3",
Expand Down
27 changes: 25 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14843,7 +14843,7 @@ __metadata:
languageName: node
linkType: hard

"react-native-version@npm:^4.0.0":
"react-native-version@npm:4.0.0":
version: 4.0.0
resolution: "react-native-version@npm:4.0.0"
dependencies:
Expand All @@ -14866,6 +14866,29 @@ __metadata:
languageName: node
linkType: hard

"react-native-version@patch:react-native-version@npm%3A4.0.0#~/.yarn/patches/react-native-version-npm-4.0.0-521a73b041.patch":
version: 4.0.0
resolution: "react-native-version@patch:react-native-version@npm%3A4.0.0#~/.yarn/patches/react-native-version-npm-4.0.0-521a73b041.patch::version=4.0.0&hash=fe2359"
dependencies:
chalk: "npm:^3.0.0"
commander: "npm:^4.0.0"
common-tags: "npm:^1.4.0"
detect-indent: "npm:^6.0.0"
dottie: "npm:^2.0.0"
js-beautify: "npm:^1.7.4"
lodash.flattendeep: "npm:^4.4.0"
lodash.uniq: "npm:^4.5.0"
p-settle: "npm:^3.0.0"
pbxproj-dom: "npm:^1.0.11"
plist: "npm:^3.0.1"
resolve-from: "npm:^5.0.0"
semver: "npm:^7.0.0"
bin:
react-native-version: cli.js
checksum: 10/d0300e98ce577901003423a9f2b2969bf2bb5a0970922fabd9557e4b371599ba692687f73a17262160167687e7ccaae6a79bdc35b6b09354b3a1491f1ce736de
languageName: node
linkType: hard

"react-native-web@npm:~0.19.13":
version: 0.19.13
resolution: "react-native-web@npm:0.19.13"
Expand Down Expand Up @@ -16977,7 +17000,7 @@ __metadata:
react-native-reanimated: "npm:~3.16.1"
react-native-safe-area-context: "npm:4.12.0"
react-native-screens: "npm:~4.4.0"
react-native-version: "npm:^4.0.0"
react-native-version: "patch:react-native-version@npm%3A4.0.0#~/.yarn/patches/react-native-version-npm-4.0.0-521a73b041.patch"
react-native-web: "npm:~0.19.13"
react-redux: "npm:^8.0.5"
redux-persist: "npm:^6.0.0"
Expand Down

0 comments on commit af4ce0e

Please sign in to comment.