Skip to content

Commit 51f8c23

Browse files
committed
minor correction to RN update
1 parent e2f94e9 commit 51f8c23

8 files changed

Lines changed: 55 additions & 66 deletions

File tree

apps/box/android/app/src/main/java/land/fx/blox/MainApplication.kt

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,25 @@ import android.content.res.Configuration
55
import com.facebook.react.PackageList
66
import com.facebook.react.ReactApplication
77
import com.facebook.react.ReactHost
8-
import com.facebook.react.ReactNativeHost
9-
import com.facebook.react.ReactPackage
10-
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
8+
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
119
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
12-
import com.facebook.react.defaults.DefaultReactNativeHost
13-
import com.facebook.react.soloader.OpenSourceMergedSoMapping
14-
import com.facebook.soloader.SoLoader
1510

1611
class MainApplication : Application(), ReactApplication {
1712

18-
override val reactNativeHost: ReactNativeHost =
19-
object : DefaultReactNativeHost(this) {
20-
override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
21-
22-
override fun getPackages(): List<ReactPackage> =
13+
override val reactHost: ReactHost by lazy {
14+
getDefaultReactHost(
15+
context = applicationContext,
16+
packageList =
2317
PackageList(this).packages.apply {
2418
// Packages that cannot be autolinked yet can be added manually here, for example:
2519
// add(MyReactNativePackage())
26-
}
27-
28-
override fun getJSMainModuleName(): String = "index"
29-
30-
override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
31-
override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
32-
}
33-
34-
override val reactHost: ReactHost
35-
get() = getDefaultReactHost(applicationContext, reactNativeHost)
20+
},
21+
)
22+
}
3623

3724
override fun onCreate() {
3825
super.onCreate()
39-
SoLoader.init(this, OpenSourceMergedSoMapping)
40-
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
41-
// If you opted-in for the New Architecture, we load the native entry point for this app.
42-
load()
43-
}
26+
loadReactNative(this)
4427
}
4528

4629
override fun onConfigurationChanged(newConfig: Configuration) {

apps/box/android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
buildscript {
44
ext {
5+
buildToolsVersion = "36.0.0"
56
minSdkVersion = 26
6-
compileSdkVersion = 35
7-
targetSdkVersion = 35
7+
compileSdkVersion = 36
8+
targetSdkVersion = 36
89
ndkVersion = "27.1.12297006"
9-
kotlinVersion = "2.0.21"
10-
agpVersion = "8.9.0"
10+
kotlinVersion = "2.1.20"
1111
}
1212
repositories {
1313
google()
1414
mavenCentral()
1515
maven { url 'https://jitpack.io' }
1616
}
1717
dependencies {
18-
classpath("com.android.tools.build:gradle:${agpVersion}")
18+
classpath("com.android.tools.build:gradle")
1919
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
2020
// Add the dependency for the Google services Gradle plugin
2121
classpath 'com.google.gms:google-services:4.4.2'
-15.7 KB
Binary file not shown.

apps/box/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

apps/box/android/gradlew

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

apps/box/android/gradlew.bat

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

apps/box/ios/Box/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<string>LaunchScreen</string>
9494
<key>UIRequiredDeviceCapabilities</key>
9595
<array>
96-
<string>armv7</string>
96+
<string>arm64</string>
9797
</array>
9898
<key>UISupportedInterfaceOrientations</key>
9999
<array>

apps/box/ios/Podfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,13 @@ target 'Box' do
4444
:app_path => "#{Pod::Config.instance.installation_root}/.."
4545
)
4646

47-
target 'BoxTests' do
48-
inherit! :complete
49-
# Pods for testing
50-
end
51-
5247
post_install do |installer|
5348
# https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
5449
react_native_post_install(
5550
installer,
5651
config[:reactNativePath],
57-
:mac_catalyst_enabled => false
52+
:mac_catalyst_enabled => false,
53+
# :ccache_enabled => true
5854
)
5955

6056
installer.pods_project.targets.each do |target|

0 commit comments

Comments
 (0)