Skip to content

Commit 0b457e9

Browse files
committed
chore: update CI config and dependencies
1 parent 5cf9b34 commit 0b457e9

File tree

9 files changed

+3658
-3441
lines changed

9 files changed

+3658
-3441
lines changed

.circleci/config.yml

Lines changed: 35 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: 2.1
22

33
orbs:
4-
rn: react-native-community/react-native@7
5-
android: circleci/android@2.5.0
4+
rn: react-native-community/react-native@8.0.1
5+
android: circleci/android@3.2.0
66

77
# - rn/yarn_install
88
# fails with Error untarring cache: Error extracting tarball /var/folders/bq/mjrgbpkx5h1g_b22fpv0tlzc0000gn/T/cache376822577 : tmp/yarn/: Cannot extract through symlink tmp/yarn tmp/yarn/v6/: Cannot extract through symlink tmp/yarn/v6 tmp/yarn/v6/.tmp/: Cannot extract through symlink tmp/yarn/v6/.tmp tmp/yarn/v6/npm-@babel-code-frame-7.8.3-33e25903d7481181534e12ec0a25f16b6fcf419e-integrity/: Cannot extract through symlink tmp/yarn/v6/npm-@babel-code-frame-7.8.3-33e25903d7481181534e12ec0a25f16b6fcf419e-integrity tmp/yarn/v6/npm-@babel-code-frame-7.8.3-33e25903d7481181534e12ec0a25f16b6fcf419e-integrity/node_modules/: Cannot extract through symlink tmp/yarn/v6/npm-@babel-code-frame-7.8.3-33e25903d7481181534e12ec0a25f16b6fcf419e-integrity/node_modules tmp/yarn/v6/npm-@babel-code-frame-7.8.3-33e25903d7481181534e12ec0a25f16b6fcf419e-integrity/node_modules/@babel/: Cannot extract through symlink tmp/yarn/v6/npm-@babel-code-frame-7.8.3-33e25903d7481181534e12ec0a25f16b6fcf419e-integrity/node_modules/@babel tmp/yarn/v6/npm-@babel-code-frame-7.8.3-33e25903d7481181534e12ec0a25f16b6fcf419e-integrity/node_modules/@babel/code-frame/: Cannot extract: exit status 1
@@ -35,8 +35,8 @@ jobs:
3535
new_arch_ios_build_only:
3636
executor:
3737
name: rn/macos
38-
xcode_version: '16.2.0'
39-
resource_class: macos.m1.medium.gen1
38+
xcode_version: '26.3.0'
39+
resource_class: m4pro.medium
4040
steps:
4141
- checkout
4242
- run:
@@ -52,8 +52,8 @@ jobs:
5252
e2e_release_ios:
5353
executor:
5454
name: rn/macos
55-
xcode_version: '16.2.0'
56-
resource_class: macos.m1.medium.gen1
55+
xcode_version: '26.3.0'
56+
resource_class: m4pro.medium
5757
steps:
5858
- checkout
5959
- run:
@@ -62,7 +62,7 @@ jobs:
6262
HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 brew tap wix/brew >/dev/null
6363
HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 brew install applesimutils >/dev/null
6464
- rn/ios_simulator_start:
65-
device: 'iPhone 15 Pro Max'
65+
device: 'iPhone 17 Pro Max'
6666
# - rn/yarn_install
6767
- run:
6868
command: yarn install --immutable
@@ -86,35 +86,32 @@ jobs:
8686

8787
e2e_release_android:
8888
executor:
89-
name: android/android-machine
90-
resource-class: large
89+
name: android/android_machine
90+
resource_class: large
9191
tag: default
9292
environment:
9393
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx4g -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
9494
steps:
9595
- checkout
96-
- android/change-java-version:
97-
java-version: 17
96+
- android/change_java_version:
97+
java_version: 17
9898
- run:
9999
command: avdmanager list
100100
name: list avds
101101
- run:
102102
command: sdkmanager --list
103103
name: list sdks
104-
- android/create-avd:
105-
avd-name: TestingAVD
106-
system-image: system-images;android-29;default;x86
107-
additional-args: --device pixel_6_pro
104+
- android/create_avd:
105+
avd_name: TestingAVD
106+
system_image: system-images;android-29;default;x86
107+
additional_args: --device pixel_6_pro
108108
install: true
109109
background: false
110-
- android/start-emulator:
111-
avd-name: TestingAVD
112-
no-window: true
113-
wait-for-emulator: true
114-
disable-animations: true
115-
restore-gradle-cache-post-emulator-launch: false
116-
post-emulator-launch-assemble-command: 'pwd'
117-
# - android/disable-animations
110+
- android/start_emulator:
111+
avd_name: TestingAVD
112+
no_window: true
113+
disable_animations: true
114+
post_emulator_launch_assemble_command: 'pwd'
118115
- run:
119116
command: npm install --global yarn
120117
name: install yarn
@@ -138,31 +135,29 @@ jobs:
138135

139136
new_arch_android_build_only:
140137
executor:
141-
name: android/android-machine
142-
resource-class: large
138+
name: android/android_machine
139+
resource_class: large
143140
tag: default
144141
environment:
145142
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx4g -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
146143
steps:
147144
- checkout
148-
- android/change-java-version:
149-
java-version: 17
145+
- android/change_java_version:
146+
java_version: 17
150147
- run:
151148
command: avdmanager list
152149
name: list avds
153-
- android/create-avd:
154-
avd-name: TestingAVD
155-
system-image: system-images;android-29;default;x86
156-
additional-args: --device pixel_6_pro
150+
- android/create_avd:
151+
avd_name: TestingAVD
152+
system_image: system-images;android-29;default;x86
153+
additional_args: --device pixel_6_pro
157154
install: true
158155
background: false
159-
- android/start-emulator:
160-
avd-name: TestingAVD
161-
no-window: true
162-
wait-for-emulator: true
163-
disable-animations: true
164-
restore-gradle-cache-post-emulator-launch: false
165-
post-emulator-launch-assemble-command: 'pwd'
156+
- android/start_emulator:
157+
avd_name: TestingAVD
158+
no_window: true
159+
disable_animations: true
160+
post_emulator_launch_assemble_command: 'pwd'
166161
- run:
167162
command: npm install --global yarn
168163
name: install yarn
@@ -178,8 +173,8 @@ jobs:
178173
- run:
179174
command: ORG_GRADLE_PROJECT_newArchEnabled=true yarn detox:android:build:release
180175
name: build app for e2e tests
181-
# - android/wait-for-emulator
182-
# - android/disable-animations
176+
# - android/wait_for_emulator
177+
# - android/disable_animations
183178
- store_artifacts:
184179
path: ./artifacts
185180

.detoxrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
simulator: {
1010
type: 'ios.simulator',
1111
device: {
12-
type: 'iPhone 15 Pro Max',
12+
type: 'iPhone 17 Pro Max',
1313
},
1414
},
1515
emulator: {

example/App.js

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {
1616
} from 'react-native';
1717
import DateTimePicker from '@react-native-community/datetimepicker';
1818
import SegmentedControl from './SegmentedControl';
19-
import {Colors} from 'react-native/Libraries/NewAppScreen';
2019
import React, {useRef, useState} from 'react';
2120
import {Picker} from 'react-native-windows';
2221
import moment from 'moment-timezone';
@@ -29,6 +28,13 @@ import {
2928
} from '@react-native-community/datetimepicker/src/constants';
3029
import * as RNLocalize from 'react-native-localize';
3130

31+
const Colors = {
32+
white: '#FFFFFF',
33+
black: '#000000',
34+
dark: '#333333',
35+
lighter: '#F5F5F5',
36+
}
37+
3238
const timezone = [
3339
120,
3440
0,
@@ -385,7 +391,10 @@ export const App = () => {
385391
startOnYearSelection (android only)
386392
</ThemedText>
387393
<View style={{flex: 1, alignItems: 'flex-start'}}>
388-
<Switch value={startOnYearSelection} onValueChange={setStartOnYearSelection} />
394+
<Switch
395+
value={startOnYearSelection}
396+
onValueChange={setStartOnYearSelection}
397+
/>
389398
</View>
390399
</View>
391400
<View style={styles.header}>
@@ -487,7 +496,11 @@ export const App = () => {
487496
setShow(true);
488497
}
489498
}}
490-
title={minimumDate && maximumDate && minimumDate > maximumDate ? "undo min > max" : "set min > max (errors)"}
499+
title={
500+
minimumDate && maximumDate && minimumDate > maximumDate
501+
? 'undo min > max'
502+
: 'set min > max (errors)'
503+
}
491504
/>
492505
</View>
493506
<View style={{flexDirection: 'row', alignItems: 'center'}}>

example/android/build.gradle

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,7 @@ buildscript {
2525
allprojects {
2626
repositories {
2727
maven {
28-
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
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-
}())
28+
url "$rootDir/../../node_modules/react-native/android"
3929
}
4030
maven {
4131
// All of Detox' artifacts are provided via the npm module
@@ -57,21 +47,6 @@ allprojects {
5747
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
5848
}
5949

60-
// needed for release signing
61-
androidExtension.signingConfigs {
62-
test {
63-
keyAlias "androiddebugkey"
64-
keyPassword "android"
65-
storeFile file("debug.keystore")
66-
storePassword "android"
67-
}
68-
}
69-
70-
androidExtension.buildTypes.debug.signingConfig = androidExtension.signingConfigs.test
71-
androidExtension.buildTypes.release.signingConfig = androidExtension.signingConfigs.test
72-
androidExtension.testBuildType = System.getProperty('testBuildType', 'debug')
73-
// end needed for release signing
74-
7550
androidExtension.sourceSets.androidTest.java.srcDirs += "$rootDir/app/src/androidTest/java"
7651

7752
project.dependencies {

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)