Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: support for RN 0.73 #1956

Merged
merged 55 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
8d5b728
Update package.json
kkafar Nov 3, 2023
87309f9
Update Gemfile
kkafar Nov 3, 2023
d762cc3
Update app/build.gradle
kkafar Nov 3, 2023
9a319d1
Update AndroidManifest (debug)
kkafar Nov 3, 2023
e8f98b9
Remove ReactNativeFlipper.java from debug sources
kkafar Nov 3, 2023
711c5df
Migrate MainActivity to Kotlin
kkafar Nov 3, 2023
7d4dff3
Migrate MainApplication to Kotlin
kkafar Nov 3, 2023
531b611
Update android/build.gradle
kkafar Nov 3, 2023
6074a75
Remove ReactNativeFlipper.java from release sources
kkafar Nov 3, 2023
f1ac0bf
Remove FLIPPER_VERSION from android/gradle.properties
kkafar Nov 3, 2023
5f04411
Update gradle-wrapper.properties
kkafar Nov 3, 2023
e54b979
Update gradle wrapper
kkafar Nov 3, 2023
007c29f
Update babel.config.js
kkafar Nov 3, 2023
5b59a97
Update Podfile
kkafar Nov 3, 2023
66606cc
Update iOS project
kkafar Nov 3, 2023
051bc9d
Update AppDelegate.mm
kkafar Nov 3, 2023
899f6fd
Update project properties
kkafar Nov 3, 2023
70f8b7e
Update tsconfig.json
kkafar Nov 3, 2023
2b80f0a
FTE: Update package.json
kkafar Nov 3, 2023
9e13c93
FTE: Update Gemfile
kkafar Nov 3, 2023
8e0668e
FTE & TE: Update build.gradle
kkafar Nov 3, 2023
b4176d3
FTE: Update AndroidManifest
kkafar Nov 3, 2023
4f4d362
FTE: Remove ReactNativeFlipper.java from debug sources
kkafar Nov 3, 2023
1e98674
FTE: Migrate MainActivity
kkafar Nov 3, 2023
c7c6c69
FTE: Migrate MainApplication to Kotlin
kkafar Nov 3, 2023
95fc916
Typo in MainApplication
kkafar Nov 3, 2023
507b0d2
FTE: Remove ReactNativeFlipper.java from release sources
kkafar Nov 3, 2023
4e23288
FTE: Update android/build.gradle
kkafar Nov 3, 2023
49bfcdb
FTE: Update gradle.properties
kkafar Nov 3, 2023
e677be7
Update gradle wrapper in FTE and TE
kkafar Nov 3, 2023
3f8c524
FTE: Update babel config
kkafar Nov 3, 2023
0a969c6
FTE: Update Podfile
kkafar Nov 3, 2023
b8571db
FTE: Update ios project props
kkafar Nov 3, 2023
b9ab475
FTE: Migrate AppDelegate.mm
kkafar Nov 3, 2023
b2b631b
FTE: Update project props
kkafar Nov 3, 2023
4fdfd4a
FTE: Update tsconfig
kkafar Nov 3, 2023
f30efa8
Update Android builds on CI to use Java 17
kkafar Nov 3, 2023
1868f8e
fix(android): add buildFeatures.buildConfig true for AGP8+ compat (#1…
mikehardy Nov 16, 2023
4a44260
doc: add kotlin MainActiviy.kt to instructions (#1971)
mfazekas Nov 16, 2023
c8ca2fb
Merge branch 'main' into @kkafar/rn-73
kkafar Nov 24, 2023
44f213c
Bump to rc 5
kkafar Nov 24, 2023
cadb650
Use Reanimated@main & latest gesture handler
kkafar Nov 24, 2023
b73937b
Update metro config in TestsExample & temporary remove loading of mos…
kkafar Nov 24, 2023
d8e2a9b
Temporary fix for bundling in TE
kkafar Nov 27, 2023
3849e2c
fix: build error with rn 0.73-rc.4 (#1972)
mfazekas Nov 27, 2023
305ba58
Reinstall deps in FTE
kkafar Nov 27, 2023
47a7c05
Also add metro workaround to FTE
kkafar Nov 28, 2023
f491acd
Try to fix CI on FTE
kkafar Nov 28, 2023
d7c6bc5
Merge branch 'main' into @kkafar/rn-73
kkafar Nov 28, 2023
852a86b
Select simulator for iOS CI builds
kkafar Nov 28, 2023
007d67a
Missing endlines
kkafar Nov 28, 2023
5321bd9
Uncomment tests in TE
kkafar Nov 28, 2023
e4792e4
reanimated 3.6.0
kkafar Nov 28, 2023
962c93c
rc 6 for TE
kkafar Nov 29, 2023
b812bed
rc6 for FTE
kkafar Nov 30, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/ios-build-test-fabric.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ jobs:

- name: Build app
working-directory: ${{ env.WORKING_DIRECTORY }}
run: yarn ios
run: npx react-native run-ios --no-packager --simulator="iPhone 15"
tboba marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion .github/workflows/ios-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ jobs:
run: pod install
- name: Build app
working-directory: ${{ env.WORKING_DIRECTORY }}
run: yarn ios
run: npx react-native run-ios --no-packager --simulator="iPhone 15"
3 changes: 2 additions & 1 deletion FabricTestExample/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

gem 'cocoapods', '~> 1.12'
gem 'cocoapods', '~> 1.13'
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
11 changes: 4 additions & 7 deletions FabricTestExample/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: "com.android.application"
apply plugin: "org.jetbrains.kotlin.android"
apply plugin: "com.facebook.react"

/**
Expand Down Expand Up @@ -71,7 +72,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
android {
ndkVersion rootProject.ext.ndkVersion

compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
compileSdk rootProject.ext.compileSdkVersion

namespace "com.fabrictestexample"
defaultConfig {
Expand Down Expand Up @@ -106,13 +108,8 @@ android {
dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")
implementation("com.facebook.react:flipper-integration")

debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
exclude group:'com.squareup.okhttp3', module:'okhttp'
}

debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
} else {
Expand Down
4 changes: 1 addition & 3 deletions FabricTestExample/android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@
<application
android:usesCleartextTraffic="true"
tools:targetApi="28"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
</application>
tools:ignore="GoogleAppIndexingWarning"/>
</manifest>

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.fabrictestexample

import com.facebook.react.ReactActivity
import com.facebook.react.ReactActivityDelegate
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
import com.facebook.react.defaults.DefaultReactActivityDelegate

class MainActivity : ReactActivity() {
/**
* Returns the name of the main component registered from JavaScript. This is used to schedule
* rendering of the component.
*/
override fun getMainComponentName(): String = "FabricTestExample"

/**
* Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
* which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
*/
override fun createReactActivityDelegate(): ReactActivityDelegate =
DefaultReactActivityDelegate(
this,
mainComponentName, // If you opted-in for the New Architecture, we enable the Fabric Renderer.
fabricEnabled
)
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package com.fabrictestexample

import android.app.Application
import com.facebook.react.PackageList
import com.facebook.react.ReactApplication
import com.facebook.react.ReactHost
import com.facebook.react.ReactNativeHost
import com.facebook.react.ReactPackage
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
import com.facebook.react.defaults.DefaultReactNativeHost
import com.facebook.react.flipper.ReactNativeFlipper.initializeFlipper
import com.facebook.soloader.SoLoader

class MainApplication : Application(), ReactApplication {
override val reactNativeHost: ReactNativeHost = object : DefaultReactNativeHost(this) {
override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG

override fun getPackages(): List<ReactPackage> {
// Packages that cannot be autolinked yet can be added manually here, for example:
// packages.add(new MyReactNativePackage());
return PackageList(this).packages
}

override fun getJSMainModuleName(): String = "index"

override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
}

override val reactHost: ReactHost
get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
kkafar marked this conversation as resolved.
Show resolved Hide resolved

override fun onCreate() {
super.onCreate()
SoLoader.init(this, /* native exopackage */false)
kkafar marked this conversation as resolved.
Show resolved Hide resolved
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
// If you opted-in for the New Architecture, we load the native entry point for this app.
load()
}
initializeFlipper(this, reactNativeHost.reactInstanceManager)
}
}

This file was deleted.

14 changes: 9 additions & 5 deletions FabricTestExample/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

buildscript {
ext {
buildToolsVersion = "33.0.0"
buildToolsVersion = "34.0.0"
minSdkVersion = 21
compileSdkVersion = 33
targetSdkVersion = 33
compileSdkVersion = 34
targetSdkVersion = 34

// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
ndkVersion = "23.1.7779620"
kotlinVersion = "1.8.22"
ndkVersion = "25.1.8937393"
kotlinVersion = "1.8.0"
}
repositories {
google()
Expand All @@ -18,5 +18,9 @@ buildscript {
dependencies {
classpath("com.android.tools.build:gradle")
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
}
}

apply plugin: "com.facebook.react.rootproject"

3 changes: 0 additions & 3 deletions FabricTestExample/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

# Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.182.0

# Use this property to specify which architecture you want to build.
# You can also override it from the CLI using
# ./gradlew <task> -PreactNativeArchitectures=x86_64
Expand Down
Binary file modified FabricTestExample/android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading