Skip to content

Commit 4afd71d

Browse files
authored
Merge pull request #50 from patrickkabwe/feat/upgrade-nitro
chore: bump up nitro 0.26.4
2 parents 17f1b9f + ec98704 commit 4afd71d

22 files changed

Lines changed: 1793 additions & 984 deletions

bun.lock

Lines changed: 410 additions & 281 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/.prettierrc.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
module.exports = {
22
arrowParens: 'avoid',
3-
bracketSameLine: true,
4-
bracketSpacing: false,
53
singleQuote: true,
64
trailingComma: 'all',
75
};

example/Gemfile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
6+
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
7+
# bound in the template on Cocoapods with next React Native release.
78
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
89
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9-
gem 'xcodeproj', '< 1.28.0'
10-
gem 'concurrent-ruby', '< 1.3.6'
10+
gem 'xcodeproj', '< 1.26.0'
11+
gem 'concurrent-ruby', '< 1.3.4'
12+
13+
# Ruby 3.4.0 has removed some libraries from the standard library.
14+
gem 'bigdecimal'
15+
gem 'logger'
16+
gem 'benchmark'
17+
gem 'mutex_m'

example/Gemfile.lock

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ GEM
2727
benchmark (0.4.0)
2828
bigdecimal (3.1.9)
2929
claide (1.1.0)
30-
cocoapods (1.16.2)
30+
cocoapods (1.15.2)
3131
addressable (~> 2.8)
3232
claide (>= 1.0.2, < 2.0)
33-
cocoapods-core (= 1.16.2)
33+
cocoapods-core (= 1.15.2)
3434
cocoapods-deintegrate (>= 1.0.3, < 2.0)
3535
cocoapods-downloader (>= 2.1, < 3.0)
3636
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -44,8 +44,8 @@ GEM
4444
molinillo (~> 0.8.0)
4545
nap (~> 1.0)
4646
ruby-macho (>= 2.3.0, < 3.0)
47-
xcodeproj (>= 1.27.0, < 2.0)
48-
cocoapods-core (1.16.2)
47+
xcodeproj (>= 1.23.0, < 2.0)
48+
cocoapods-core (1.15.2)
4949
activesupport (>= 5.0, < 8)
5050
addressable (~> 2.8)
5151
algoliasearch (~> 1.0)
@@ -65,7 +65,7 @@ GEM
6565
netrc (~> 0.11)
6666
cocoapods-try (1.2.0)
6767
colored2 (3.1.2)
68-
concurrent-ruby (1.3.5)
68+
concurrent-ruby (1.3.3)
6969
connection_pool (2.5.2)
7070
drb (2.2.1)
7171
escape (0.0.4)
@@ -84,7 +84,7 @@ GEM
8484
minitest (5.25.5)
8585
molinillo (0.8.0)
8686
mutex_m (0.3.0)
87-
nanaimo (0.4.0)
87+
nanaimo (0.3.0)
8888
nap (1.1.0)
8989
netrc (0.11.0)
9090
nkf (0.2.0)
@@ -96,22 +96,26 @@ GEM
9696
ethon (>= 0.9.0)
9797
tzinfo (2.0.6)
9898
concurrent-ruby (~> 1.0)
99-
xcodeproj (1.27.0)
99+
xcodeproj (1.25.1)
100100
CFPropertyList (>= 2.3.3, < 4.0)
101101
atomos (~> 0.1.3)
102102
claide (>= 1.0.2, < 2.0)
103103
colored2 (~> 3.1)
104-
nanaimo (~> 0.4.0)
104+
nanaimo (~> 0.3.0)
105105
rexml (>= 3.3.6, < 4.0)
106106

107107
PLATFORMS
108108
ruby
109109

110110
DEPENDENCIES
111111
activesupport (>= 6.1.7.5, != 7.1.0)
112+
benchmark
113+
bigdecimal
112114
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
113-
concurrent-ruby (< 1.3.6)
114-
xcodeproj (< 1.28.0)
115+
concurrent-ruby (< 1.3.4)
116+
logger
117+
mutex_m
118+
xcodeproj (< 1.26.0)
115119

116120
RUBY VERSION
117121
ruby 3.3.6p108

example/android/app/src/main/java/com/nitrofsexample/MainApplication.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ import android.app.Application
44
import com.facebook.react.PackageList
55
import com.facebook.react.ReactApplication
66
import com.facebook.react.ReactHost
7+
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
78
import com.facebook.react.ReactNativeHost
89
import com.facebook.react.ReactPackage
9-
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
1010
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
1111
import com.facebook.react.defaults.DefaultReactNativeHost
12-
import com.facebook.react.soloader.OpenSourceMergedSoMapping
13-
import com.facebook.soloader.SoLoader
1412

1513
class MainApplication : Application(), ReactApplication {
1614

@@ -35,10 +33,6 @@ class MainApplication : Application(), ReactApplication {
3533

3634
override fun onCreate() {
3735
super.onCreate()
38-
SoLoader.init(this, OpenSourceMergedSoMapping)
39-
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
40-
// If you opted-in for the New Architecture, we load the native entry point for this app.
41-
load()
42-
}
36+
loadReactNative(this)
4337
}
4438
}

example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
compileSdkVersion = 35
66
targetSdkVersion = 35
77
ndkVersion = "27.1.12297006"
8-
kotlinVersion = "2.0.21"
8+
kotlinVersion = "2.1.20"
99
}
1010
repositories {
1111
google()
181 Bytes
Binary file not shown.

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

example/android/gradlew

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/android/gradlew.bat

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)