added "sh build.sh build_listkit_xcode_spm_integration"

Author: 3a4oT

.github/workflows/ci-pull-requests-only.yml

@@ -25,26 +25,3 @@ jobs:
     - name: Run build script
       run: ./build.sh ${{ matrix.mode }}
 
-  SPM:
-    name: Build from SPM manifest
-    runs-on: macOS-latest
-    env: 
-      DEVELOPER_DIR: /Applications/Xcode_12.1.1.app/Contents/Developer
-    strategy:
-      matrix:
-        destination: ["platform=iOS Simulator,name=iPhone 12 Pro", "platform=macOS,variant=Mac Catalyst", "platform=tvOS Simulator,name=Apple TV 4k"]
-        scheme: ["AsyncDisplayKit", "AsyncDisplayKitIGListKit"]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      
-      # Starting from Xcode 11 `xcodebuild` supports SwiftPM packages out of the box
-      # to test that we have  valid swift package we need to remove existing *.xcodeproj/xcworkspace
-      # `xcodebuild` will invoke Package.swift. 
-      - name: spm's xcodebuild - ${{ matrix.destination }}
-        run: |
-          set -o pipefail
-          rm -rf AsyncDisplayKit.xcodeproj/
-          rm -rf AsyncDisplayKit.xcworkspace/
-          xcodebuild clean build -scheme "${{ matrix.scheme }}" -destination "${{ matrix.destination }}"
-

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
     name: Build from SPM manifest
     runs-on: macOS-latest
     env: 
-      DEVELOPER_DIR: /Applications/Xcode_12.1.1.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_12.2.app/Contents/Developer
     strategy:
       matrix:
         destination: ["platform=iOS Simulator,name=iPhone 12 Pro", "platform=macOS,variant=Mac Catalyst", "platform=tvOS Simulator,name=Apple TV 4k"]
@@ -56,3 +56,15 @@ jobs:
           rm -rf AsyncDisplayKit.xcodeproj/
           rm -rf AsyncDisplayKit.xcworkspace/
           xcodebuild clean build -scheme "${{ matrix.scheme }}" -destination "${{ matrix.destination }}"
+
+  Xcode-SPM-Integration:
+    name: Build example project to verify Xcode's SPM integration
+    runs-on: macOS-latest
+    env: 
+      DEVELOPER_DIR: /Applications/Xcode_12.2.app/Contents/Developer
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      
+      - name: Check xcode's spm integration
+        run: ./build.sh build_listkit_xcode_spm_integration

Source/AsyncDisplayKit+IGListKitMethods.h

@@ -15,7 +15,7 @@
 #import <UIKit/UIKit.h>
 #import "ASBaseDefines.h"
 
-#if __has_include("IGListKit.h")
+#if !__has_include(<IGListKit/IGListKit.h>)
 #import "IGListKit.h"
 #else
 #import <IGListKit/IGListKit.h>

Source/Details/ASPINRemoteImageDownloader.mm

@@ -16,37 +16,36 @@
 #import "ASThread.h"
 #import "ASImageContainerProtocolCategories.h"
 
-#if !SWIFT_PACKAGE
-
-    #if __has_include (<PINRemoteImage/PINGIFAnimatedImage.h>)
+#if __has_include(<PINRemoteImage/PINGIFAnimatedImage.h>) || __has_include("PINGIFAnimatedImage.h")
     #define PIN_ANIMATED_AVAILABLE 1
-    #import <PINRemoteImage/PINCachedAnimatedImage.h>
-    #import <PINRemoteImage/PINAlternateRepresentationProvider.h>
+    #if __has_include(<PINRemoteImage/PINGIFAnimatedImage.h>)
+        #import <PINRemoteImage/PINCachedAnimatedImage.h>
+        #import <PINRemoteImage/PINAlternateRepresentationProvider.h>
     #else
-    #define PIN_ANIMATED_AVAILABLE 0
+        #import "PINCachedAnimatedImage.h"
+        #import "PINAlternateRepresentationProvider.h"
     #endif
+#else
+    #define PIN_ANIMATED_AVAILABLE 0
+#endif
 
-    #if __has_include(<webp/decode.h>)
+#if __has_include(<webp/decode.h>) || __has_include("webp/decode.h")
     #define PIN_WEBP_AVAILABLE  1
-    #else
+#else
     #define PIN_WEBP_AVAILABLE  0
-    #endif
+#endif
 
+#if __has_include(<PINRemoteImage/PINRemoteImage.h>)
     #import <PINRemoteImage/PINRemoteImageManager.h>
     #import <PINRemoteImage/NSData+ImageDetectors.h>
     #import <PINRemoteImage/PINRemoteImageCaching.h>
-
 #else
-#define PIN_ANIMATED_AVAILABLE __has_include(<webp/decode.h>) || __has_include("webp/decode.h")
-#define PIN_WEBP_AVAILABLE __has_include("PINRemoteImage.h") || __has_include (<PINRemoteImage/PINRemoteImage.h>)
+    #import "PINRemoteImageManager.h"
+    #import "NSData+ImageDetectors.h"
+    #import "PINRemoteImageCaching.h"
+#endif
 
-    #if __has_include (<PINRemoteImage/PINRemoteImage.h>)
-    #import <PINRemoteImage/PINRemoteImage.h>
-    #else
-    #import "PINRemoteImage.h"
-    #endif
 
-#endif
 
 static inline PINRemoteImageManagerPriority PINRemoteImageManagerPriorityWithASImageDownloaderPriority(ASImageDownloaderPriority priority) {
   switch (priority) {

Source/IGListAdapter+AsyncDisplayKit.h

@@ -11,10 +11,10 @@
 
 #if AS_IG_LIST_KIT
 
-#if __has_include("IGListKit.h")
+#if !__has_include(<IGListKit/IGListKit.h>)
 #import "IGListKit.h"
 #else
-#import <IGListKit/IGListKit.h>aa
+#import <IGListKit/IGListKit.h>
 #endif
 
 NS_ASSUME_NONNULL_BEGIN

Source/Layout/ASLayout+IGListDiffKit.h

@@ -9,7 +9,7 @@
 #if AS_IG_LIST_DIFF_KIT
 #import "ASLayout.h"
 
-#if __has_include("IGListDiffKit.h")
+#if !__has_include(<IGListDiffKit/IGListDiffKit.h>)
 #import "IGListDiffKit.h"
 #else
 #import <IGListDiffKit/IGListDiffKit.h>

Source/Private/ASIGListAdapterBasedDataSource.h

@@ -11,7 +11,7 @@
 
 #if AS_IG_LIST_KIT
 
-#if __has_include("IGListKit.h")
+#if !__has_include(<IGListKit/IGListKit.h>)
 #import "IGListKit.h"
 #else
 #import <IGListKit/IGListKit.h>

build.sh

@@ -61,6 +61,9 @@ function build_example {
             build
 
         cd ../..
+     else 
+        echo "Seems like there are no Cartfile or Podfile in the ${example}"
+        echo "Build will be skipped."     
     fi
 }
 
@@ -104,6 +107,18 @@ tests_listkit)
     success="1"
     ;;
 
+build_listkit_xcode_spm_integration)
+    echo "Building AsyncDisplayKit+IGListKit via Xcode's Swift Package Manager"
+    echo "Xcode 12.2+ required"
+    set -o pipefail && xcodebuild clean \
+        -project examples/ASIGListKitSPM/Sample.xcodeproj \
+        -scheme Sample \
+        -sdk "iphonesimulator" \
+        -destination "platform=iOS Simulator,name=iPhone 12" \
+        build
+    success="1"
+    ;;
+
 examples|all)
     echo "Verifying that all AsyncDisplayKit examples compile."
     for example in examples/*/; do
@@ -246,8 +261,19 @@ cocoapods-lint-other-subspecs)
 
 carthage|all)
     echo "Verifying carthage works."
+    ## carthage workaround to slip spm based project
+    spm_example_project="examples/ASIGListKitSPM/Sample.xcodeproj"
+    carthge_example_project_workaround="examples/ASIGListKitSPM/Sample.carthageSkip"
+
+    # apply workaround
+    mv $spm_example_project $carthge_example_project_workaround
 
+    # carthage job
     set -o pipefail && carthage update && carthage build --no-skip-current
+
+    #revert back workaround
+    mv $carthge_example_project_workaround $spm_example_project
+
     success="1"
     ;;
 

examples/ASIGListKitSPM/ASIGListKitSPM.xcodeproj/project.pbxproj renamed to examples/ASIGListKitSPM/Sample.xcodeproj/project.pbxproj

@@ -19,7 +19,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		FB32E77B25768F45000C4F42 /* ASIGListKitSPM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ASIGListKitSPM.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		FB32E77B25768F45000C4F42 /* Sample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Sample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		FB32E77E25768F45000C4F42 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		FB32E78025768F45000C4F42 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
 		FB32E78725768F48000C4F42 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -56,7 +56,7 @@
 		FB32E77C25768F45000C4F42 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				FB32E77B25768F45000C4F42 /* ASIGListKitSPM.app */,
+				FB32E77B25768F45000C4F42 /* Sample.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -112,9 +112,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		FB32E77A25768F45000C4F42 /* ASIGListKitSPM */ = {
+		FB32E77A25768F45000C4F42 /* Sample */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = FB32E78F25768F48000C4F42 /* Build configuration list for PBXNativeTarget "ASIGListKitSPM" */;
+			buildConfigurationList = FB32E78F25768F48000C4F42 /* Build configuration list for PBXNativeTarget "Sample" */;
 			buildPhases = (
 				FB32E77725768F45000C4F42 /* Sources */,
 				FB32E77825768F45000C4F42 /* Frameworks */,
@@ -124,12 +124,12 @@
 			);
 			dependencies = (
 			);
-			name = ASIGListKitSPM;
+			name = Sample;
 			packageProductDependencies = (
 				FB3894A52576FC5F0025252E /* AsyncDisplayKitIGListKit */,
 			);
 			productName = ASIGListKitSPM;
-			productReference = FB32E77B25768F45000C4F42 /* ASIGListKitSPM.app */;
+			productReference = FB32E77B25768F45000C4F42 /* Sample.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -146,7 +146,7 @@
 					};
 				};
 			};
-			buildConfigurationList = FB32E77625768F45000C4F42 /* Build configuration list for PBXProject "ASIGListKitSPM" */;
+			buildConfigurationList = FB32E77625768F45000C4F42 /* Build configuration list for PBXProject "Sample" */;
 			compatibilityVersion = "Xcode 9.3";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -159,7 +159,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				FB32E77A25768F45000C4F42 /* ASIGListKitSPM */,
+				FB32E77A25768F45000C4F42 /* Sample */,
 			);
 		};
 /* End PBXProject section */
@@ -327,6 +327,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = ASIGListKitSPM/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -345,6 +346,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = ASIGListKitSPM/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -359,7 +361,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		FB32E77625768F45000C4F42 /* Build configuration list for PBXProject "ASIGListKitSPM" */ = {
+		FB32E77625768F45000C4F42 /* Build configuration list for PBXProject "Sample" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				FB32E78D25768F48000C4F42 /* Debug */,
@@ -368,7 +370,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		FB32E78F25768F48000C4F42 /* Build configuration list for PBXNativeTarget "ASIGListKitSPM" */ = {
+		FB32E78F25768F48000C4F42 /* Build configuration list for PBXNativeTarget "Sample" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				FB32E79025768F48000C4F42 /* Debug */,