Merge pull request #1 from lovoo/feature/swiftpm

Swift Package Support
lovoo · Aug 13, 2024 · 65adff5 · 65adff5
2 parents 87d1f8b + 0f7e867
commit 65adff5
Show file tree

Hide file tree

Showing 89 changed files with 100 additions and 5,798 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,6 @@ Pods
 DerivedData
 build
 
-.ruby-version
+.ruby-version
+
+.swiftpm
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,21 @@
+// swift-tools-version: 5.10
+
+import PackageDescription
+
+let package = Package(
+    name: "pop",
+    platforms: [.iOS(.v15)],
+    products: [
+        .library(
+            name: "pop",
+            targets: ["pop"]
+        )
+    ],
+    targets: [
+        .target(
+            name: "pop",
+            path: "Sources/pop",
+            publicHeadersPath: "include"
+        )
+    ]
+)
diff --git a/Podfile b/Podfile
diff --git a/Podfile.lock b/Podfile.lock
diff --git a/README.md b/README.md
@@ -6,6 +6,12 @@ Pop is an extensible animation engine for iOS, tvOS, and OS X. In addition to ba
 
 ## Installation
 
+### Swift Package Manager (only supported way)
+
+This fork has been modified to use pop as a Swift Package, the other following ways of installation are **no longer supported**. To use pop as a Swift package import the Package.swift file.
+
+### Cocoapods (deprecated)
+
 Pop is available on [CocoaPods](http://cocoapods.org). Just add the following to your project Podfile:
 
 ```ruby
@@ -18,14 +24,14 @@ Bugs are first fixed in master and then made available via a designated release.
 pod 'pop', :git => 'https://github.com/facebook/pop.git'
 ```
 
-### Framework (manual)
+### Framework (manual) (deprecated)
 By adding the project to your project and adding pop.embedded framework to the Embedded Binaries section on the General tab of your app's target, you can set up pop in seconds! This also enables `@import pop` syntax with header modules.
 
 **Note**: because of some awkward limitations with Xcode, embedded binaries must share the same name as the module and must have `.framework` as an extension. This means that you'll see three pop.frameworks when adding embedded binaries (one for OS X, one for tvOS, and one for iOS). You'll need to be sure to add the right one; they appear identically in the list but note the list is populated in order of targets. You can verify the correct one was chosen by checking the path next to the framework listed, in the format `<configuration>-<platform>` (e.g. `Debug-iphoneos`).
 
 ![Embedded Binaries](Images/EmbeddedBinaries.png?raw=true)
 
-**Note 2**: this method does not currently play nicely with workspaces. Since targets can only depend on and embed products from other targets in the same project, it only works when pop.xcodeproj is added as a subproject to the current target's project. Otherwise, you'll need to manually set the build ordering in the scheme and copy in the product.
+**Note 2**: this method does not currently play nicely with workspaces. Since targets can only depend on and embed products from other targets in the same project, it only works when pop.xcodeproj is added as a subproject to the current target's project. Otherwise, you'll need to manually set the build  (deprecated)ordering in the scheme and copy in the product.
 
 ### Static Library (manual)
 Alternatively, you can add the project to your workspace and adopt the provided configuration files or manually copy the files under the pop subdirectory into your project. If installing manually, ensure the C++ standard library is also linked by including `-lc++` to your project linker flags.

diff --git a/pop/POPAnimatableProperty.mm → Sources/pop/POPAnimatableProperty.mm b/pop/POPAnimatableProperty.mm → Sources/pop/POPAnimatableProperty.mm
diff --git a/pop/POPAnimation.mm → Sources/pop/POPAnimation.mm b/pop/POPAnimation.mm → Sources/pop/POPAnimation.mm
diff --git a/pop/POPAnimationEvent.mm → Sources/pop/POPAnimationEvent.mm b/pop/POPAnimationEvent.mm → Sources/pop/POPAnimationEvent.mm
diff --git a/pop/POPAnimationExtras.mm → Sources/pop/POPAnimationExtras.mm b/pop/POPAnimationExtras.mm → Sources/pop/POPAnimationExtras.mm
diff --git a/pop/POPAnimationRuntime.mm → Sources/pop/POPAnimationRuntime.mm b/pop/POPAnimationRuntime.mm → Sources/pop/POPAnimationRuntime.mm
diff --git a/pop/POPAnimationTracer.mm → Sources/pop/POPAnimationTracer.mm b/pop/POPAnimationTracer.mm → Sources/pop/POPAnimationTracer.mm
diff --git a/pop/POPAnimator.mm → Sources/pop/POPAnimator.mm b/pop/POPAnimator.mm → Sources/pop/POPAnimator.mm
@@ -529,7 +529,7 @@ - (void)_renderTime:(CFTimeInterval)time items:(std::list<POPAnimatorItemRef>)it
     pthread_mutex_unlock(&_lock);
   } else {
     // copy list into vector
-    std::vector<POPAnimatorItemRef> vector{ items.begin(), items.end() };
+    std::vector<POPAnimatorItemRef> vector(items.begin(), items.end());
 
     // unlock
     pthread_mutex_unlock(&_lock);
@@ -869,7 +869,7 @@ - (void)renderTime:(CFTimeInterval)time
 
 - (void)addObserver:(id<POPAnimatorObserving>)observer
 {
-  NSAssert(nil != observer, @"attempting to add nil %@ observer", self);
+  NSAssert1(nil != observer, @"attempting to add nil %@ observer", self);
   if (nil == observer) {
     return;
   }
@@ -891,7 +891,7 @@ - (void)addObserver:(id<POPAnimatorObserving>)observer
 
 - (void)removeObserver:(id<POPAnimatorObserving>)observer
 {
-  NSAssert(nil != observer, @"attempting to remove nil %@ observer", self);
+  NSAssert1(nil != observer, @"attempting to remove nil %@ observer", self);
   if (nil == observer) {
     return;
   }

diff --git a/pop/POPBasicAnimation.mm → Sources/pop/POPBasicAnimation.mm b/pop/POPBasicAnimation.mm → Sources/pop/POPBasicAnimation.mm
@@ -103,4 +103,4 @@ - (instancetype)copyWithZone:(NSZone *)zone {
   return copy;
 }
 
-@end
+@end
diff --git a/pop/POPCGUtils.mm → Sources/pop/POPCGUtils.mm b/pop/POPCGUtils.mm → Sources/pop/POPCGUtils.mm
diff --git a/pop/POPCustomAnimation.mm → Sources/pop/POPCustomAnimation.mm b/pop/POPCustomAnimation.mm → Sources/pop/POPCustomAnimation.mm
diff --git a/pop/POPDecayAnimation.mm → Sources/pop/POPDecayAnimation.mm b/pop/POPDecayAnimation.mm → Sources/pop/POPDecayAnimation.mm
diff --git a/pop/POPGeometry.mm → Sources/pop/POPGeometry.mm b/pop/POPGeometry.mm → Sources/pop/POPGeometry.mm
diff --git a/pop/POPLayerExtras.mm → Sources/pop/POPLayerExtras.mm b/pop/POPLayerExtras.mm → Sources/pop/POPLayerExtras.mm
diff --git a/pop/POPMath.mm → Sources/pop/POPMath.mm b/pop/POPMath.mm → Sources/pop/POPMath.mm
diff --git a/pop/POPPropertyAnimation.mm → Sources/pop/POPPropertyAnimation.mm b/pop/POPPropertyAnimation.mm → Sources/pop/POPPropertyAnimation.mm
diff --git a/pop/POPSpringAnimation.mm → Sources/pop/POPSpringAnimation.mm b/pop/POPSpringAnimation.mm → Sources/pop/POPSpringAnimation.mm
diff --git a/pop/POPVector.mm → Sources/pop/POPVector.mm b/pop/POPVector.mm → Sources/pop/POPVector.mm
@@ -116,7 +116,7 @@
 
     Vector *v = new Vector(count);
 
-    NSCAssert(count <= 4, @"unexpected count %lu", (unsigned long)count);
+    NSCAssert1(count <= 4, @"unexpected count %lu", (unsigned long)count);
     for (NSUInteger i = 0; i < MIN(count, (NSUInteger)4); i++) {
       v->_values[i] = vec[i];
     }
@@ -216,7 +216,7 @@
       return CGAffineTransformIdentity;
     }
 
-    NSCAssert(size() >= 6, @"unexpected vector size:%lu", (unsigned long)size());
+    NSCAssert1(size() >= 6, @"unexpected vector size:%lu", (unsigned long)size());
     CGAffineTransform t;
     t.a = _values[0];
     t.b = _values[1];

diff --git a/pop/WebCore/TransformationMatrix.cpp → Sources/pop/TransformationMatrix.cpp b/pop/WebCore/TransformationMatrix.cpp → Sources/pop/TransformationMatrix.cpp
diff --git a/pop/WebCore/FloatConversion.h → Sources/pop/include/FloatConversion.h b/pop/WebCore/FloatConversion.h → Sources/pop/include/FloatConversion.h
diff --git a/Sources/pop/include/POP.h b/Sources/pop/include/POP.h
@@ -0,0 +1,35 @@
+/**
+ Copyright (c) 2014-present, Facebook, Inc.
+ All rights reserved.
+ 
+ This source code is licensed under the BSD-style license found in the
+ LICENSE file in the root directory of this source tree. An additional grant
+ of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wstrict-prototypes"
+
+#ifndef POP_POP_H
+#define POP_POP_H
+
+#import "POPDefines.h"
+
+#import "POPAnimatableProperty.h"
+#import "POPAnimatablePropertyTypes.h"
+#import "POPAnimation.h"
+#import "POPAnimationEvent.h"
+#import "POPAnimationExtras.h"
+#import "POPAnimationTracer.h"
+#import "POPAnimator.h"
+#import "POPBasicAnimation.h"
+#import "POPCustomAnimation.h"
+#import "POPDecayAnimation.h"
+#import "POPGeometry.h"
+#import "POPLayerExtras.h"
+#import "POPPropertyAnimation.h"
+#import "POPSpringAnimation.h"
+
+#endif /* POP_POP_H */
+
+#pragma clang diagnostic pop
diff --git a/pop/POPAction.h → Sources/pop/include/POPAction.h b/pop/POPAction.h → Sources/pop/include/POPAction.h
@@ -12,7 +12,7 @@
 
 #import <QuartzCore/CATransaction.h>
 
-#import <pop/POPDefines.h>
+#import "POPDefines.h"
 
 #ifdef __cplusplus
 

diff --git a/pop/POPAnimatableProperty.h → Sources/pop/include/POPAnimatableProperty.h b/pop/POPAnimatableProperty.h → Sources/pop/include/POPAnimatableProperty.h
@@ -11,8 +11,8 @@
 
 #import <Foundation/NSObject.h>
 
-#import <pop/POPDefines.h>
-#import <pop/POPAnimatablePropertyTypes.h>
+#import "POPDefines.h"
+#import "POPAnimatablePropertyTypes.h"
 
 @class POPMutableAnimatableProperty;
 

diff --git a/pop/POPAnimatablePropertyTypes.h → .../pop/include/POPAnimatablePropertyTypes.h b/pop/POPAnimatablePropertyTypes.h → .../pop/include/POPAnimatablePropertyTypes.h
diff --git a/pop/POPAnimation.h → Sources/pop/include/POPAnimation.h b/pop/POPAnimation.h → Sources/pop/include/POPAnimation.h
@@ -9,8 +9,8 @@
 
 #import <Foundation/NSObject.h>
 
-#import <pop/POPAnimationTracer.h>
-#import <pop/POPGeometry.h>
+#import "POPAnimationTracer.h"
+#import "POPGeometry.h"
 
 @class CAMediaTimingFunction;
 

diff --git a/pop/POPAnimationEvent.h → Sources/pop/include/POPAnimationEvent.h b/pop/POPAnimationEvent.h → Sources/pop/include/POPAnimationEvent.h
diff --git a/pop/POPAnimationEventInternal.h → ...s/pop/include/POPAnimationEventInternal.h b/pop/POPAnimationEventInternal.h → ...s/pop/include/POPAnimationEventInternal.h
diff --git a/pop/POPAnimationExtras.h → Sources/pop/include/POPAnimationExtras.h b/pop/POPAnimationExtras.h → Sources/pop/include/POPAnimationExtras.h
@@ -9,8 +9,8 @@
 
 #import <QuartzCore/CAAnimation.h>
 
-#import <pop/POPDefines.h>
-#import <pop/POPSpringAnimation.h>
+#import "POPDefines.h"
+#import "POPSpringAnimation.h"
 
 /**
  @abstract The current drag coefficient.

diff --git a/pop/POPAnimationInternal.h → Sources/pop/include/POPAnimationInternal.h b/pop/POPAnimationInternal.h → Sources/pop/include/POPAnimationInternal.h
diff --git a/pop/POPAnimationPrivate.h → Sources/pop/include/POPAnimationPrivate.h b/pop/POPAnimationPrivate.h → Sources/pop/include/POPAnimationPrivate.h
@@ -7,7 +7,7 @@
  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <pop/POPAnimation.h>
+#import "POPAnimation.h"
 
 #define POP_ANIMATION_FRICTION_FOR_QC_FRICTION(qcFriction) (25.0 + (((qcFriction - 8.0) / 2.0) * (25.0 - 19.0)))
 #define POP_ANIMATION_TENSION_FOR_QC_TENSION(qcTension) (194.0 + (((qcTension - 30.0) / 50.0) * (375.0 - 194.0)))

diff --git a/pop/POPAnimationRuntime.h → Sources/pop/include/POPAnimationRuntime.h b/pop/POPAnimationRuntime.h → Sources/pop/include/POPAnimationRuntime.h
diff --git a/pop/POPAnimationTracer.h → Sources/pop/include/POPAnimationTracer.h b/pop/POPAnimationTracer.h → Sources/pop/include/POPAnimationTracer.h
@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <pop/POPAnimationEvent.h>
+#import "POPAnimationEvent.h"
 
 @class POPAnimation;
 

diff --git a/pop/POPAnimationTracerInternal.h → .../pop/include/POPAnimationTracerInternal.h b/pop/POPAnimationTracerInternal.h → .../pop/include/POPAnimationTracerInternal.h
@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <pop/POPAnimationTracer.h>
+#import "POPAnimationTracer.h"
 
 @interface POPAnimationTracer (Internal)
 

diff --git a/pop/POPAnimator.h → Sources/pop/include/POPAnimator.h b/pop/POPAnimator.h → Sources/pop/include/POPAnimator.h
diff --git a/pop/POPAnimatorPrivate.h → Sources/pop/include/POPAnimatorPrivate.h b/pop/POPAnimatorPrivate.h → Sources/pop/include/POPAnimatorPrivate.h
@@ -7,7 +7,7 @@
  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <pop/POPAnimator.h>
+#import "POPAnimator.h"
 
 @class POPAnimation;
 

diff --git a/pop/POPBasicAnimation.h → Sources/pop/include/POPBasicAnimation.h b/pop/POPBasicAnimation.h → Sources/pop/include/POPBasicAnimation.h
@@ -7,7 +7,7 @@
  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <pop/POPPropertyAnimation.h>
+#import "POPPropertyAnimation.h"
 
 /**
  @abstract A concrete basic animation class.

diff --git a/pop/POPBasicAnimationInternal.h → ...s/pop/include/POPBasicAnimationInternal.h b/pop/POPBasicAnimationInternal.h → ...s/pop/include/POPBasicAnimationInternal.h
@@ -30,21 +30,21 @@ static void interpolate(POPValueType valueType, NSUInteger count, const CGFloat
       POPInterpolateVector(count, outVec, fromVec, toVec, p);
       break;
     default:
-      NSCAssert(false, @"unhandled type %d", valueType);
+      NSCAssert1(false, @"unhandled type %d", valueType);
       break;
   }
 }
 
 struct _POPBasicAnimationState : _POPPropertyAnimationState
 {
   CAMediaTimingFunction *timingFunction;
-  double timingControlPoints[4];
+  double timingControlPoints[4] = {0.};
   CFTimeInterval duration;
   CFTimeInterval timeProgress;
 
   _POPBasicAnimationState(id __unsafe_unretained anim) : _POPPropertyAnimationState(anim),
   timingFunction(nil),
-  timingControlPoints{0.},
+  timingControlPoints(),
   duration(kPOPAnimationDurationDefault),
   timeProgress(0.)
   {

diff --git a/pop/POPCGUtils.h → Sources/pop/include/POPCGUtils.h b/pop/POPCGUtils.h → Sources/pop/include/POPCGUtils.h
diff --git a/pop/POPCustomAnimation.h → Sources/pop/include/POPCustomAnimation.h b/pop/POPCustomAnimation.h → Sources/pop/include/POPCustomAnimation.h
@@ -7,7 +7,7 @@
  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <pop/POPAnimation.h>
+#import "POPAnimation.h"
 
 @class POPCustomAnimation;
 

diff --git a/pop/POPDecayAnimation.h → Sources/pop/include/POPDecayAnimation.h b/pop/POPDecayAnimation.h → Sources/pop/include/POPDecayAnimation.h
@@ -7,7 +7,7 @@
  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <pop/POPPropertyAnimation.h>
+#import "POPPropertyAnimation.h"
 
 /**
  @abstract A concrete decay animation class.

diff --git a/pop/POPDecayAnimationInternal.h → ...s/pop/include/POPDecayAnimationInternal.h b/pop/POPDecayAnimationInternal.h → ...s/pop/include/POPDecayAnimationInternal.h
diff --git a/pop/POPDefines.h → Sources/pop/include/POPDefines.h b/pop/POPDefines.h → Sources/pop/include/POPDefines.h
diff --git a/pop/POPGeometry.h → Sources/pop/include/POPGeometry.h b/pop/POPGeometry.h → Sources/pop/include/POPGeometry.h
diff --git a/pop/POPLayerExtras.h → Sources/pop/include/POPLayerExtras.h b/pop/POPLayerExtras.h → Sources/pop/include/POPLayerExtras.h
@@ -9,7 +9,7 @@
 
 #import <QuartzCore/QuartzCore.h>
 
-#import <pop/POPDefines.h>
+#import "POPDefines.h"
 
 POP_EXTERN_C_BEGIN
 

diff --git a/pop/POPMath.h → Sources/pop/include/POPMath.h b/pop/POPMath.h → Sources/pop/include/POPMath.h
diff --git a/pop/POPPropertyAnimation.h → Sources/pop/include/POPPropertyAnimation.h b/pop/POPPropertyAnimation.h → Sources/pop/include/POPPropertyAnimation.h
@@ -7,8 +7,8 @@
  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <pop/POPAnimatableProperty.h>
-#import <pop/POPAnimation.h>
+#import "POPAnimatableProperty.h"
+#import "POPAnimation.h"
 
 /**
  @abstract Flags for clamping animation values.

diff --git a/pop/POPPropertyAnimationInternal.h → ...op/include/POPPropertyAnimationInternal.h b/pop/POPPropertyAnimationInternal.h → ...op/include/POPPropertyAnimationInternal.h
diff --git a/pop/POPSpringAnimation.h → Sources/pop/include/POPSpringAnimation.h b/pop/POPSpringAnimation.h → Sources/pop/include/POPSpringAnimation.h
@@ -7,7 +7,7 @@
  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <pop/POPPropertyAnimation.h>
+#import "POPPropertyAnimation.h"
 
 /**
  @abstract A concrete spring animation class.

diff --git a/pop/POPSpringAnimationInternal.h → .../pop/include/POPSpringAnimationInternal.h b/pop/POPSpringAnimationInternal.h → .../pop/include/POPSpringAnimationInternal.h
diff --git a/pop/POPSpringSolver.h → Sources/pop/include/POPSpringSolver.h b/pop/POPSpringSolver.h → Sources/pop/include/POPSpringSolver.h
@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <pop/POPVector.h>
+#import "POPVector.h"
 
 namespace POP {
 

diff --git a/pop/POPVector.h → Sources/pop/include/POPVector.h b/pop/POPVector.h → Sources/pop/include/POPVector.h
@@ -359,7 +359,7 @@ namespace POP {
 
     // operator overloads
     CGFloat &operator[](size_t i) const {
-      NSCAssert(size() > i, @"unexpected vector size:%lu", (unsigned long)size());
+      NSCAssert1(size() > i, @"unexpected vector size:%lu", (unsigned long)size());
       return _values[i];
     }
 

diff --git a/pop/WebCore/TransformationMatrix.h → Sources/pop/include/TransformationMatrix.h b/pop/WebCore/TransformationMatrix.h → Sources/pop/include/TransformationMatrix.h
diff --git a/pop/WebCore/UnitBezier.h → Sources/pop/include/UnitBezier.h b/pop/WebCore/UnitBezier.h → Sources/pop/include/UnitBezier.h
diff --git a/Sources/pop/include/module.modulemap b/Sources/pop/include/module.modulemap
@@ -0,0 +1,4 @@
+module pop {
+    header "POP.h"
+    export *
+}
diff --git a/pop-tests/POPAnimatable.h b/pop-tests/POPAnimatable.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,4 +103,4 @@ - (instancetype)copyWithZone:(NSZone *)zone { @@
       return copy;
     }
-    @end
+    @end