Skip to content

Commit fa2d6ef

Browse files
authored
chore: update react native and all dependencies + eslint strict (#470)
1 parent 7eba446 commit fa2d6ef

Some content is hidden

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

66 files changed

+3356
-2354
lines changed

template/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ local.properties
3333
.cxx/
3434
*.keystore
3535
!debug.keystore
36+
.kotlin/
3637

3738
# node.js
3839
#

template/.prettierrc.js

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

template/.prettierrc.mjs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export default {
2+
singleQuote: true,
3+
};

template/.yarnrc.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

template/Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ ruby ">= 2.6.10"
77
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
88
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
99
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'

template/__mocks__/TestAppWrapper.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1+
import { queryClient, storage } from '@/App';
12
import { QueryClientProvider } from '@tanstack/react-query';
23
import { type PropsWithChildren } from 'react';
34
import { GestureHandlerRootView } from 'react-native-gesture-handler';
45

56
import { ThemeProvider } from '@/theme';
6-
77
import '@/translations';
88

9-
import { queryClient, storage } from '@/App';
10-
119
function TestAppWrapper({ children }: PropsWithChildren) {
1210
return (
1311
<GestureHandlerRootView>

template/__mocks__/getAssetsContext.ts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@ import type { AssetType } from '@/theme/assets/getAssetsContext';
22

33
jest.mock('@/theme/assets/getAssetsContext', () =>
44
jest.fn((type: AssetType) => {
5-
const context = (key: string) => {
5+
const testIcon = 'mocked-icon-uri'; // Simulated URI for icons
6+
const testImage = 'test-image-uri'; // Simulated URI for images
7+
8+
const context = () => {
69
if (type === 'images') {
7-
return jest.mock('@/theme/assets/images/tom.png');
8-
}
9-
if (type === 'icons') {
10-
return jest.mock('@/theme/assets/icons/send.svg');
10+
return {
11+
default: () => testImage,
12+
};
1113
}
12-
return key;
14+
return {
15+
default: () => testIcon,
16+
};
1317
};
1418

1519
context.keys = () => {
1620
if (type === 'images') {
17-
return ['images/tom.png'];
18-
}
19-
if (type === 'icons') {
20-
return ['icons/send.svg'];
21+
return [testImage];
2122
}
22-
return [];
23+
return [testIcon];
2324
};
2425

2526
return context;

template/__mocks__/libs/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
import '@testing-library/react-native/extend-expect';
2-
// LOCAL
31
import './react-native-reanimated';
42
import './react-native-safe-area-context';

template/_gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ local.properties
3333
.cxx/
3434
*.keystore
3535
!debug.keystore
36+
.kotlin/
3637

3738
# node.js
3839
#

template/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ def enableProguardInReleaseBuilds = false
6363
* The preferred build flavor of JavaScriptCore (JSC)
6464
*
6565
* For example, to use the international variant, you can use:
66-
* `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
66+
* `def jscFlavor = io.github.react-native-community:jsc-android-intl:2026004.+`
6767
*
6868
* The international variant includes ICU i18n library and necessary data
6969
* allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
7070
* give correct results when using with locales other than en-US. Note that
7171
* this variant is about 6MiB larger per architecture than default.
7272
*/
73-
def jscFlavor = 'org.webkit:android-jsc:+'
73+
def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
7474

7575
android {
7676
ndkVersion rootProject.ext.ndkVersion

template/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ buildscript {
33
buildToolsVersion = "35.0.0"
44
minSdkVersion = 24
55
compileSdkVersion = 35
6-
targetSdkVersion = 34
7-
ndkVersion = "26.1.10909125"
8-
kotlinVersion = "1.9.24"
6+
targetSdkVersion = 35
7+
ndkVersion = "27.1.12297006"
8+
kotlinVersion = "2.0.21"
99
}
1010
repositories {
1111
google()

template/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.10.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

template/android/gradlew

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum

0 commit comments

Comments
 (0)