Skip to content

Commit

Permalink
Merge pull request #31 from bridgefy/release/v1.1.6
Browse files Browse the repository at this point in the history
Release/v1.1.6
  • Loading branch information
julian-bridgefy authored Aug 22, 2024
2 parents 557384c + 1b1d556 commit cf0aaa2
Show file tree
Hide file tree
Showing 66 changed files with 45,146 additions and 89,514 deletions.
6 changes: 3 additions & 3 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ runs:
using: composite
steps:
- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc

- name: Cache dependencies
id: yarn-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
**/node_modules
Expand All @@ -20,7 +20,7 @@ runs:
${{ runner.os }}-yarn-
- name: Check for changes
uses: dorny/paths-filter@v2
uses: dorny/paths-filter@v3
id: changes
with:
filters: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup
Expand All @@ -39,7 +39,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ repositories {
def kotlin_version = getExtOrDefault("kotlinVersion")

dependencies {
implementation (group: "me.bridgefy", name: "android-sdk", version: "1.1.4", ext: "aar") {
implementation (group: "me.bridgefy", name: "android-sdk", version: "1.2.0", ext: "aar") {
transitive = true
}
// For < 0.71, this will be from the local maven repo
Expand Down
7 changes: 7 additions & 0 deletions example/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
module.exports = {
root: true,
extends: '@react-native',
rules: {
'react-native/no-inline-styles': 0,
'react/no-unstable-nested-components': 0,
'react/jsx-uses-react': 'off',
'react/react-in-jsx-scope': 'off',
'react-hooks/exhaustive-deps': 0,
},
};
15 changes: 7 additions & 8 deletions example/App.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
// import 'react-native-gesture-handler';
import { PaperProvider } from "react-native-paper";
import { NavigationContainer } from "@react-navigation/native";
import {PaperProvider} from 'react-native-paper';
import {NavigationContainer} from '@react-navigation/native';
import IonIcon from 'react-native-vector-icons/Ionicons';

import { HomeScreen } from "./src/presentation/screens";
import {HomeScreen} from './src/presentation/screens';

export const App = ()=> {
export const App = () => {
return (
<PaperProvider
settings={{
icon: (props) => <IonIcon { ...props } />,
}}
>
icon: props => <IonIcon {...props} />,
}}>
<NavigationContainer>
<HomeScreen />
</NavigationContainer>
</PaperProvider>
);
}
};
17 changes: 0 additions & 17 deletions example/__tests__/App.test.tsx

This file was deleted.

21 changes: 12 additions & 9 deletions example/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@ module.exports = {
},
],
],
overrides: [{
plugins: [
[
'@babel/plugin-transform-private-methods', {
'loose': true
}
]
]
}]
overrides: [
{
plugins: [
[
'@babel/plugin-transform-private-methods',
{
loose: true,
},
],
],
},
],
};
10 changes: 8 additions & 2 deletions example/ios/BridgefyReactNativeExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,10 @@
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
);
OTHER_LDFLAGS = "$(inherited) ";
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down Expand Up @@ -676,7 +679,10 @@
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
);
OTHER_LDFLAGS = "$(inherited) ";
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down
8 changes: 3 additions & 5 deletions example/metro.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@ const modules = Object.keys({
...pak.peerDependencies,
});

const { getDefaultConfig, mergeConfig } = require("@react-native/metro-config");
const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config');
const defaultConfig = getDefaultConfig(__dirname);
const { resolver: { blacklistRE, extraNodeModules } } = defaultConfig;

const config = {
resolver: {
blacklistRE: exclusionList(
modules.map(
(m) =>
new RegExp(`^${escape(path.join(root, 'node_modules', m))}\\/.*$`)
)
m => new RegExp(`^${escape(path.join(root, 'node_modules', m))}\\/.*$`),
),
),

extraNodeModules: modules.reduce((acc, name) => {
Expand Down
Loading

0 comments on commit cf0aaa2

Please sign in to comment.