Add macOS and tvOS support to EpoxyCore (#143)

* Add macOS and tvOS support to EpoxyCore

lint

* Fix main package build step, and CI job for EpoxyCore

* Update typealiases

* Remove 'UIView' from type names

* Improve project compatibility

* Try only running EpoxyCore job on Xcode 14

* Update version to 0.10.0

* Try to fix CI

* Fix Swift 5.6 build?

* Fix CI job?

* Manually specify deployment target, this seems to fix the problem in a clean checkout

* Update xcodeproj

* Revert rakefile changes to see if this isnt necessary anymore

* Fix macOS 13 SDK check

* Clean up

* Don't try to build for Xcode 13, which fails for some reason

.github/workflows/main.yml

@@ -22,6 +22,20 @@ jobs:
       - name: Build Package
         run: bundle exec rake build:package
 
+  build-epoxy-core:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        xcode:
+        - '14.0.1' # Swift 5.7 (highest)
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/setup
+        with:
+          xcode: ${{ matrix.xcode }}
+      - name: Build EpoxyCore
+        run: bundle exec rake build:EpoxyCore
+
   build-example:
     runs-on: macos-latest
     strategy:

CHANGELOG.md

@@ -4,10 +4,21 @@ All notable changes to this project are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/airbnb/epoxy-ios/compare/0.9.0...HEAD)
+## [Unreleased](https://github.com/airbnb/epoxy-ios/compare/0.10.0...HEAD)
+
+### Changed
+- ...
+
+### Fixed
+- ...
+
+## [0.10.0](https://github.com/airbnb/epoxy-ios/compare/0.9.0...0.10.0) - 2023-06-29
 
 ### Changed
 - Dropped support for Swift 5.4.
+- EpoxyCore now supports macOS and tvOS.
+- Renamed EpoxyCore's `SwiftUIUIView` to `SwiftUIView`.
+- Renamed EpoxyCore's `MeasuringUIViewRepresentable` to `MeasuringViewRepresentable`.
 - Added `UIScrollView.keyboardAdjustsBottomBarOffset` escape hatch to disable bottom bar keyboard
   avoidance for cases where the keyboard is avoided at a higher level (e.g. a
   `UIPresentationController` subclass).

ConfigurePodspec.rb

@@ -3,7 +3,7 @@ def configure(spec:, name:, summary:, local_deps: [])
   # The shared CocoaPods version number for Epoxy.
   #
   # Change this constant to increment the Podspec version for all Epoxy Podspecs from a single place.
-  version = '0.9.0'
+  version = '0.10.0'
 
   spec.name = name
   spec.summary = summary

Rakefile

@@ -4,6 +4,13 @@ namespace :build do
     xcodebuild 'build -scheme Epoxy -destination generic/platform=iOS'
   end
 
+  desc 'Builds the EpoxyCore package for iOS, macOS, and tvOS'
+  task :EpoxyCore do
+    xcodebuild 'build -scheme EpoxyCore -destination generic/platform=iOS'
+    xcodebuild 'build -scheme EpoxyCore -destination generic/platform=tvOS'
+    xcodebuild 'build -scheme EpoxyCore -destination generic/platform=macOS'
+  end
+
   desc 'Builds the EpoxyExample app'
   task :example do
     xcodebuild 'build -scheme EpoxyExample -destination "platform=iOS Simulator,name=iPhone 12"'

Sources/EpoxyCore/EpoxyCore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Sources/EpoxyCore/EpoxyCore.xcodeproj/xcshareddata/xcschemes/EpoxyCore.xcscheme

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "08E2E9042A4CD50700B47A18"
+               BuildableName = "EpoxyCore.framework"
+               BlueprintName = "EpoxyCore"
+               ReferencedContainer = "container:EpoxyCore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </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 = "08E2E9042A4CD50700B47A18"
+            BuildableName = "EpoxyCore.framework"
+            BlueprintName = "EpoxyCore"
+            ReferencedContainer = "container:EpoxyCore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Sources/EpoxyCore/Model/Providers/MakeViewProviding.swift

@@ -1,14 +1,12 @@
 // Created by eric_horacek on 12/1/20.
 // Copyright © 2020 Airbnb Inc. All rights reserved.
 
-import UIKit
-
 // MARK: - MakeViewProviding
 
 /// The capability of constructing a `UIView`.
 public protocol MakeViewProviding {
   /// The view constructed when the `MakeView` closure is called.
-  associatedtype View: UIView
+  associatedtype View: ViewType
 
   /// A closure that's called to construct an instance of `View`.
   typealias MakeView = () -> View

Sources/EpoxyCore/Model/Providers/TraitCollectionProviding.swift

@@ -1,6 +1,7 @@
 // Created by eric_horacek on 12/16/20.
 // Copyright © 2020 Airbnb Inc. All rights reserved.
 
+#if !os(macOS)
 import UIKit
 
 /// The capability of providing a `UITraitCollection` instance.
@@ -10,3 +11,4 @@ public protocol TraitCollectionProviding {
   /// The `UITraitCollection` instance provided by this type.
   var traitCollection: UITraitCollection { get }
 }
+#endif

Sources/EpoxyCore/Model/Providers/ViewProviding.swift

@@ -1,14 +1,12 @@
 // Created by eric_horacek on 12/16/20.
 // Copyright © 2020 Airbnb Inc. All rights reserved.
 
-import UIKit
-
 /// The capability of providing an `View` instance
 ///
 /// Typically conformed to by the `CallbackContext` of a `CallbackContextEpoxyModeled`.
 public protocol ViewProviding {
   /// The `UIView` view of this type.
-  associatedtype View: UIView
+  associatedtype View: ViewType
 
   /// The `UIView` view instance provided by this type.
   var view: View { get }

Sources/EpoxyCore/Model/ViewEpoxyModeled.swift

@@ -1,12 +1,10 @@
 // Created by eric_horacek on 12/4/20.
 // Copyright © 2020 Airbnb Inc. All rights reserved.
 
-import UIKit
-
 /// An Epoxy model with an associated `UIView` type.
 public protocol ViewEpoxyModeled: EpoxyModeled {
   /// The view type associated with this model.
   ///
   /// An instance of this view is typically configured by this model.
-  associatedtype View: UIView
+  associatedtype View: ViewType
 }

Sources/EpoxyCore/SwiftUI/EpoxySwiftUIHostingController.swift

@@ -3,6 +3,7 @@
 
 import SwiftUI
 
+#if !os(macOS)
 // MARK: - EpoxySwiftUIUIHostingController
 
 /// A `UIHostingController` that hosts SwiftUI views within an Epoxy container, e.g. an Epoxy
@@ -41,3 +42,4 @@ open class EpoxySwiftUIHostingController<Content: View>: UIHostingController<Con
     view.backgroundColor = .clear
   }
 }
+#endif

Sources/EpoxyCore/SwiftUI/EpoxySwiftUIHostingView.swift

@@ -4,6 +4,8 @@
 import Combine
 import SwiftUI
 
+#if !os(macOS)
+
 // MARK: - SwiftUIHostingViewReuseBehavior
 
 /// The reuse behavior of an `EpoxySwiftUIHostingView`.
@@ -380,3 +382,5 @@ struct EpoxyHostingWrapper<Content: View>: View {
       .environment(\.epoxyIntrinsicContentSizeInvalidator, environment.intrinsicContentSizeInvalidator)
   }
 }
+
+#endif

Sources/EpoxyCore/SwiftUI/EpoxyableView+SwiftUIView.swift

@@ -26,9 +26,9 @@ extension StyledView where Self: ContentConfigurableView & BehaviorsConfigurable
     content: Content,
     style: Style,
     behaviors: Behaviors? = nil)
-    -> SwiftUIUIView<Self, (content: Content, style: Style)>
+    -> SwiftUIView<Self, (content: Content, style: Style)>
   {
-    SwiftUIUIView(storage: (content: content, style: style)) {
+    SwiftUIView(storage: (content: content, style: style)) {
       let view = Self(style: style)
       view.setContent(content, animated: false)
       return view
@@ -74,9 +74,9 @@ extension StyledView
   public static func swiftUIView(
     content: Content,
     behaviors: Behaviors? = nil)
-    -> SwiftUIUIView<Self, Content>
+    -> SwiftUIView<Self, Content>
   {
-    SwiftUIUIView(storage: content) {
+    SwiftUIView(storage: content) {
       let view = Self()
       view.setContent(content, animated: false)
       return view
@@ -118,9 +118,9 @@ extension StyledView
   public static func swiftUIView(
     style: Style,
     behaviors: Behaviors? = nil)
-    -> SwiftUIUIView<Self, Style>
+    -> SwiftUIView<Self, Style>
   {
-    SwiftUIUIView(storage: style) {
+    SwiftUIView(storage: style) {
       Self(style: style)
     }
     .configure { context in
@@ -157,8 +157,8 @@ extension StyledView
   /// MyView.swiftUIView(…).sizing(.intrinsicSize)
   /// ```
   /// The sizing defaults to `.automatic`.
-  public static func swiftUIView(behaviors: Behaviors? = nil) -> SwiftUIUIView<Self, Void> {
-    SwiftUIUIView {
+  public static func swiftUIView(behaviors: Behaviors? = nil) -> SwiftUIView<Self, Void> {
+    SwiftUIView {
       Self()
     }
     .configure { context in