Skip to content

Commit

Permalink
fix: ci and packaging issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jokerttu committed Aug 5, 2024
1 parent bc426ac commit 5c84c39
Show file tree
Hide file tree
Showing 7 changed files with 1,718 additions and 1,755 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ jobs:
with:
distribution: 'zulu'
java-version: '17'
java-package: 'jdk'

- name: Finalize Android SDK
if: env.turbo_cache_hit != 1
Expand Down Expand Up @@ -158,7 +159,7 @@ jobs:
${{ runner.os }}-cocoapods-
- name: Install cocoapods
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
if: env.turbo_cache_hit != 1 || steps.cocoapods-cache.outputs.cache-hit != 'true'
run: |
cd example/ios
pod install
Expand Down
14 changes: 8 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,16 @@ keep the code consistent and avoid common pitfalls.

#### Commit changes

1. `git commit -a -m "<your informative commit message>"`
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).

Check warning on line 71 in CONTRIBUTING.md

View check run for this annotation

In Solidarity / Inclusive Language

Match Found

Please consider an alternative to `master`. Possibilities include: `primary`, `main`, `leader`, `active`, `writer`
Raw output
/master/gi

Please make sure all your check-ins have detailed commit messages explaining the patch.
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:

`fix(navigation_view): fixed a bug!`
2. `git commit -a -m "<your informative commit message>"`

2. `git push origin <name_of_your_branch>`
Please make sure all your check-ins have detailed commit messages explaining the patch.
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:

`fix(navigation_view): fixed a bug!`

3. `git push origin <name_of_your_branch>`

#### Create pull request

Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
org.gradle.jvmargs=-Xmx2g -XX\:MaxHeapSize\=4g -XX:MaxMetaspaceSize=1g

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
20 changes: 10 additions & 10 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
"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"
},
"dependencies": {
"@react-native-async-storage/async-storage": "^1.23.1",
"@react-navigation/native": "^6.1.17",
"@react-navigation/stack": "^6.3.29",
"@react-native-async-storage/async-storage": "^1.24.0",
"@react-navigation/native": "^6.1.18",
"@react-navigation/stack": "^6.4.1",
"react": "18.2.0",
"react-native": "0.74.1",
"react-native-gesture-handler": "^2.13.3",
"react-native-gesture-handler": "^2.18.1",
"react-native-permissions": "^4.1.5",
"react-native-safe-area-context": "^4.10.1",
"react-native-screens": "^3.31.1",
"react-native-safe-area-context": "^4.10.8",
"react-native-screens": "^3.33.0",
"react-native-select-dropdown": "^4.0.1",
"react-native-snackbar": "^2.6.2"
"react-native-snackbar": "^2.7.1"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/preset-env": "^7.20.0",
"@babel/runtime": "^7.20.0",
"@react-native/babel-preset": "0.74.83",
"@react-native/metro-config": "0.74.83",
"@react-native/typescript-config": "0.74.83",
"@react-native/babel-preset": "0.74.86",
"@react-native/metro-config": "0.74.86",
"@react-native/typescript-config": "0.74.86",
"babel-plugin-module-resolver": "^5.0.0"
},
"engines": {
Expand Down
1 change: 1 addition & 0 deletions lefthook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ commit-msg:
commands:
commitlint:
run: npx commitlint --edit
rc: ~/.lefthookrc
16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,27 +53,29 @@
"test:types": "tsc --noEmit",
"lint": "eslint \"**/*.{js,ts,tsx}\"",
"clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
"prepare": "bob build"
"prepare": "bob build",
"build": "bob build"
},
"devDependencies": {
"@commitlint/config-conventional": "^17.0.2",
"@commitlint/config-conventional": "^19.2.2",
"@evilmartians/lefthook": "^1.5.0",
"@react-native/eslint-config": "^0.74.83",
"@testing-library/react-native": "^12.5.0",
"@types/jest": "^29.5.5",
"@types/react": "^18.2.44",
"commitlint": "^17.0.2",
"@types/react": "18.2.6",
"commitlint": "^19.3.0",
"del-cli": "^5.1.0",
"eslint": "^8.51.0",
"eslint-config-google": "^0.14.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-testing-library": "^6.2.2",
"jest": "^29.7.0",
"prettier": "^3.0.3",
"prettier": "^3.3.3",
"react": "18.2.0",
"react-native": "0.74.1",
"react-native-builder-bob": "^0.23.2",
"react-native-builder-bob": "^0.29.0",
"react-test-renderer": "18.2.0",
"turbo": "^1.10.7",
"typescript": ">=4.3.5 <5.4.0"
},
Expand Down
Loading

0 comments on commit 5c84c39

Please sign in to comment.