Skip to content

Commit 7a6d8a7

Browse files
committed
update project
1 parent 78dcbb4 commit 7a6d8a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+18290
-4681
lines changed

.circleci/config.yml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,62 @@
11
version: 2.1
22
jobs:
33
node:
4-
working_directory: ~/react-native-firebaseui-auth-example
4+
working_directory: ~/react-native-firebaseui-auth
55
docker:
66
- image: cimg/node:20.5.0
77
steps:
88
- checkout
99

1010
- restore_cache:
11-
key: yarn-v1-{{ checksum "yarn.lock" }}-{{ arch }}
11+
key: yarn-v1-{{ checksum "example/yarn.lock" }}-{{ arch }}
1212

1313
- restore_cache:
14-
key: node-v1-{{ checksum "package.json" }}-{{ arch }}
14+
key: node-v1-{{ checksum "example/package.json" }}-{{ arch }}
1515

1616
- run:
17-
name: install dependencies
17+
name: install dependences
1818
command: |
19+
cd example
1920
yarn install
2021
2122
- save_cache:
22-
key: yarn-v1-{{ checksum "yarn.lock" }}-{{ arch }}
23+
key: yarn-v1-{{ checksum "example/yarn.lock" }}-{{ arch }}
2324
paths:
2425
- ~/.cache/yarn
2526

2627
- save_cache:
27-
key: node-v1-{{ checksum "package.json" }}-{{ arch }}
28+
key: node-v1-{{ checksum "example/package.json" }}-{{ arch }}
2829
paths:
29-
- node_modules
30+
- example/node_modules
3031

3132
- run:
3233
name: run tests
3334
command: |
3435
mkdir -p test-results/jest
36+
cd example
3537
yarn test
3638
environment:
3739
JEST_JUNIT_OUTPUT: ./test-results/jest/junit.xml
3840

3941
- store_test_results:
40-
path: ./test-results
42+
path: ./example/test-results
4143

4244
- persist_to_workspace:
43-
root: ~/react-native-firebaseui-auth-example
45+
root: ~/react-native-firebaseui-auth
4446
paths:
45-
- node_modules
47+
- example/node_modules
4648

4749
android:
4850
working_directory: ~/
4951
docker:
5052
- image: cimg/android:2023.07-node
5153
steps:
5254
# - checkout:
53-
# path: ~/react-native-firebaseui-auth-example
54-
- run: git clone -b "$CIRCLE_BRANCH" https://github.com/oijusti/react-native-firebaseui-auth-example.git
55+
# path: ~/react-native-firebaseui-auth
56+
- run: git clone -b "$CIRCLE_BRANCH" https://github.com/oijusti/react-native-firebaseui-auth.git
5557

5658
- attach_workspace:
57-
at: ~/react-native-firebaseui-auth-example
59+
at: ~/react-native-firebaseui-auth
5860

5961
# - restore_cache:
6062
# key: bundle-v1-{{ checksum "Gemfile.lock" }}-{{ arch }}
@@ -79,7 +81,7 @@ jobs:
7981
- run:
8082
name: make gradlew executable
8183
command: |
82-
echo 'export TERM=xterm' >> $BASH_ENV && sudo chmod +x ~/react-native-firebaseui-auth-example/android/gradlew
84+
echo 'export TERM=xterm' >> $BASH_ENV && sudo chmod +x ~/react-native-firebaseui-auth/example/android/gradlew
8385
8486
- run:
8587
name: accept all licenses on error
@@ -89,7 +91,7 @@ jobs:
8991
- run:
9092
name: build debug
9193
command: |
92-
cd ~/react-native-firebaseui-auth-example/android
94+
cd ~/react-native-firebaseui-auth/example/android
9395
cd app
9496
mv ./gs ./google-services.json
9597
cd ../..
@@ -104,7 +106,7 @@ jobs:
104106
ios:
105107
macos:
106108
xcode: 14.2.0
107-
working_directory: ~/react-native-firebaseui-auth-example
109+
working_directory: ~/react-native-firebaseui-auth/example
108110

109111
# use a --login shell so our "set Ruby version" command gets picked up for later steps
110112
shell: /bin/bash --login -o pipefail
@@ -137,14 +139,14 @@ jobs:
137139
- node_modules
138140

139141
- restore_cache:
140-
key: bundle-v1-{{ checksum "Gemfile.lock" }}-{{ arch }}
142+
key: bundle-v1-{{ checksum "ios/Gemfile.lock" }}-{{ arch }}
141143

142144
- run:
143145
command: bundle install
144146
working_directory: ios
145147

146148
- save_cache:
147-
key: bundle-v1-{{ checksum "Gemfile.lock" }}-{{ arch }}
149+
key: bundle-v1-{{ checksum "ios/Gemfile.lock" }}-{{ arch }}
148150
paths:
149151
- vendor/bundle
150152

@@ -175,6 +177,6 @@ workflows:
175177
- android:
176178
requires:
177179
- node
178-
# - ios:
179-
# requires:
180-
# - node
180+
- ios:
181+
requires:
182+
- node

.gitattributes

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
*.pbxproj -text
2+
3+
# Set the default behavior, in case people don't have core.autocrlf set.
4+
* text=auto
5+
6+
# Declare files that will always have LF line endings on checkout.
7+
*.js text eol=lf
8+
*.jsx text eol=lf
9+
10+
# Denote all files that are truly binary and should not be modified.
11+
*.png binary
12+
*.jpg binary

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,6 @@ yarn-error.log
6868
# oijusti
6969
.yalc
7070
yalc.lock
71+
.yarn
72+
73+
google-services.json

App.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import React from 'react';
9-
import type {PropsWithChildren} from 'react';
9+
import type { PropsWithChildren } from 'react';
1010
import {
1111
Button,
1212
SafeAreaView,
@@ -32,7 +32,7 @@ type SectionProps = PropsWithChildren<{
3232
title: string;
3333
}>;
3434

35-
function Section({children, title}: SectionProps): JSX.Element {
35+
function Section({ children, title }: SectionProps): React.JSX.Element {
3636
const isDarkMode = useColorScheme() === 'dark';
3737
return (
3838
<View style={styles.sectionContainer}>
@@ -58,7 +58,7 @@ function Section({children, title}: SectionProps): JSX.Element {
5858
);
5959
}
6060

61-
function App(): JSX.Element {
61+
function App(): React.JSX.Element {
6262
const isDarkMode = useColorScheme() === 'dark';
6363

6464
const backgroundStyle = {
@@ -77,10 +77,10 @@ function App(): JSX.Element {
7777
<Header />
7878
<View
7979
// eslint-disable-next-line react-native/no-inline-styles
80-
style={{alignItems: 'center'}}>
80+
style={{ alignItems: 'center' }}>
8181
<Text
8282
// eslint-disable-next-line react-native/no-inline-styles
83-
style={{fontWeight: 'bold', fontSize: 24}}>
83+
style={{ fontWeight: 'bold', fontSize: 24 }}>
8484
Firebase UI Auth Example
8585
</Text>
8686
<View

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
gem 'cocoapods', '~> 1.12'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'

Gemfile.lock

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

__tests__/App.test.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ import 'react-native';
66
import React from 'react';
77
import App from '../App';
88

9-
// Note: import explicitly to use the types shiped with jest.
9+
// Note: import explicitly to use the types shipped with jest.
1010
import {it} from '@jest/globals';
1111

1212
// Note: test renderer must be required after react-native.
1313
import renderer from 'react-test-renderer';
1414

15-
jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter');
16-
1715
it('renders correctly', () => {
1816
renderer.create(<App />);
1917
});

android/app/build.gradle

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: "com.android.application"
2+
apply plugin: "org.jetbrains.kotlin.android"
23
apply plugin: "com.facebook.react"
34
apply plugin: "com.google.gms.google-services"
45

@@ -8,14 +9,14 @@ apply plugin: "com.google.gms.google-services"
89
*/
910
react {
1011
/* Folders */
11-
// The root of your project, i.e. where "package.json" lives. Default is '..'
12-
// root = file("../")
13-
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
14-
// reactNativeDir = file("../node_modules/react-native")
15-
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
16-
// codegenDir = file("../node_modules/@react-native/codegen")
17-
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
18-
// cliFile = file("../node_modules/react-native/cli.js")
12+
// The root of your project, i.e. where "package.json" lives. Default is '../..'
13+
// root = file("../../")
14+
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
15+
// reactNativeDir = file("../../node_modules/react-native")
16+
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
17+
// codegenDir = file("../../node_modules/@react-native/codegen")
18+
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
19+
// cliFile = file("../../node_modules/react-native/cli.js")
1920

2021
/* Variants */
2122
// The list of variants to that are debuggable. For those we're going to
@@ -49,6 +50,9 @@ react {
4950
//
5051
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5152
// hermesFlags = ["-O", "-output-source-map"]
53+
54+
/* Autolinking */
55+
autolinkLibrariesWithApp()
5256
}
5357

5458
/**
@@ -71,8 +75,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
7175

7276
android {
7377
ndkVersion rootProject.ext.ndkVersion
74-
75-
compileSdkVersion rootProject.ext.compileSdkVersion
78+
buildToolsVersion rootProject.ext.buildToolsVersion
79+
compileSdk rootProject.ext.compileSdkVersion
7680

7781
namespace "com.example"
7882
defaultConfig {
@@ -108,17 +112,9 @@ dependencies {
108112
// The version of react-native is set by the React Native Gradle Plugin
109113
implementation("com.facebook.react:react-android")
110114

111-
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
112-
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
113-
exclude group:'com.squareup.okhttp3', module:'okhttp'
114-
}
115-
116-
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
117115
if (hermesEnabled.toBoolean()) {
118116
implementation("com.facebook.react:hermes-android")
119117
} else {
120118
implementation jscFlavor
121119
}
122120
}
123-
124-
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

android/app/src/debug/AndroidManifest.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools">
44

5-
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
6-
75
<application
86
android:usesCleartextTraffic="true"
97
tools:targetApi="28"
10-
tools:ignore="GoogleAppIndexingWarning">
11-
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
12-
</application>
8+
tools:ignore="GoogleAppIndexingWarning"/>
139
</manifest>

0 commit comments

Comments
 (0)