Merge pull request #156 from chillpop/spm

Swift Package Manager Support (retry)

.github/workflows/main.yml

@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  push:
+    branches: [ $default-branch ]
+  pull_request:
+    branches: [ $default-branch ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: macos-latest
+    env:
+      DESTINATION: "name=iPhone 12"
+      XCODE_SDK: iphonesimulator
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Test Xcode Framework
+        run: xcodebuild -scheme Static-iOS -sdk "$XCODE_SDK" -destination "$DESTINATION" test
+
+      - name: Test Swift Package
+        run: xcodebuild -workspace .swiftpm/xcode/package.xcworkspace -scheme Static -sdk "$XCODE_SDK" -destination "$DESTINATION" test

.swiftpm/xcode/xcshareddata/xcschemes/Static.xcscheme

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1250"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Static"
+               BuildableName = "Static"
+               BlueprintName = "Static"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "StaticTests"
+               BuildableName = "StaticTests"
+               BlueprintName = "StaticTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "StaticTests"
+               BuildableName = "StaticTests"
+               BlueprintName = "StaticTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Static"
+            BuildableName = "Static"
+            BlueprintName = "Static"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Example/WindowController.swift

@@ -1,7 +1,7 @@
 import UIKit
 
 @UIApplicationMain final class WindowController: UIResponder {
-    var window: UIWindow? = {
+    lazy var window: UIWindow? = {
         let window = UIWindow(frame: UIScreen.main.bounds)
         window.rootViewController = UINavigationController(rootViewController: ViewController())
         return window

Package.swift

@@ -0,0 +1,17 @@
+// swift-tools-version:5.3
+
+import PackageDescription
+
+let package = Package(
+    name: "Static",
+    platforms: [
+        .iOS(.v9)
+    ],
+    products: [
+        .library(name: "Static", targets: ["Static"])
+    ],
+    targets: [
+        .target(name: "Static"),
+        .testTarget(name: "StaticTests", dependencies: ["Static"])
+    ]
+)

Static/Cell.swift → Sources/Static/Cell.swift

@@ -1,6 +1,6 @@
 import UIKit
 
-public protocol Cell: class {
+public protocol Cell: AnyObject {
     static func description() -> String
     static func nib() -> UINib?
 

Static/DataSource.swift → Sources/Static/DataSource.swift

@@ -310,9 +310,12 @@ extension DataSource: UITableViewDelegate {
 extension UITableView.Style {
     var defaultSectionExtremityHeight: CGFloat {
         switch self {
-        case .plain: return 0
-        case .grouped: return UITableView.automaticDimension
-        @unknown default: return UITableView.automaticDimension
+        case .plain:
+            return 0
+        case .grouped, .insetGrouped:
+            return UITableView.automaticDimension
+        @unknown default:
+            return UITableView.automaticDimension
         }
     }
 }

Static.podspec

@@ -1,14 +1,15 @@
 Pod::Spec.new do |spec|
   spec.name = 'Static'
-  spec.version = '4.0.2'
+  spec.version = '4.1.0'
   spec.summary = 'Simple static table views for iOS in Swift.'
   spec.description = 'Static provides simple static table views for iOS in Swift.'
   spec.homepage = 'https://github.com/venmo/static'
   spec.license = { type: 'MIT', file: 'LICENSE' }
   spec.source = { git: 'https://github.com/venmo/Static.git', tag: "v#{spec.version}" }
   spec.author = { 'Venmo' => '[email protected]', 'Sam Soffes' => '[email protected]' }
 
-  spec.platform = :ios, '8.0'
+  spec.swift_versions = ['5.0', '5.1', '5.2', '5.3']
+  spec.platform = :ios, '9.0'
   spec.frameworks = 'UIKit'
-  spec.source_files = 'Static/*.{swift,h}'
+  spec.source_files = 'Sources/Static/**/*.swift'
 end