Merge pull request #3743 from CocoaPods/fix-codesigning

Always codesign if target is codesigned, not just if required.

CHANGELOG.md

@@ -135,6 +135,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Tim Rosenblatt](https://github.com/timrosenblatt)
   [#3675](https://github.com/CocoaPods/CocoaPods/pull/3675)
 
+* Pods frameworks in codesigned Mac apps are now signed.
+  [Nikolaj Schumacher](https://github.com/nschum)
+  [#3646](https://github.com/CocoaPods/CocoaPods/issues/3646)
+
 
 ## 0.37.2
 

lib/cocoapods/generator/embed_frameworks_script.rb

@@ -61,10 +61,9 @@ module Pod
             # use filter instead of exclude so missing patterns dont' throw errors
             echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" ${source} ${destination}"
             rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
+
             # Resign the code if required by the build settings to avoid unstable apps
-            if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then
-                code_sign "${destination}/$1"
-            fi
+            code_sign_if_enabled "${destination}/$(basename "$1")"
 
             # Embed linked Swift runtime libraries
             local basename
@@ -74,18 +73,18 @@ module Pod
             for lib in $swift_runtime_libs; do
               echo "rsync -auv \\"${SWIFT_STDLIB_PATH}/${lib}\\" \\"${destination}\\""
               rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
-              if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then
-                code_sign "${destination}/${lib}"
-              fi
+              code_sign_if_enabled "${destination}/${lib}"
             done
           }
 
           # Signs a framework with the provided identity
-          code_sign() {
-            # Use the current code_sign_identitiy
-            echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-            echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements $1"
-            /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
+          code_sign_if_enabled() {
+            if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+              # Use the current code_sign_identitiy
+              echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
+              echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements $1"
+              /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
+            fi
           }
 
         eos

cocoapods-integration-specs @ f013e998

-Subproject commit e2492301c53cf7ad83e89dbebdd772254dd0fe15
+Subproject commit f013e9980d68be95303fdf4f629deae3a0f013c5