Skip to content

Commit 794bebb

Browse files
retrixeretrixe
committed
Update to RN 0.73.0 RC, use builtin Kotlin support
1 parent 996f5c7 commit 794bebb

File tree

26 files changed

+5135
-5279
lines changed

26 files changed

+5135
-5279
lines changed

‎Gemfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ 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-
gem 'cocoapods', '~> 1.12'
6+
gem 'cocoapods', '~> 1.13'
7+
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'

‎__tests__/App.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'react-native'
66
import React from 'react'
77
import App from '../src/App'
88

9-
// Note: import explicitly to use the types shiped with jest.
9+
// Note: import explicitly to use the types shipped with jest.
1010
import { it } from '@jest/globals'
1111

1212
// Note: test renderer must be required after react-native.

‎android/app/build.gradle‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apply plugin: "com.android.application"
2+
apply plugin: "org.jetbrains.kotlin.android"
23
apply plugin: "com.facebook.react"
3-
apply plugin: "kotlin-android" // manual
44

55
/**
66
* This is the configuration block to customize your React Native Android app.
@@ -72,7 +72,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
7272
android {
7373
ndkVersion rootProject.ext.ndkVersion
7474

75-
compileSdkVersion rootProject.ext.compileSdkVersion
75+
buildToolsVersion rootProject.ext.buildToolsVersion
76+
compileSdk rootProject.ext.compileSdkVersion
7677

7778
namespace "com.enderchat"
7879
defaultConfig {
@@ -118,19 +119,10 @@ android {
118119
}
119120

120121
dependencies {
121-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" // manual
122-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" // manual
123-
implementation "androidx.core:core-ktx:1.8.0" // manual
124-
125122
// The version of react-native is set by the React Native Gradle Plugin
126123
implementation("com.facebook.react:react-android")
124+
implementation("com.facebook.react:flipper-integration")
127125

128-
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
129-
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
130-
exclude group:'com.squareup.okhttp3', module:'okhttp'
131-
}
132-
133-
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
134126
if (hermesEnabled.toBoolean()) {
135127
implementation("com.facebook.react:hermes-android")
136128
} else {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@
77
<application
88
android:usesCleartextTraffic="true"
99
tools:targetApi="28"
10-
tools:ignore="GoogleAppIndexingWarning">
11-
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
12-
</application>
10+
tools:ignore="GoogleAppIndexingWarning"/>
1311
</manifest>

‎android/app/src/debug/java/com/enderchat/ReactNativeFlipper.java‎

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

‎android/app/src/main/java/com/enderchat/MainActivity.java‎

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

‎android/app/src/main/java/com/enderchat/MainActivity.kt‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.enderchat
2+
3+
import android.os.Bundle
4+
import com.facebook.react.ReactActivity
5+
import com.facebook.react.ReactActivityDelegate
6+
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
7+
import com.facebook.react.defaults.DefaultReactActivityDelegate
8+
9+
class MainActivity : ReactActivity() {
10+
11+
/**
12+
* Returns the name of the main component registered from JavaScript. This is used to schedule
13+
* rendering of the component.
14+
*/
15+
override fun getMainComponentName(): String = "EnderChat"
16+
17+
/**
18+
* Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
19+
* which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
20+
*/
21+
override fun createReactActivityDelegate(): ReactActivityDelegate =
22+
DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
23+
24+
override fun onCreate(savedInstanceState: Bundle?) {
25+
super.onCreate(null)
26+
}
27+
}

‎android/app/src/main/java/com/enderchat/MainApplication.java‎

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

‎android/app/src/main/java/com/enderchat/MainApplication.kt‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package com.enderchat
2+
3+
import android.app.Application
4+
import com.enderchat.modules.connection.ConnectionPackage
5+
import com.enderchat.modules.navbarcolor.NavBarColorPackage
6+
import com.facebook.react.PackageList
7+
import com.facebook.react.ReactApplication
8+
import com.facebook.react.ReactHost
9+
import com.facebook.react.ReactNativeHost
10+
import com.facebook.react.ReactPackage
11+
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
12+
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
13+
import com.facebook.react.defaults.DefaultReactNativeHost
14+
import com.facebook.react.flipper.ReactNativeFlipper
15+
import com.facebook.soloader.SoLoader
16+
17+
class MainApplication : Application(), ReactApplication {
18+
19+
override val reactNativeHost: ReactNativeHost =
20+
object : DefaultReactNativeHost(this) {
21+
override fun getPackages(): List<ReactPackage> {
22+
val packages = PackageList(this).packages
23+
// Packages that cannot be autolinked yet can be added manually here, for example:
24+
// packages.add(new MyReactNativePackage());
25+
packages.add(NavBarColorPackage())
26+
packages.add(ConnectionPackage())
27+
return packages
28+
}
29+
30+
override fun getJSMainModuleName(): String = "index"
31+
32+
override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
33+
34+
override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
35+
override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
36+
}
37+
38+
override val reactHost: ReactHost
39+
get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
40+
41+
override fun onCreate() {
42+
super.onCreate()
43+
SoLoader.init(this, false)
44+
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
45+
// If you opted-in for the New Architecture, we load the native entry point for this app.
46+
load()
47+
}
48+
ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
49+
}
50+
}

‎android/app/src/release/java/com/enderchat/ReactNativeFlipper.java‎

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

0 commit comments

Comments
 (0)