@react-native-vector-icons/common 11.0.0-alpha.2 → 11.0.0-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-vector-icons/common",
-  "version": "11.0.0-alpha.2",
+  "version": "11.0.0-alpha.3",
   "description": "Customizable Icons for React Native with support for image source and full styling.",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",
@@ -19,6 +19,7 @@
     }
   },
   "files": [
+    "scripts",
     "src",
     "lib",
     "android",
@@ -160,5 +161,5 @@
     "languages": "kotlin-objc",
     "version": "0.41.2"
   },
-  "gitHead": "2f3944d3ea907e2ced2955ea88f3e3504d828dd3"
+  "gitHead": "e9f80997706ccf4aa535c4bc327346e7b3b09e82"
 }

package/react-native-vector-icons.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
     # Don't install the dependencies when we run `pod install` in the old architecture.
     if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
       s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-      s.pod_target_xcconfig    = {
+      s.pod_target_xcconfig = {
           "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
           "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
           "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
@@ -41,61 +41,12 @@ Pod::Spec.new do |s|
 
   s.script_phase = {
     :name => 'Copy Fonts',
-    :script => "
+    :script => <<~SCRIPT
       set -e
 
-      # This script borrows from the standard resource copy script https://gist.github.com/vonovak/d8f1a37804438f05bae22be1e8cd53c1
-      # We need two key bits of information
-      # Project Root - Where the package.json for the RN app lives
-      # Xcode Build Dir to copy the fonts into - We look for the directory that ends in .app
+      WITH_ENVIRONMENT="$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh"
 
-      echo \"(RNVI) START_COPY_FONTS\"
-
-      echo \"(RNVI) PWD: $(pwd)\"
-
-      #############
-      # Find the fonts we need to copy
-      #############
-
-      # Assume the project root is always two directories above the POD_ROOT
-      echo \"(RNVI) PODS_ROOT: $PODS_ROOT\"
-      PROJECT_ROOT=\"${PODS_ROOT}/../..\"
-      echo \"(RNVI) PROJECT_ROOT: $PROJECT_ROOT\"
-
-      # Items we need to copy for rsync
-      RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
-
-      node \"${PODS_TARGET_SRCROOT}/lib/commonjs/scripts/getFonts.js\" \"$PROJECT_ROOT\"/package.json > \"$RESOURCES_TO_COPY\"
-
-      #############
-      # Find the destination we copy to
-      #############
-
-      echo \"(RNVI) PODS_CONFIGURATION_BUILD_DIR: $PODS_CONFIGURATION_BUILD_DIR\"
-      XCODE_DIR=$(ls -d \"$PODS_CONFIGURATION_BUILD_DIR\"/*.app)
-      echo \"(RNVI) XCODE_DIR: $XCODE_DIR\"
-      DEST_DIR=\"${XCODE_DIR}\"
-      echo \"(RNVI) DEST_DIR: $DEST_DIR\"
-      echo I $INSTALL_DIR
-      mkdir -p \"$DEST_DIR\"
-
-      #############
-      # Copy the fonts
-      #############
-      echo \"(RNVI) Copying the following files to $DEST_DIR\"
-      cat \"$RESOURCES_TO_COPY\" | sed 's/^/(RNVI) /'
-
-      # NOTE: Should we add --delete and remove old fonts automagically? NOt doing it yet as it feels risky
-      rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from=\"$RESOURCES_TO_COPY\" / \"$DEST_DIR\"
-      # TODO: How do we test this is right?
-      if [[ \"${ACTION}\" == \"install\" ]] && [[ \"${SKIP_INSTALL}\" == \"NO\" ]]; then
-        mkdir -p \"${INSTALL_DIR}/react-native-vector-icons\"
-        rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from=\"$RESOURCES_TO_COPY\" / \"${INSTALL_DIR}/react-native-vector-icons\"
-      fi
-
-      rm -f \"$RESOURCES_TO_COPY\"
-
-      echo \"(RNVI) END:RNVI_COPY_FONTS\"
-    ",
+      /bin/sh -c "\"$WITH_ENVIRONMENT\" \"${PODS_TARGET_SRCROOT}/scripts/copy-fonts.sh\""
+    SCRIPT
   }
 end

package/scripts/copy-fonts.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+set -e
+
+# This script borrows from the standard resource copy script https://gist.github.com/vonovak/d8f1a37804438f05bae22be1e8cd53c1
+# We need two key bits of information
+# Project Root - Where the package.json for the RN app lives
+# Xcode Build Dir to copy the fonts into - We look for the directory that ends in .app
+
+echo "(RNVI) START_COPY_FONTS"
+
+echo "(RNVI) PWD: $(pwd)"
+
+#############
+# Find the fonts we need to copy
+#############
+
+# Assume the project root is always two directories above the POD_ROOT
+echo "(RNVI) PODS_ROOT: $PODS_ROOT"
+PROJECT_ROOT="${PODS_ROOT}/../.."
+echo "(RNVI) PROJECT_ROOT: $PROJECT_ROOT"
+
+# Items we need to copy for rsync
+RESOURCES_TO_COPY="${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt"
+
+"$NODE_BINARY" "${PODS_TARGET_SRCROOT}/lib/commonjs/scripts/getFonts.js" "$PROJECT_ROOT"/package.json >"$RESOURCES_TO_COPY"
+
+#############
+# Find the destination we copy to
+#############
+
+echo "(RNVI) PODS_CONFIGURATION_BUILD_DIR: $PODS_CONFIGURATION_BUILD_DIR"
+XCODE_DIR=$(ls -d "$PODS_CONFIGURATION_BUILD_DIR"/*.app)
+echo "(RNVI) XCODE_DIR: $XCODE_DIR"
+DEST_DIR="${XCODE_DIR}"
+echo "(RNVI) DEST_DIR: $DEST_DIR"
+echo "(RNVI) INSTALL_DIR: $INSTALL_DIR"
+mkdir -p "$DEST_DIR"
+
+#############
+# Copy the fonts
+#############
+echo "(RNVI) Copying the following files to $DEST_DIR"
+sed 's/^/(RNVI) /' "$RESOURCES_TO_COPY"
+
+# NOTE: Should we add --delete and remove old fonts automagically? NOt doing it yet as it feels risky
+rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "$DEST_DIR"
+# TODO: How do we test this is right?
+if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
+  mkdir -p "${INSTALL_DIR}/react-native-vector-icons"
+  rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/react-native-vector-icons"
+fi
+
+rm -f "$RESOURCES_TO_COPY"
+
+echo "(RNVI) END:RNVI_COPY_FONTS"