Skip to content

Commit d7fb585

Browse files
committed
Mergele @mbert/monorepo-fix-CI-paths
2 parents 6b3c8af + e87d619 commit d7fb585

35 files changed

Lines changed: 372 additions & 1496 deletions

.github/workflows/android-build.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ jobs:
1313
build:
1414
if: github.repository == 'software-mansion/react-native-gesture-handler'
1515
runs-on: ubuntu-latest
16+
strategy:
17+
matrix:
18+
working-directory: [apps/BasicExample, apps/ExpoExample]
1619
concurrency:
17-
group: android-{{ github.ref }}
20+
group: android-${{ matrix.working-directory }}-${{ github.ref }}
1821
cancel-in-progress: true
1922
steps:
2023
- name: checkout
@@ -30,8 +33,8 @@ jobs:
3033
node-version: 18
3134
cache: 'yarn'
3235
- name: Install node dependencies
33-
working-directory: apps/BasicExample
34-
run: yarn
36+
working-directory: ${{ matrix.working-directory }}
37+
run: yarn install --immutable && yarn postinstall
3538
- name: Build app
36-
working-directory: apps/BasicExample/android
39+
working-directory: ${{ matrix.working-directory }}/android
3740
run: ./gradlew assembleDebug --console=plain -PreactNativeArchitectures=arm64-v8a

.github/workflows/ios-build.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ jobs:
1414
build:
1515
if: github.repository == 'software-mansion/react-native-gesture-handler'
1616
runs-on: macos-14
17+
strategy:
18+
matrix:
19+
working-directory: [apps/BasicExample, apps/ExpoExample]
20+
concurrency:
21+
group: ios-${{ matrix.working-directory }}-${{ github.ref }}
22+
cancel-in-progress: true
1723
env:
1824
WORKING_DIRECTORY: apps/BasicExample
1925
steps:
@@ -29,11 +35,11 @@ jobs:
2935
node-version: 18
3036
cache: 'yarn'
3137
- name: Install node dependencies
32-
working-directory: ${{ env.WORKING_DIRECTORY }}
33-
run: yarn install --immutable
38+
working-directory: ${{ matrix.working-directory }}
39+
run: yarn install --immutable && yarn postinstall
3440
- name: Install pods
35-
working-directory: ${{ env.WORKING_DIRECTORY }}/ios
41+
working-directory: ${{ matrix.working-directory }}/ios
3642
run: bundle install && NO_FLIPPER=1 bundle exec pod install
3743
- name: Build app
38-
working-directory: ${{ env.WORKING_DIRECTORY }}
44+
working-directory: ${{ matrix.working-directory }}
3945
run: npx react-native run-ios

.github/workflows/kotlin-lint.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
concurrency:
1515
group: kotlin-lint-${{ github.ref }}
1616
cancel-in-progress: true
17+
env:
18+
WORKING_DIRECTORY: 'packages/react-native-gesture-handler'
1719
steps:
1820
- name: checkout
1921
uses: actions/checkout@v4
@@ -44,9 +46,9 @@ jobs:
4446
path: |
4547
~/.gradle/caches
4648
~/.gradle/wrapper
47-
packages/react-native-gesture-handler/android/build
48-
packages/react-native-gesture-handler/android/.gradle
49-
key: ${{ runner.os }}-kotlin-lint-gradle-${{ hashFiles('packages/react-native-gesture-handler/**/*.gradle*', 'packages/react-native-gesture-handler/**/gradle-wrapper.properties', 'packages/react-native-gesture-handler/android/build.gradle') }}
49+
${{ env.WORKING_DIRECTORY }}/android/build
50+
${{ env.WORKING_DIRECTORY }}/android/.gradle
51+
key: ${{ runner.os }}-kotlin-lint-gradle-${{ hashFiles('${{ env.WORKING_DIRECTORY }}/**/*.gradle*', '${{ env.WORKING_DIRECTORY }}/**/gradle-wrapper.properties', '${{ env.WORKING_DIRECTORY }}/android/build.gradle') }}
5052

5153
- name: Lint
5254
run: yarn workspace react-native-gesture-handler lint:android

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ It makes touch interactions and gesture tracking not only smooth, but also depen
1111

1212
Check [getting started](https://docs.swmansion.com/react-native-gesture-handler/docs/#installation) section of our docs for the detailed installation instructions.
1313

14-
## Fabric
15-
16-
To learn how to use `react-native-gesture-handler` with Fabric architecture, head over to [Fabric README](README-Fabric.md). Instructions on how to run Fabric Example within this repo can be found in the [FabricExample README](FabricExample/README.md).
17-
1814
## Documentation
1915

2016
Check out our dedicated documentation page for info about this library, API reference and more: [https://docs.swmansion.com/react-native-gesture-handler/docs/](https://docs.swmansion.com/react-native-gesture-handler/docs/)

apps/BasicExample/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ react {
4545

4646
/* Hermes Commands */
4747
// The hermes compiler command to run. By default it is 'hermesc'
48-
hermesCommand = "../../node_modules/react-native/sdks/hermesc/osx-bin/hermesc"
48+
hermesCommand = "../../../../node_modules/react-native/sdks/hermesc/osx-bin/hermesc"
4949
//
5050
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5151
// hermesFlags = ["-O", "-output-source-map"]

apps/BasicExample/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=-Xmx512m -XX:MaxMetaspaceSize=512m
1414

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

apps/BasicExample/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"lint": "eslint .",
99
"start": "react-native start",
1010
"test": "jest",
11+
"postinstall": "",
1112
"ts-check": "yarn tsc --noEmit",
1213
"lint-js": "eslint --ext '.js,.ts,.tsx' src/ && yarn prettier --check './src/**/*.{js,jsx,ts,tsx}'",
1314
"format-js": "prettier --write --list-different './src/**/*.{js,jsx,ts,tsx}'"

apps/BasicExample/src/App.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { SafeAreaView } from 'react-native';
2+
import { SafeAreaView, Platform } from 'react-native';
33
import { GestureHandlerRootView } from 'react-native-gesture-handler';
44

55
import Navigator from './Navigator';
@@ -49,8 +49,9 @@ Stack.setRoutes({
4949

5050
export default function App() {
5151
return (
52-
<GestureHandlerRootView style={{ flex: 1, paddingTop: 50 }}>
53-
<SafeAreaView style={{ flex: 1 }}>
52+
<GestureHandlerRootView style={{ flex: 1 }}>
53+
<SafeAreaView
54+
style={[{ flex: 1 }, Platform.OS === 'android' && { paddingTop: 50 }]}>
5455
<Stack.Navigator initialRouteName="home" />
5556
</SafeAreaView>
5657
</GestureHandlerRootView>

apps/CommonApp/.bundle/config

Lines changed: 0 additions & 2 deletions
This file was deleted.

apps/CommonApp/.watchmanconfig

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)