Skip to content

Commit cf827f3

Browse files
Saadnajmivonovak
andauthored
chore: update repo and example to React Native 0.73 (#879)
* ^ This is a combination of 2 commits. ^ This is the 1st commit message: Update RNTA to 0.73 ^ The commit message #2 will be skipped: ^ update RNTA * Try remove test butler * Remove E2E tests for Android new arch * Pick up main's version of ComponentDescriptor * Update react-native-localize and locks * Undo comment out test-butler * Update package.json Co-authored-by: Vojtech Novak <[email protected]> * Update package.json Co-authored-by: Vojtech Novak <[email protected]> * Update package.json Co-authored-by: Vojtech Novak <[email protected]> * Update package.json * Update lock --------- Co-authored-by: Vojtech Novak <[email protected]>
1 parent 950cea9 commit cf827f3

31 files changed

+3377
-2271
lines changed

.circleci/config.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
new_arch_ios_build_only:
3434
executor:
3535
name: rn/macos
36-
xcode_version: '15.0.0'
36+
xcode_version: '15.3.0'
3737
steps:
3838
- checkout
3939
- run:
@@ -50,7 +50,7 @@ jobs:
5050
e2e_release_ios:
5151
executor:
5252
name: rn/macos
53-
xcode_version: '15.0.0'
53+
xcode_version: '15.3.0'
5454
steps:
5555
- checkout
5656
- run:
@@ -127,7 +127,7 @@ jobs:
127127
path: ./artifacts
128128

129129

130-
e2e_release_android_new_arch:
130+
new_arch_android_build_only:
131131
executor:
132132
name: android/android-machine
133133
resource-class: large
@@ -164,9 +164,6 @@ jobs:
164164
name: build app for e2e tests
165165
# - android/wait-for-emulator
166166
# - android/disable-animations
167-
- run:
168-
command: yarn detox:android:test:release
169-
name: run e2e tests
170167
- store_artifacts:
171168
path: ./artifacts
172169

@@ -191,12 +188,12 @@ workflows:
191188
- analyse_js
192189
- e2e_release_ios
193190
- e2e_release_android
194-
- e2e_release_android_new_arch
191+
- new_arch_android_build_only
195192
- new_arch_ios_build_only
196193
- publish:
197194
requires:
198195
- e2e_release_android
199-
- e2e_release_android_new_arch
196+
- new_arch_android_build_only
200197
- e2e_release_ios
201198
- new_arch_ios_build_only
202199
filters:

.flowconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ node_modules/react-native/Libraries/polyfills/.*
1515

1616
[untyped]
1717
.*/node_modules/@react-native-community/cli/.*/.*
18+
.*/test/.*
1819

1920
[include]
2021

@@ -63,4 +64,4 @@ untyped-import
6364
untyped-type-import
6465

6566
[version]
66-
^0.182.0
67+
^0.217.0

RNDateTimePicker.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
1010
s.license = package['license']
1111
s.author = package['author']
1212
s.homepage = package['homepage']
13-
s.platforms = { :ios => "11.0", :visionos => "1.0" }
13+
s.platforms = { :ios => "11.0", :visionos => "1.0" }
1414
s.source = { :git => "https://github.com/react-native-community/datetimepicker", :tag => "v#{s.version}" }
1515
s.source_files = "ios/**/*.{h,m,mm,cpp}"
1616
s.requires_arc = true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.reactcommunity.rndatetimepicker">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
22
<application />
33
</manifest>

babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const isLintingOrTesting =
44
module.exports = {
55
presets: [
66
[
7-
'module:metro-react-native-babel-preset',
7+
'module:@react-native/babel-preset',
88
// this is a workaround for some deeper issue
99
{useTransformReactJSXExperimental: !isLintingOrTesting},
1010
],

example/.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
.gradle/
77
.idea/
88
.vs/
9+
.xcode.env
910
Pods/
1011
build/
11-
dist/
12+
dist/*
13+
!dist/.gitignore
1214
local.properties
1315
msbuild.binlog
1416
node_modules/

example/App.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
IOS_MODE,
2626
ANDROID_DISPLAY,
2727
IOS_DISPLAY,
28-
} from '../src/constants';
28+
} from '@react-native-community/datetimepicker/src/constants';
2929
import * as RNLocalize from 'react-native-localize';
3030

3131
const timezone = [
@@ -632,3 +632,5 @@ const styles = StyleSheet.create({
632632
width: 350,
633633
},
634634
});
635+
636+
export default App;

example/android/build.gradle

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
buildscript {
2-
def androidTestAppDir = "../../node_modules/react-native-test-app/android"
3-
apply(from: "${androidTestAppDir}/dependencies.gradle")
2+
apply(from: {
3+
def searchDir = rootDir.toPath()
4+
do {
5+
def p = searchDir.resolve("node_modules/react-native-test-app/android/dependencies.gradle")
6+
if (p.toFile().exists()) {
7+
return p.toRealPath().toString()
8+
}
9+
} while (searchDir = searchDir.getParent())
10+
throw new GradleException("Could not find `react-native-test-app`");
11+
}())
412

513
repositories {
614
mavenCentral()
@@ -18,14 +26,23 @@ allprojects {
1826
repositories {
1927
maven {
2028
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
21-
url("${rootDir}/../../node_modules/react-native/android")
29+
url({
30+
def searchDir = rootDir.toPath()
31+
do {
32+
def p = searchDir.resolve("node_modules/react-native/android")
33+
if (p.toFile().exists()) {
34+
return p.toRealPath().toString()
35+
}
36+
} while (searchDir = searchDir.getParent())
37+
throw new GradleException("Could not find `react-native`");
38+
}())
2239
}
40+
maven {
41+
// All of Detox' artifacts are provided via the npm module
42+
url "$rootDir/../../node_modules/detox/Detox-android"
43+
}
2344
mavenCentral()
2445
google()
25-
maven {
26-
// All of Detox' artifacts are provided via the npm module
27-
url "$rootDir/../../node_modules/detox/Detox-android"
28-
}
2946
}
3047
afterEvaluate { project ->
3148
def androidExtension = project.extensions.findByName('android')

example/android/gradle.properties

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,28 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
2626
android.useAndroidX=true
2727
# Automatically convert third-party libraries to use AndroidX
2828
android.enableJetifier=true
29-
30-
# Version of Flipper to use with React Native. Default value is whatever React
31-
# Native defaults to. To disable Flipper, set it to `false`.
32-
FLIPPER_VERSION=false
33-
34-
# Enable Fabric at runtime.
35-
#USE_FABRIC=1
36-
37-
# Enable new architecture, i.e. Fabric + TurboModule - implies USE_FABRIC=1.
29+
# Jetifier randomly fails on these libraries
30+
android.jetifier.ignorelist=hermes-android
31+
32+
# Use this property to specify which architecture you want to build.
33+
# You can also override it from the CLI using
34+
# ./gradlew <task> -PreactNativeArchitectures=x86_64
35+
reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
36+
37+
# Use this property to enable support to the new architecture.
38+
# This will allow you to use TurboModules and the Fabric render in
39+
# your application. You should enable this flag either if you want
40+
# to write custom TurboModules/Fabric components OR use libraries that
41+
# are providing them.
3842
# Note that this is incompatible with web debugging.
3943
#newArchEnabled=true
44+
#bridgelessEnabled=true
45+
46+
# Uncomment the line below to build React Native from source.
47+
#react.buildFromSource=true
4048

41-
# Uncomment the line below if building react-native from source
42-
#ANDROID_NDK_VERSION=21.4.7075529
49+
# Version of Android NDK to build against.
50+
#ANDROID_NDK_VERSION=26.1.10909125
4351

4452
# Version of Kotlin to build against.
45-
#KOTLIN_VERSION=1.7.10
53+
#KOTLIN_VERSION=1.8.22
-16.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)