Skip to content

Commit 0724a37

Browse files
00-Login-Hooks upgrade to react native 79.2
1 parent c487804 commit 0724a37

37 files changed

Lines changed: 2061 additions & 7935 deletions

00-Login-Hooks/.gitignore

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23-
ios/.xcode.env.local
23+
**/.xcode.env.local
2424

2525
# Android/IntelliJ
2626
#
@@ -33,6 +33,7 @@ local.properties
3333
.cxx/
3434
*.keystore
3535
!debug.keystore
36+
.kotlin/
3637

3738
# node.js
3839
#
@@ -56,11 +57,19 @@ yarn-error.log
5657
*.jsbundle
5758

5859
# Ruby / CocoaPods
59-
/ios/Pods/
60+
**/Pods/
6061
/vendor/bundle/
6162

6263
# Temporary files created by Metro to check the health of the file watcher
6364
.metro-health-check*
6465

6566
# testing
6667
/coverage
68+
69+
# Yarn
70+
.yarn/*
71+
!.yarn/patches
72+
!.yarn/plugins
73+
!.yarn/releases
74+
!.yarn/sdks
75+
!.yarn/versions

00-Login-Hooks/Gemfile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,14 @@ 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'
9+
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'
11+
12+
# Ruby 3.4.0 has removed some libraries from the standard library.
13+
gem 'bigdecimal'
14+
gem 'logger'
15+
gem 'benchmark'
16+
gem 'mutex_m'

00-Login-Hooks/Gemfile.lock

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (7.0.7.2)
8+
activesupport (6.1.7.10)
79
concurrent-ruby (~> 1.0, >= 1.0.2)
810
i18n (>= 1.6, < 2)
911
minitest (>= 5.1)
1012
tzinfo (~> 2.0)
11-
addressable (2.8.4)
12-
public_suffix (>= 2.0.2, < 6.0)
13+
zeitwerk (~> 2.3)
14+
addressable (2.8.7)
15+
public_suffix (>= 2.0.2, < 7.0)
1316
algoliasearch (1.27.5)
1417
httpclient (~> 2.8, >= 2.8.3)
1518
json (>= 1.5.1)
1619
atomos (0.1.3)
20+
base64 (0.2.0)
21+
benchmark (0.4.0)
22+
bigdecimal (3.1.9)
1723
claide (1.1.0)
18-
cocoapods (1.12.1)
24+
cocoapods (1.15.2)
1925
addressable (~> 2.8)
2026
claide (>= 1.0.2, < 2.0)
21-
cocoapods-core (= 1.12.1)
27+
cocoapods-core (= 1.15.2)
2228
cocoapods-deintegrate (>= 1.0.3, < 2.0)
23-
cocoapods-downloader (>= 1.6.0, < 2.0)
29+
cocoapods-downloader (>= 2.1, < 3.0)
2430
cocoapods-plugins (>= 1.0.0, < 2.0)
2531
cocoapods-search (>= 1.0.0, < 2.0)
2632
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -32,8 +38,8 @@ GEM
3238
molinillo (~> 0.8.0)
3339
nap (~> 1.0)
3440
ruby-macho (>= 2.3.0, < 3.0)
35-
xcodeproj (>= 1.21.0, < 2.0)
36-
cocoapods-core (1.12.1)
41+
xcodeproj (>= 1.23.0, < 2.0)
42+
cocoapods-core (1.15.2)
3743
activesupport (>= 5.0, < 8)
3844
addressable (~> 2.8)
3945
algoliasearch (~> 1.0)
@@ -44,7 +50,7 @@ GEM
4450
public_suffix (~> 4.0)
4551
typhoeus (~> 1.0)
4652
cocoapods-deintegrate (1.0.5)
47-
cocoapods-downloader (1.6.3)
53+
cocoapods-downloader (2.1)
4854
cocoapods-plugins (1.0.0)
4955
nap
5056
cocoapods-search (1.0.1)
@@ -53,43 +59,55 @@ GEM
5359
netrc (~> 0.11)
5460
cocoapods-try (1.2.0)
5561
colored2 (3.1.2)
56-
concurrent-ruby (1.2.2)
62+
concurrent-ruby (1.3.3)
5763
escape (0.0.4)
5864
ethon (0.16.0)
5965
ffi (>= 1.15.0)
60-
ffi (1.15.5)
66+
ffi (1.17.2)
6167
fourflusher (2.3.1)
6268
fuzzy_match (2.0.4)
6369
gh_inspector (1.1.3)
64-
httpclient (2.8.3)
65-
i18n (1.14.1)
70+
httpclient (2.9.0)
71+
mutex_m
72+
i18n (1.14.7)
6673
concurrent-ruby (~> 1.0)
67-
json (2.6.3)
68-
minitest (5.19.0)
74+
json (2.7.6)
75+
logger (1.7.0)
76+
minitest (5.25.4)
6977
molinillo (0.8.0)
78+
mutex_m (0.3.0)
7079
nanaimo (0.3.0)
7180
nap (1.1.0)
7281
netrc (0.11.0)
82+
nkf (0.2.0)
7383
public_suffix (4.0.7)
74-
rexml (3.2.5)
84+
rexml (3.4.1)
7585
ruby-macho (2.5.1)
76-
typhoeus (1.4.0)
86+
typhoeus (1.4.1)
7787
ethon (>= 0.9.0)
7888
tzinfo (2.0.6)
7989
concurrent-ruby (~> 1.0)
80-
xcodeproj (1.22.0)
90+
xcodeproj (1.25.1)
8191
CFPropertyList (>= 2.3.3, < 4.0)
8292
atomos (~> 0.1.3)
8393
claide (>= 1.0.2, < 2.0)
8494
colored2 (~> 3.1)
8595
nanaimo (~> 0.3.0)
86-
rexml (~> 3.2.4)
96+
rexml (>= 3.3.6, < 4.0)
97+
zeitwerk (2.6.18)
8798

8899
PLATFORMS
89100
ruby
90101

91102
DEPENDENCIES
92-
cocoapods (~> 1.12)
103+
activesupport (>= 6.1.7.5, != 7.1.0)
104+
benchmark
105+
bigdecimal
106+
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
107+
concurrent-ruby (< 1.3.4)
108+
logger
109+
mutex_m
110+
xcodeproj (< 1.26.0)
93111

94112
RUBY VERSION
95113
ruby 2.6.10p210

00-Login-Hooks/__tests__/App.test.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22
* @format
33
*/
44

5-
import 'react-native';
65
import React from 'react';
6+
import ReactTestRenderer from 'react-test-renderer';
77
import App from '../App';
88

9-
// Note: import explicitly to use the types shiped with jest.
10-
import {it} from '@jest/globals';
11-
12-
// Note: test renderer must be required after react-native.
13-
import renderer from 'react-test-renderer';
14-
15-
it('renders correctly', () => {
16-
renderer.create(<App />);
9+
test('renders correctly', async () => {
10+
await ReactTestRenderer.act(() => {
11+
ReactTestRenderer.create(<App />);
12+
});
1713
});

00-Login-Hooks/android/app/build.gradle

Lines changed: 16 additions & 30 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

45
/**
@@ -7,14 +8,14 @@ apply plugin: "com.facebook.react"
78
*/
89
react {
910
/* Folders */
10-
// The root of your project, i.e. where "package.json" lives. Default is '..'
11-
// root = file("../")
12-
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
13-
// reactNativeDir = file("../node_modules/react-native")
14-
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
15-
// codegenDir = file("../node_modules/@react-native/codegen")
16-
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
17-
// cliFile = file("../node_modules/react-native/cli.js")
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")
1819

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

5357
/**
@@ -59,19 +63,19 @@ def enableProguardInReleaseBuilds = false
5963
* The preferred build flavor of JavaScriptCore (JSC)
6064
*
6165
* For example, to use the international variant, you can use:
62-
* `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
66+
* `def jscFlavor = io.github.react-native-community:jsc-android-intl:2026004.+`
6367
*
6468
* The international variant includes ICU i18n library and necessary data
6569
* allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
6670
* give correct results when using with locales other than en-US. Note that
6771
* this variant is about 6MiB larger per architecture than default.
6872
*/
69-
def jscFlavor = 'org.webkit:android-jsc:+'
73+
def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
7074

7175
android {
7276
ndkVersion rootProject.ext.ndkVersion
73-
74-
compileSdkVersion rootProject.ext.compileSdkVersion
77+
buildToolsVersion rootProject.ext.buildToolsVersion
78+
compileSdk rootProject.ext.compileSdkVersion
7579

7680
namespace "com.auth0samples"
7781
defaultConfig {
@@ -81,16 +85,6 @@ android {
8185
targetSdkVersion rootProject.ext.targetSdkVersion
8286
versionCode 1
8387
versionName "1.0"
84-
manifestPlaceholders = [auth0Domain: "{DOMAIN}", auth0Scheme: "${applicationId}"]
85-
}
86-
87-
splits {
88-
abi {
89-
reset()
90-
enable enableSeparateBuildPerCPUArchitecture
91-
universalApk false // If true, also generate a universal APK
92-
include (*reactNativeArchitectures())
93-
}
9488
}
9589
signingConfigs {
9690
debug {
@@ -118,17 +112,9 @@ dependencies {
118112
// The version of react-native is set by the React Native Gradle Plugin
119113
implementation("com.facebook.react:react-android")
120114

121-
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
122-
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
123-
exclude group:'com.squareup.okhttp3', module:'okhttp'
124-
}
125-
126-
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
127115
if (hermesEnabled.toBoolean()) {
128116
implementation("com.facebook.react:hermes-android")
129117
} else {
130118
implementation jscFlavor
131119
}
132120
}
133-
134-
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

00-Login-Hooks/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>

00-Login-Hooks/android/app/src/debug/java/com/auth0samples/ReactNativeFlipper.java

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

0 commit comments

Comments
 (0)