Skip to content

Commit

Permalink
Merge pull request #38 from mauricekraus/master
Browse files Browse the repository at this point in the history
This adds support for the Swift Package manager
  • Loading branch information
fassko authored Mar 6, 2020
2 parents 92462dc + beff9f4 commit 5bf45be
Show file tree
Hide file tree
Showing 12 changed files with 321 additions and 1 deletion.
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

105 changes: 105 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/RxAnimated-Package.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "RxAnimated"
BuildableName = "RxAnimated"
BlueprintName = "RxAnimated"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "RxCocoaRuntime"
BuildableName = "RxCocoaRuntime"
BlueprintName = "RxCocoaRuntime"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "RxAnimatedTests"
BuildableName = "RxAnimatedTests"
BlueprintName = "RxAnimatedTests"
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 = "RxAnimatedTests"
BuildableName = "RxAnimatedTests"
BlueprintName = "RxAnimatedTests"
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 = "RxAnimated"
BuildableName = "RxAnimated"
BlueprintName = "RxAnimated"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
77 changes: 77 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/RxAnimated.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "RxAnimated"
BuildableName = "RxAnimated"
BlueprintName = "RxAnimated"
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 = "RxAnimatedTests"
BuildableName = "RxAnimatedTests"
BlueprintName = "RxAnimatedTests"
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 = "RxAnimated"
BuildableName = "RxAnimated"
BlueprintName = "RxAnimated"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
67 changes: 67 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/RxCocoaRuntime.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "RxCocoaRuntime"
BuildableName = "RxCocoaRuntime"
BlueprintName = "RxCocoaRuntime"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</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 = "RxCocoaRuntime"
BuildableName = "RxCocoaRuntime"
BlueprintName = "RxCocoaRuntime"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
16 changes: 16 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"object": {
"pins": [
{
"package": "RxSwift",
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
"state": {
"branch": null,
"revision": "b3e888b4972d9bc76495dd74d30a8c7fad4b9395",
"version": "5.0.1"
}
}
]
},
"version": 1
}
32 changes: 32 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// swift-tools-version:5.1
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "RxAnimated",
platforms: [
.iOS(.v9),
.tvOS(.v10),
],
products: [
.library(
name: "RxAnimated",
targets: ["RxAnimated"]),
.library(name: "RxCocoaRuntime", targets: ["RxAnimated"]),
],
dependencies: [
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0")),
],
targets: [
.target(
name: "RxAnimated",
dependencies: [
"RxSwift",
"RxCocoa",
]),
.testTarget(
name: "RxAnimatedTests",
dependencies: ["RxAnimated","RxSwift",
"RxCocoa","RxTest", "RxBlocking"]),
])
2 changes: 1 addition & 1 deletion RxAnimated.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Pod::Spec.new do |s|
s.default_subspec = 'Core'

s.subspec 'Core' do |cs|
s.source_files = 'RxAnimated/Core/**/*'
s.source_files = 'Sources/RxAnimated/**/*'
end

# s.subspec 'Animations' do |cs|
Expand Down
Empty file removed RxAnimated/Core/.gitkeep
Empty file.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import RxSwift
import RxCocoa
import UIKit

/// custom direction enumeration
public enum FlipDirection {
Expand Down Expand Up @@ -48,6 +49,7 @@ extension AnimatedSink where Base: UIView {
}
}


extension AnimatedSink where Base: NSLayoutConstraint {
/// auto layout animations
public func layout(duration: TimeInterval) -> AnimatedSink<Base> {
Expand All @@ -57,3 +59,4 @@ extension AnimatedSink where Base: NSLayoutConstraint {
return AnimatedSink<Base>(base: self.base, type: type)
}
}

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import RxSwift
import RxCocoa
import UIKit

// MARK: - Reactive ext on UIView

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import RxSwift
import RxCocoa
import UIKit

public struct RxAnimated {
public static let areAnimationsEnabled = BehaviorRelay(value: true)
Expand Down Expand Up @@ -29,6 +30,7 @@ public enum RxAnimationType {
public struct AnimationType<Base> {
let type: RxAnimationType
let duration: TimeInterval

let options: UIView.AnimationOptions

let setup: ((UIView) -> Void)?
Expand Down Expand Up @@ -99,8 +101,11 @@ public struct AnimationType<Base> {
|| UIAccessibility.isReduceMotionEnabled
}
}

}



// MARK: - animated reactive extensions

extension Observable {
Expand Down
7 changes: 7 additions & 0 deletions Tests/RxAnimatedTests/XCTestManifests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import XCTest

#if !canImport(ObjectiveC)
public func allTests() -> [XCTestCaseEntry] {
return []
}
#endif

0 comments on commit 5bf45be

Please sign in to comment.