From 778703d8a3ae50080e19b513e324565046b87380 Mon Sep 17 00:00:00 2001
From: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
Date: Wed, 17 Aug 2022 15:50:01 +0200
Subject: [PATCH] feat: remove unused common folder (#1838)

PR removing common directory from library since it is not used currently due to no custom shadow nodes etc. in Fabric implementation.
---
 .github/workflows/android-build-test.yml |  1 -
 FabricExample/ios/Podfile.lock           | 11 +------
 RNSVG.podspec                            |  6 ----
 android/src/main/jni/Android.mk          |  1 -
 common/cpp/Android.mk                    | 37 ------------------------
 5 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 common/cpp/Android.mk

diff --git a/.github/workflows/android-build-test.yml b/.github/workflows/android-build-test.yml
index ab49c8ae..23a5a9e2 100644
--- a/.github/workflows/android-build-test.yml
+++ b/.github/workflows/android-build-test.yml
@@ -4,7 +4,6 @@ on:
     paths:
       - '.github/workflows/android-build-test.yml'
       - 'android/**'
-      - 'common/**'
       - 'Example/android/**'
       - 'FabricExample/android/**'
   push:
diff --git a/FabricExample/ios/Podfile.lock b/FabricExample/ios/Podfile.lock
index 5af31874..86cc189d 100644
--- a/FabricExample/ios/Podfile.lock
+++ b/FabricExample/ios/Podfile.lock
@@ -705,15 +705,6 @@ PODS:
     - React-Codegen
     - React-RCTFabric
     - ReactCommon/turbomodule/core
-    - RNSVG/common (= 12.4.4)
-  - RNSVG/common (12.4.4):
-    - RCT-Folly
-    - RCTRequired
-    - RCTTypeSafety
-    - React
-    - React-Codegen
-    - React-RCTFabric
-    - ReactCommon/turbomodule/core
   - SocketRocket (0.6.0)
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
@@ -936,7 +927,7 @@ SPEC CHECKSUMS:
   React-rncore: 55e35fbadf994c9efa605a78bf9d1fb3f080bc55
   React-runtimeexecutor: 538c4d995c729b5247ac3149774f0a53f98570dd
   ReactCommon: f7fc6b8b10e8f16f65a8009be266cfc1478fb20d
-  RNSVG: 79c1551169ce176cc9eadd5e320c62b8912fe315
+  RNSVG: 7b29007eb3f0c22975ee09c5cfab0459b1d78560
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   Yoga: 65fe91a246110ebd54e9c7388d98e90d861cb4e7
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
diff --git a/RNSVG.podspec b/RNSVG.podspec
index a5b48366..6e28947f 100644
--- a/RNSVG.podspec
+++ b/RNSVG.podspec
@@ -38,12 +38,6 @@ Pod::Spec.new do |s|
     s.dependency "RCTRequired"
     s.dependency "RCTTypeSafety"
     s.dependency "ReactCommon/turbomodule/core"
-  
-    s.subspec "common" do |ss|
-      ss.source_files         = "common/cpp/**/*.{cpp,h}"
-      ss.header_dir           = "rnsvg"
-      ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\"" }
-    end
   else 
     s.source_files       = 'apple/**/*.{h,m,mm}'
     s.exclude_files      = 'apple/Utils/RNSVGFabricConversions.h'
diff --git a/android/src/main/jni/Android.mk b/android/src/main/jni/Android.mk
index 2debd0a7..6d34a145 100644
--- a/android/src/main/jni/Android.mk
+++ b/android/src/main/jni/Android.mk
@@ -1,7 +1,6 @@
 SVG_MAIN_THIS_DIR := $(call my-dir)
 
 include $(SVG_MAIN_THIS_DIR)/../../../build/generated/source/codegen/jni/Android.mk
-include $(SVG_MAIN_THIS_DIR)/../../../../common/cpp/Android.mk
 
 include $(CLEAR_VARS)
 
diff --git a/common/cpp/Android.mk b/common/cpp/Android.mk
deleted file mode 100644
index 7f6c1e46..00000000
--- a/common/cpp/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-SVG_COMMON_THIS_DIR := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_PATH := $(SVG_COMMON_THIS_DIR)
-LOCAL_MODULE := rnsvg_common
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*.cpp) 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
-
-# Please note as one of the library listed is libreact_codegen_samplelibrary
-# This name will be generated as libreact_codegen_<library-name>
-# where <library-name> is the one you specified in the Gradle configuration
-LOCAL_SHARED_LIBRARIES := libjsi \
-    libfbjni \
-    libglog \
-    libfolly_runtime \
-    libyoga \
-    libreact_nativemodule_core \
-    libturbomodulejsijni \
-    librrc_view \
-    libreact_render_core \
-    libreact_render_graphics \
-    libfabricjni \
-    libreact_debug \
-    libreact_render_componentregistry \
-    libreact_render_debug \
-    libruntimeexecutor \
-    libreact_codegen_rncore \
-    libreact_codegen_rnsvg
-
-LOCAL_CFLAGS := \
-    -DLOG_TAG=\"ReactNative\"
-LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
-
-include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file