Skip to content

Commit df7a9f1

Browse files
authored
fix: ci and packaging issues (#220)
1 parent bc426ac commit df7a9f1

File tree

7 files changed

+1719
-1756
lines changed

7 files changed

+1719
-1756
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ jobs:
9595
with:
9696
distribution: 'zulu'
9797
java-version: '17'
98+
java-package: 'jdk'
9899

99100
- name: Finalize Android SDK
100101
if: env.turbo_cache_hit != 1
@@ -153,12 +154,12 @@ jobs:
153154
with:
154155
path: |
155156
**/ios/Pods
156-
key: ${{ runner.os }}-cocoapods-${{ hashFiles('example/ios/Podfile.lock') }}
157+
key: ${{ runner.os }}-cocoapods-${{ hashFiles('**/package.json') }}
157158
restore-keys: |
158159
${{ runner.os }}-cocoapods-
159160
160161
- name: Install cocoapods
161-
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
162+
if: env.turbo_cache_hit != 1 || steps.cocoapods-cache.outputs.cache-hit != 'true'
162163
run: |
163164
cd example/ios
164165
pod install

CONTRIBUTING.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,16 @@ keep the code consistent and avoid common pitfalls.
6868

6969
#### Commit changes
7070

71-
1. `git commit -a -m "<your informative commit message>"`
71+
1. This project uses `lefthook` to ensure tests pass before committing. Please configure your environment paths to include the Go binary path for `addlicense` and the Node binary path for `npx` in the `~/.lefthookrc` file. For more information, refer to the [lefthook documentation](https://github.com/evilmartians/lefthook/blob/master/docs/configuration.md#rc).
7272

73-
Please make sure all your check-ins have detailed commit messages explaining the patch.
74-
When naming the title of your pull request, please follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0-beta.4/) guide. For example, for a fix to the Driver library:
75-
76-
`fix(navigation_view): fixed a bug!`
73+
2. `git commit -a -m "<your informative commit message>"`
7774

78-
2. `git push origin <name_of_your_branch>`
75+
Please make sure all your check-ins have detailed commit messages explaining the patch.
76+
When naming the title of your pull request, please follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0-beta.4/) guide. For example, for a fix to the Driver library:
77+
78+
`fix(navigation_view): fixed a bug!`
79+
80+
3. `git push origin <name_of_your_branch>`
7981

8082
#### Create pull request
8183

example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
1212
# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
13-
org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
13+
org.gradle.jvmargs=-Xmx2g -XX\:MaxHeapSize\=4g -XX:MaxMetaspaceSize=1g
1414

1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit

example/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@
1212
"build:ios": "cd ios && xcodebuild -workspace SampleApp.xcworkspace -scheme SampleApp -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO"
1313
},
1414
"dependencies": {
15-
"@react-native-async-storage/async-storage": "^1.23.1",
16-
"@react-navigation/native": "^6.1.17",
17-
"@react-navigation/stack": "^6.3.29",
15+
"@react-native-async-storage/async-storage": "^1.24.0",
16+
"@react-navigation/native": "^6.1.18",
17+
"@react-navigation/stack": "^6.4.1",
1818
"react": "18.2.0",
1919
"react-native": "0.74.1",
20-
"react-native-gesture-handler": "^2.13.3",
20+
"react-native-gesture-handler": "^2.18.1",
2121
"react-native-permissions": "^4.1.5",
22-
"react-native-safe-area-context": "^4.10.1",
23-
"react-native-screens": "^3.31.1",
22+
"react-native-safe-area-context": "^4.10.8",
23+
"react-native-screens": "^3.33.0",
2424
"react-native-select-dropdown": "^4.0.1",
25-
"react-native-snackbar": "^2.6.2"
25+
"react-native-snackbar": "^2.7.1"
2626
},
2727
"devDependencies": {
2828
"@babel/core": "^7.20.0",
2929
"@babel/preset-env": "^7.20.0",
3030
"@babel/runtime": "^7.20.0",
31-
"@react-native/babel-preset": "0.74.83",
32-
"@react-native/metro-config": "0.74.83",
33-
"@react-native/typescript-config": "0.74.83",
31+
"@react-native/babel-preset": "0.74.86",
32+
"@react-native/metro-config": "0.74.86",
33+
"@react-native/typescript-config": "0.74.86",
3434
"babel-plugin-module-resolver": "^5.0.0"
3535
},
3636
"engines": {

lefthook.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ commit-msg:
3030
commands:
3131
commitlint:
3232
run: npx commitlint --edit
33+
rc: ~/.lefthookrc

package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,27 +53,29 @@
5353
"test:types": "tsc --noEmit",
5454
"lint": "eslint \"**/*.{js,ts,tsx}\"",
5555
"clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
56-
"prepare": "bob build"
56+
"prepare": "bob build",
57+
"build": "bob build"
5758
},
5859
"devDependencies": {
59-
"@commitlint/config-conventional": "^17.0.2",
60+
"@commitlint/config-conventional": "^19.2.2",
6061
"@evilmartians/lefthook": "^1.5.0",
6162
"@react-native/eslint-config": "^0.74.83",
6263
"@testing-library/react-native": "^12.5.0",
6364
"@types/jest": "^29.5.5",
64-
"@types/react": "^18.2.44",
65-
"commitlint": "^17.0.2",
65+
"@types/react": "18.2.6",
66+
"commitlint": "^19.3.0",
6667
"del-cli": "^5.1.0",
6768
"eslint": "^8.51.0",
6869
"eslint-config-google": "^0.14.0",
6970
"eslint-config-prettier": "^9.0.0",
70-
"eslint-plugin-prettier": "^5.0.1",
71+
"eslint-plugin-prettier": "^5.2.1",
7172
"eslint-plugin-testing-library": "^6.2.2",
7273
"jest": "^29.7.0",
73-
"prettier": "^3.0.3",
74+
"prettier": "^3.3.3",
7475
"react": "18.2.0",
7576
"react-native": "0.74.1",
76-
"react-native-builder-bob": "^0.23.2",
77+
"react-native-builder-bob": "^0.29.0",
78+
"react-test-renderer": "18.2.0",
7779
"turbo": "^1.10.7",
7880
"typescript": ">=4.3.5 <5.4.0"
7981
},

0 commit comments

Comments
 (0)