Merge branch 'main' into fix/814/updating-first-sticky-header-when-da…

…ta-changed

.github/workflows/flash-list.yml

@@ -158,6 +158,11 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: "yarn"
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: "temurin"
+          java-version: "17"
       - name: Ruby setup
         uses: ruby/setup-ruby@v1
         with:

fixture/react-native/.gitignore

@@ -14,7 +14,19 @@ ios/**/xcshareddata/WorkspaceSettings.xcsettings
 
 android/*.hprof
 
+**/.xcode.env.local
+**/*.xcprivacy
+
+
 # e2e
 
 e2e/artifacts/ios/diff
 e2e/artifacts/android/diff
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

fixture/react-native/android/app/build.gradle

@@ -80,7 +80,9 @@ android {
     }
     ndkVersion rootProject.ext.ndkVersion
 
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+
+    compileSdk rootProject.ext.compileSdkVersion
 
     namespace "com.flatlistpro"
     defaultConfig {
@@ -122,19 +124,12 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
-    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 {
         implementation jscFlavor
     }
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     androidTestImplementation('com.wix:detox:+')
 }
 

fixture/react-native/android/app/src/debug/AndroidManifest.xml

@@ -8,6 +8,5 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
         tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
     </application>
 </manifest>

fixture/react-native/android/app/src/main/java/com/flatlistpro/MainActivity.kt

@@ -0,0 +1,22 @@
+package com.flatlistpro;
+
+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 = "FlatListPro"
+
+  /**
+   * 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, fabricEnabled)
+}

fixture/react-native/android/app/src/main/java/com/flatlistpro/MainApplication.kt

@@ -0,0 +1,43 @@
+package com.flatlistpro;
+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.soloader.SoLoader
+
+class MainApplication : Application(), ReactApplication {
+
+        override val reactNativeHost: ReactNativeHost =
+                object : DefaultReactNativeHost(this) {
+                        override fun getPackages(): List<ReactPackage> =
+                                PackageList(this).packages.apply {
+                                        // Packages that cannot be autolinked yet can be added manually here, for example:
+                                        // add(MyReactNativePackage())
+                                        add(AppPackage())
+                                }
+
+                        override fun getJSMainModuleName(): String = "index"
+
+                        override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+
+                        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+                        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
+                }
+
+        override val reactHost: ReactHost
+                get() = getDefaultReactHost(applicationContext, reactNativeHost)
+
+        override fun onCreate() {
+                super.onCreate()
+                SoLoader.init(this, false)
+                if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+                        // If you opted-in for the New Architecture, we load the native entry point for this app.
+                        load()
+                }
+        }
+}

fixture/react-native/android/build.gradle

@@ -2,13 +2,12 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "33.0.0"
-        minSdkVersion = 21
-        compileSdkVersion = 33
-        targetSdkVersion = 33
-        // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-        ndkVersion = "23.1.7779620"
-        kotlin_version = "1.8.10"
+      buildToolsVersion = "34.0.0"
+        minSdkVersion = 23
+        compileSdkVersion = 34
+        targetSdkVersion = 34
+        ndkVersion = "26.1.10909125"
+        kotlinVersion = "1.9.22"
 
     }
     repositories {
@@ -18,7 +17,8 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
     }
 }
+
+apply plugin: "com.facebook.react.rootproject"

fixture/react-native/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

fixture/react-native/babel.config.js

@@ -15,4 +15,16 @@ module.exports = {
     // Reanimated plugin has to be listed last
     "react-native-reanimated/plugin",
   ],
+  overrides: [
+    {
+      plugins: [
+        [
+          "@babel/plugin-transform-private-methods",
+          {
+            loose: true,
+          },
+        ],
+      ],
+    },
+  ],
 };