Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ module.exports = {
'.eslintrc.js',
'webpack.config.js',
'vendor', // Generated for iOS build: bundle install
// TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
// TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
'!/.storybook',
'.storybook/storybook.requires.js', // Codegen
'.storybook/Storybook.tsx', // Imports generated file
Expand Down Expand Up @@ -130,7 +130,7 @@ module.exports = {
'**/*{.,_}{test,spec}.{ts,tsx}',
// Snapshot tests (Jest)
'**/__tests__/**/*.{ts,tsx}', // react-test-renderer
// TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
// TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
// Storybook config
'.storybook/**/*.{ts,tsx,js}',
// Stories (@storybook/react-native)
Expand Down
2 changes: 1 addition & 1 deletion .storybook/Storybook.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
*/

import './doctools'
Expand Down
2 changes: 1 addition & 1 deletion .storybook/doctools.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
*/

// vscode editor.codeActionsOnSave source.organizeImports conflicting w ESLint only with .js
Expand Down
2 changes: 1 addition & 1 deletion .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion .storybook_server/main.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
* TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)
*/

module.exports = {
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ gem 'bigdecimal'
gem 'logger'
gem 'benchmark'
gem 'mutex_m'
gem 'nkf' # Fix `bundle exec pod install` LoadError - cannot load such file -- kconv
gem 'nkf'
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div align="center">

[![NPM RN pkg ver](https://img.shields.io/badge/React%20Native-0.84.1-red.svg)](https://github.com/facebook/react-native/releases)
[![NPM RN pkg ver](https://img.shields.io/badge/React%20Native-0.85.0_rc.1-red.svg)](https://github.com/facebook/react-native/releases)
[![TypeScript](https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg)](#)
[![Linter](https://badges.aleen42.com/src/eslint.svg)](#)
[![Formatter: prettier](https://img.shields.io/badge/Formatter-Prettier-f8bc45.svg)](#)
Expand Down Expand Up @@ -97,7 +97,7 @@ yarn android
## Storybook v6

> [!NOTE]
> TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.84.1)
> TODO: Migrate RN Storybook from 6.5.x to 10 (RN 0.71 to 0.85.0-rc.1)

Add stories to `src/components/**/*.stories.(ts|tsx)`

Expand Down
2 changes: 1 addition & 1 deletion __tests__/src/__snapshots__/index.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ exports[`app matches snapshot 1`] = `
}
>
Version:
0.84.1
0.85.0-rc.1
</Text>
<Text
style={
Expand Down
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 1 addition & 3 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
# https://services.gradle.org/distributions
# https://gradle.org/nightly
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 0 additions & 3 deletions android/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 1 addition & 7 deletions android/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading