Merge branch 'develop'

.github/workflows/CI.yml

@@ -0,0 +1,74 @@
+name: "CHTCollectionViewWaterfallLayout CI"
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  Demo:
+    name: Demo Project (Latest Stable Xcode)
+    runs-on: macOS-11
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Xcode version
+        uses: maxim-lobanov/[email protected]
+        with: 
+          xcode-version: latest-stable
+
+      - name: Build Swift Project
+        uses: sersoft-gmbh/[email protected]
+        with:
+          project: Demo/Swift/CHTWaterfallSwiftDemo.xcodeproj
+          scheme: CHTWaterfallSwiftDemo
+          destination: name=iPhone 13 Pro
+          action: build
+
+      - name: Build Objective-C Project
+        uses: sersoft-gmbh/[email protected]
+        with:
+          project: Demo/Objective-C/Demo.xcodeproj
+          scheme: Demo
+          destination: name=iPhone 13 Pro
+          action: build
+
+  Pods:
+    name: Cocoapods Lint (Latest Stable Xcode)
+    runs-on: macOS-11
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Xcode version
+        uses: maxim-lobanov/[email protected]
+        with: 
+          xcode-version: latest-stable
+
+      - name: Run pod lib lint dynamic-framework
+        run: pod lib lint --fail-fast
+
+      - name: Run pod lib lint static-framework
+        run: pod lib lint --fail-fast --use-libraries --use-modular-headers
+
+  SwiftPM:
+    name: SwiftPM (Latest Stable Xcode)
+    runs-on: macOS-11
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Xcode version
+        uses: maxim-lobanov/[email protected]
+        with: 
+          xcode-version: latest-stable 
+
+      - name: Build Swift Version
+        run: xcodebuild -scheme CHTCollectionViewWaterfallLayout -destination generic/platform=iOS
+
+      - name: Build ObjC Version
+        run: xcodebuild -scheme CHTCollectionViewWaterfallLayoutObjC -destination generic/platform=iOS

.gitignore

@@ -19,3 +19,8 @@ DerivedData
 
 # Carthage
 Carthage/
+
+# Swift Package Manager
+.build/
+.swiftpm/
+Package.resolved

CHTCollectionViewWaterfallLayout.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CHTCollectionViewWaterfallLayout"
-  s.version      = "0.9.8"
+  s.version      = "0.9.9"
   s.summary      = "The waterfall (i.e., Pinterest-like) layout for UICollectionView."
   s.homepage     = "https://github.com/chiahsien/CHTCollectionViewWaterfallLayout"
   s.screenshots  = "https://raw.github.com/chiahsien/UICollectionViewWaterfallLayout/master/Screenshots/2-columns.png"
@@ -9,19 +9,19 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/chiahsien/CHTCollectionViewWaterfallLayout.git", :tag => "#{s.version}" }
   s.requires_arc = true
 
-  s.ios.deployment_target = '6.0'
+  s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
 
-  s.default_subspec = 'ObjC'
+  s.default_subspec = 'Swift'
 
   s.subspec 'ObjC' do |ss|
-    ss.ios.deployment_target = '6.0'
-    ss.source_files = '*.{h,m}'
+    ss.ios.deployment_target = '9.0'
+    ss.source_files = 'Source/*.{h,m}'
   end
 
   s.swift_version = '4.2'
   s.subspec 'Swift' do |ss|
-    ss.ios.deployment_target = '8.0'
-    ss.source_files = 'SwiftSources/**/*'
+    ss.ios.deployment_target = '9.0'
+    ss.source_files = 'Source/*.swift'
   end
 end