Skip to content

Commit 51efde5

Browse files
authored
chore: Update RN version to v0.82 (#230)
* fix: `typeorm` missing in `bun.lockb` * chore: add npm `prepare` script * Update bun.lockb * Update bun.lockb * chore: build package on `prepublishOnly` * chore: add `typeorm` dependency top-level * fix: eslint jest error in CI * chore: use prettier in VS Code * fix: typescript-eslint setup * fix: add back prettier/recommended eslint config * chore: add `eslint-plugin-eslint-comments` * chore: add `eslint-plugin-react` * chore: add `eslint-plugin-react-hooks` * chore: add `eslint-plugin-react-native` * chore: add `@react-native/eslint-plugin` * revert package changes * Update bun.lockb * revert: eslint changes * Update lint-typescript.yml * chore: remove lint-ci script * update ci deps * chore: update jest * chore: add `eslint-plugin-jest` * Revert "chore: add `eslint-plugin-jest`" This reverts commit ba3a04b. * Update lint-typescript.yml * Revert "Update lint-typescript.yml" This reverts commit aba9508. * chore: update deps * chore: fix bun dependencies * fix: eslint errors * chore: set strict typeorm version * chore: rename typecheck script * fix: typescript errors * Update lint-typescript.yml * chore: update TS setup * chore: upgrade RN version to v82 * fix: invalid `android/build.gradle` * fix: invalid android package name * chore: update bun version * chore: remove old architecture jobs * chore: more old architecture artifact removal * chore: copy bun node_modules after install * fix: cp recursively * Update build-android.yml * Create bunfig.toml * Revert "fix: cp recursively" This reverts commit 86c981d. * Revert "chore: copy bun node_modules after install" This reverts commit a6e4a92. * Update build-android-release.yml * chore: update package entry files
1 parent e7a3ef9 commit 51efde5

File tree

27 files changed

+1669
-998
lines changed

27 files changed

+1669
-998
lines changed

.github/workflows/build-android-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
types: [published]
66

77
jobs:
8-
build_release:
9-
name: Build Android Example App (release, new architecture)
8+
build:
9+
name: Build Android Example App (release)
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4

.github/workflows/build-android.yml

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -27,55 +27,18 @@ on:
2727
- "**/nitro.json"
2828

2929
jobs:
30-
build_new:
31-
name: Build Android Example App (new architecture)
30+
build:
31+
name: Build Android Example App
3232
runs-on: ubuntu-latest
3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v5
3535
- uses: oven-sh/setup-bun@v2
3636

3737
- name: Install npm dependencies (bun)
3838
run: bun install
3939

4040
- name: Setup JDK 17
41-
uses: actions/setup-java@v4
42-
with:
43-
distribution: "zulu"
44-
java-version: 17
45-
java-package: jdk
46-
47-
- name: Restore Gradle cache
48-
uses: actions/cache@v4
49-
with:
50-
path: |
51-
~/.gradle/caches
52-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
53-
restore-keys: |
54-
${{ runner.os }}-gradle-
55-
- name: Run Gradle Build for example/android/
56-
working-directory: example/android
57-
run: ./gradlew assembleDebug --no-daemon --build-cache
58-
59-
# Gradle cache doesn't like daemons
60-
- name: Stop Gradle Daemon
61-
working-directory: example/android
62-
run: ./gradlew --stop
63-
64-
build_old:
65-
name: Build Android Example App (old architecture)
66-
runs-on: ubuntu-latest
67-
steps:
68-
- uses: actions/checkout@v4
69-
- uses: oven-sh/setup-bun@v2
70-
71-
- name: Install npm dependencies (bun)
72-
run: bun install
73-
74-
- name: Disable new architecture in gradle.properties
75-
run: sed -i "s/newArchEnabled=true/newArchEnabled=false/g" example/android/gradle.properties
76-
77-
- name: Setup JDK 17
78-
uses: actions/setup-java@v4
41+
uses: actions/setup-java@v5
7942
with:
8043
distribution: "zulu"
8144
java-version: 17

.github/workflows/build-ios.yml

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ env:
3232
USE_CCACHE: 1
3333

3434
jobs:
35-
build_new:
36-
name: Build iOS Example App (new architecture)
35+
build:
36+
name: Build iOS Example App
3737
runs-on: macOS-15
3838
steps:
3939
- uses: actions/checkout@v4
@@ -74,50 +74,3 @@ jobs:
7474
-destination 'platform=iOS Simulator,name=iPhone 16' \
7575
build \
7676
CODE_SIGNING_ALLOWED=NO"
77-
78-
build_old:
79-
name: Build iOS Example App (old architecture)
80-
runs-on: macOS-15
81-
steps:
82-
- uses: actions/checkout@v4
83-
- uses: oven-sh/setup-bun@v2
84-
85-
- name: Install npm dependencies (bun)
86-
run: bun install
87-
88-
- name: Disable new architecture in Podfile
89-
run: sed -i "" "s/ENV\['RCT_NEW_ARCH_ENABLED'\] = '1'/ENV['RCT_NEW_ARCH_ENABLED'] = '0'/g" example/ios/Podfile
90-
91-
- name: Restore buildcache
92-
uses: mikehardy/buildcache-action@v2
93-
continue-on-error: true
94-
95-
- name: Setup Ruby (bundle)
96-
uses: ruby/setup-ruby@v1
97-
with:
98-
ruby-version: 2.7.2
99-
bundler-cache: true
100-
working-directory: example/ios
101-
102-
- name: Restore Pods cache
103-
uses: actions/cache@v4
104-
with:
105-
path: example/ios/Pods
106-
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock', '**/Gemfile.lock') }}
107-
restore-keys: |
108-
${{ runner.os }}-pods-
109-
- name: Install Pods
110-
working-directory: example/ios
111-
run: pod install
112-
- name: Build App
113-
working-directory: example/ios
114-
run: "set -o pipefail && xcodebuild \
115-
CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ \
116-
-derivedDataPath build -UseModernBuildSystem=YES \
117-
-workspace NitroSQLiteExample.xcworkspace \
118-
-scheme NitroSQLiteExample \
119-
-sdk iphonesimulator \
120-
-configuration Debug \
121-
-destination 'platform=iOS Simulator,name=iPhone 16' \
122-
build \
123-
CODE_SIGNING_ALLOWED=NO"

bun.lock

Lines changed: 111 additions & 191 deletions
Large diffs are not rendered by default.

bunfig.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[install]
22
# Opt out from isolated installs
33
linker = "hoisted"
4-
linkWorkspacePackages = true

config/tsconfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"extends": "@tsconfig/react-native/tsconfig.json",
3+
"include": ["**/*.ts", "**/*.tsx"],
34
"exclude": [
45
"**/node_modules",
6+
"**/Pods",
57
"**/lib",
68
"**/.eslintrc.js",
79
"**/.prettierrc.js",
@@ -15,6 +17,7 @@
1517
"allowUnreachableCode": false,
1618
"allowUnusedLabels": false,
1719
"esModuleInterop": true,
20+
"experimentalDecorators": true,
1821
"forceConsistentCasingInFileNames": true,
1922
"jsx": "react",
2023
"lib": ["ESNext"],

example/Gemfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
source 'https://rubygems.org'
2+
23
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
3-
ruby '3.3.0'
4+
ruby ">= 2.6.10"
45

56
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
67
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
78
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
89
gem 'xcodeproj', '< 1.26.0'
910
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'

example/Gemfile.lock

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,21 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.1.3.3)
9-
base64
10-
bigdecimal
8+
activesupport (6.1.7.10)
119
concurrent-ruby (~> 1.0, >= 1.0.2)
12-
connection_pool (>= 2.2.5)
13-
drb
1410
i18n (>= 1.6, < 2)
1511
minitest (>= 5.1)
16-
mutex_m
1712
tzinfo (~> 2.0)
18-
addressable (2.8.6)
19-
public_suffix (>= 2.0.2, < 6.0)
13+
zeitwerk (~> 2.3)
14+
addressable (2.8.7)
15+
public_suffix (>= 2.0.2, < 7.0)
2016
algoliasearch (1.27.5)
2117
httpclient (~> 2.8, >= 2.8.3)
2218
json (>= 1.5.1)
2319
atomos (0.1.3)
24-
base64 (0.2.0)
25-
bigdecimal (3.1.8)
20+
base64 (0.3.0)
21+
benchmark (0.5.0)
22+
bigdecimal (3.3.1)
2623
claide (1.1.0)
2724
cocoapods (1.15.2)
2825
addressable (~> 2.8)
@@ -62,55 +59,58 @@ GEM
6259
netrc (~> 0.11)
6360
cocoapods-try (1.2.0)
6461
colored2 (3.1.2)
65-
concurrent-ruby (1.2.3)
66-
connection_pool (2.4.1)
67-
drb (2.2.1)
62+
concurrent-ruby (1.3.3)
6863
escape (0.0.4)
69-
ethon (0.16.0)
64+
ethon (0.15.0)
7065
ffi (>= 1.15.0)
71-
ffi (1.16.3)
66+
ffi (1.17.2)
7267
fourflusher (2.3.1)
7368
fuzzy_match (2.0.4)
7469
gh_inspector (1.1.3)
75-
httpclient (2.8.3)
76-
i18n (1.14.5)
70+
httpclient (2.9.0)
71+
mutex_m
72+
i18n (1.14.7)
7773
concurrent-ruby (~> 1.0)
78-
json (2.7.2)
79-
minitest (5.23.1)
74+
json (2.7.6)
75+
logger (1.7.0)
76+
minitest (5.25.4)
8077
molinillo (0.8.0)
81-
mutex_m (0.2.0)
78+
mutex_m (0.3.0)
8279
nanaimo (0.3.0)
8380
nap (1.1.0)
8481
netrc (0.11.0)
8582
nkf (0.2.0)
8683
public_suffix (4.0.7)
87-
rexml (3.2.8)
88-
strscan (>= 3.0.9)
84+
rexml (3.4.4)
8985
ruby-macho (2.5.1)
90-
strscan (3.1.0)
91-
typhoeus (1.4.1)
92-
ethon (>= 0.9.0)
86+
typhoeus (1.5.0)
87+
ethon (>= 0.9.0, < 0.16.0)
9388
tzinfo (2.0.6)
9489
concurrent-ruby (~> 1.0)
95-
xcodeproj (1.24.0)
90+
xcodeproj (1.25.1)
9691
CFPropertyList (>= 2.3.3, < 4.0)
9792
atomos (~> 0.1.3)
9893
claide (>= 1.0.2, < 2.0)
9994
colored2 (~> 3.1)
10095
nanaimo (~> 0.3.0)
101-
rexml (~> 3.2.4)
96+
rexml (>= 3.3.6, < 4.0)
97+
zeitwerk (2.6.18)
10298

10399
PLATFORMS
104100
ruby
105101

106102
DEPENDENCIES
107103
activesupport (>= 6.1.7.5, != 7.1.0)
104+
benchmark
105+
bigdecimal
108106
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
109107
concurrent-ruby (< 1.3.4)
108+
logger
109+
mutex_m
110110
xcodeproj (< 1.26.0)
111111

112112
RUBY VERSION
113-
ruby 3.3.0p0
113+
ruby 2.6.10p210
114114

115115
BUNDLED WITH
116-
2.5.10
116+
1.17.2

example/android/app/src/debug/AndroidManifest.xml

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

example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:allowBackup="false"
1111
android:theme="@style/AppTheme"
12+
android:usesCleartextTraffic="${usesCleartextTraffic}"
1213
android:supportsRtl="true">
1314
<activity
1415
android:name=".MainActivity"

0 commit comments

Comments
 (0)