From 1b7533bcab7044b57be4481100d7308c1a567a6e Mon Sep 17 00:00:00 2001
From: Mark Rickert <mjar81@gmail.com>
Date: Mon, 9 Oct 2023 17:57:49 -0600
Subject: [PATCH] Cleanup

---
 .eslintrc.js        |  1 -
 .gitignore          | 28 ++++++++++++++--------------
 CHANGELOG.md        |  2 ++
 RNFlashList.podspec | 13 ++++---------
 package.json        |  4 ++--
 5 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 51ec2bbc0..9ba5e287d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -39,7 +39,6 @@ module.exports = {
     "require-atomic-updates": "off",
     "@typescript-eslint/member-ordering": "off",
     "@typescript-eslint/consistent-indexed-object-style": "off",
-    "@typescript-eslint/ban-ts-comment": "off",
     "jsx-a11y/no-autofocus": "off",
   },
   overrides: [
diff --git a/.gitignore b/.gitignore
index e11fe4ef4..064c6047f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,11 +74,11 @@ freeline/
 freeline_project_description.json
 
 # fastlane
-**/fastlane/report.xml
-**/fastlane/Preview.html
-**/fastlane/screenshots
-**/fastlane/test_output
-**/fastlane/readme.md
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
 
 # Version control
 vcs.xml
@@ -198,20 +198,20 @@ dist
 **/.DS_Store
 
 # CocoaPods
-*fixture/ios/Pods/
+fixture/ios/Pods/
 
 # Xcode
-*fixture/ios/xcuserdata/
-*fixture/ios/*.xcworkspace/xcuserdata/
-*fixture/ios/*.xcodeproj/*
-!*fixture/ios/*.xcodeproj/project.pbxproj
-!*fixture/ios/*.xcodeproj/xcshareddata/
-!*fixture/ios/*.xcworkspace/contents.xcworkspacedata
-*fixture/ios/**/xcshareddata/WorkspaceSettings.xcsettings
+fixture/ios/xcuserdata/
+fixture/ios/*.xcworkspace/xcuserdata/
+fixture/ios/*.xcodeproj/*
+!fixture/ios/*.xcodeproj/project.pbxproj
+!fixture/ios/*.xcodeproj/xcshareddata/
+!fixture/ios/*.xcworkspace/contents.xcworkspacedata
+fixture/ios/**/xcshareddata/WorkspaceSettings.xcsettings
 
 # Android
 
-*fixture/android/*.hprof
+fixture/android/*.hprof
 
 # e2e
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7dadc7e8..de42da7be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+- Added Fabric support for iOS and Android
+
 ## [1.6.1] - 2023-09-14
 
 - Prevent an expired layout provider from being used again
diff --git a/RNFlashList.podspec b/RNFlashList.podspec
index ed433f2df..636be5af8 100644
--- a/RNFlashList.podspec
+++ b/RNFlashList.podspec
@@ -3,7 +3,6 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-
 fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
 Pod::Spec.new do |s|
@@ -13,12 +12,10 @@ Pod::Spec.new do |s|
   s.homepage         = package['homepage']
   s.license          = package['license']
   s.author           = package['author']
-  s.platforms        = { :ios => '12.4', :tvos => '12.0' }
   s.source           = { git: 'https://github.com/shopify/flash-list.git', tag: "v#{s.version}" }
   s.source_files     = 'ios/Sources/**/*'
   s.requires_arc     = true
   s.swift_version    = '5.0'
-
   s.dependency "React-Core"
 
   if fabric_enabled
@@ -37,12 +34,10 @@ Pod::Spec.new do |s|
     s.dependency "RCTTypeSafety"
     s.dependency "ReactCommon/turbomodule/core"
     s.ios.deployment_target = "12.4"
-  end
-
-  if fabric_enabled
-    s.subspec "Fabric" do |ss|
-      ss.source_files = "ios/Fabric/**/*.{h,mm}"
-    end
+    s.platforms        = { :ios => '12.4', :tvos => '12.0' }
+  else
+    # Settings for non-fabric builds
+    s.platforms        = { :ios => '11.0', :tvos => '12.0' }
   end
 
   # Tests spec
diff --git a/package.json b/package.json
index 69718259d..75afa644c 100644
--- a/package.json
+++ b/package.json
@@ -72,8 +72,8 @@
     "jest": "^28.1.1",
     "metro-react-native-babel-preset": "^0.71.1",
     "prettier": "^2.7.1",
-    "react": "18.2.0",
-    "react-native": "0.72.5",
+    "react": "17.0.2",
+    "react-native": "0.68.5",
     "typescript": "4.8.4"
   },
   "files": [