From 86367d7964453a59a7af1aca9c438ce6ddfb6283 Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 1 Feb 2020 17:13:46 +0900 Subject: [PATCH 01/14] Add RxSwift dependency with Carthage using submodule --- .gitmodules | 3 +++ Cartfile | 2 ++ Cartfile.resolved | 1 + Carthage/Checkouts/RxSwift | 1 + 4 files changed, 7 insertions(+) create mode 100644 .gitmodules create mode 100644 Cartfile create mode 100644 Cartfile.resolved create mode 160000 Carthage/Checkouts/RxSwift diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..293c9c4 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Carthage/Checkouts/RxSwift"] + path = Carthage/Checkouts/RxSwift + url = https://github.com/ReactiveX/RxSwift.git diff --git a/Cartfile b/Cartfile new file mode 100644 index 0000000..b871d33 --- /dev/null +++ b/Cartfile @@ -0,0 +1,2 @@ +github "ReactiveX/RxSwift" ~> 5.0 + diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 0000000..b751e3d --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1 @@ +github "ReactiveX/RxSwift" "5.0.1" diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift new file mode 160000 index 0000000..b3e888b --- /dev/null +++ b/Carthage/Checkouts/RxSwift @@ -0,0 +1 @@ +Subproject commit b3e888b4972d9bc76495dd74d30a8c7fad4b9395 From 69663df8db60b3040ba3c54494c5bd43efbb05fa Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 1 Feb 2020 12:48:56 +0900 Subject: [PATCH 02/14] Create new project with Xcode --- tmp/RxAnimated.xcodeproj/project.pbxproj | 330 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + tmp/RxAnimated/Info.plist | 22 ++ tmp/RxAnimated/RxAnimated.h | 19 + 5 files changed, 386 insertions(+) create mode 100644 tmp/RxAnimated.xcodeproj/project.pbxproj create mode 100644 tmp/RxAnimated.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 tmp/RxAnimated.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 tmp/RxAnimated/Info.plist create mode 100644 tmp/RxAnimated/RxAnimated.h diff --git a/tmp/RxAnimated.xcodeproj/project.pbxproj b/tmp/RxAnimated.xcodeproj/project.pbxproj new file mode 100644 index 0000000..b089ffc --- /dev/null +++ b/tmp/RxAnimated.xcodeproj/project.pbxproj @@ -0,0 +1,330 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 1ED86A8823E52B0200845373 /* RxAnimated.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ED86A8623E52B0200845373 /* RxAnimated.h */; settings = {ATTRIBUTES = (Public, ); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 1ED86A8323E52B0200845373 /* RxAnimated.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxAnimated.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1ED86A8623E52B0200845373 /* RxAnimated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxAnimated.h; sourceTree = ""; }; + 1ED86A8723E52B0200845373 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 1ED86A8023E52B0200845373 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 1ED86A7923E52B0200845373 = { + isa = PBXGroup; + children = ( + 1ED86A8523E52B0200845373 /* RxAnimated */, + 1ED86A8423E52B0200845373 /* Products */, + ); + sourceTree = ""; + }; + 1ED86A8423E52B0200845373 /* Products */ = { + isa = PBXGroup; + children = ( + 1ED86A8323E52B0200845373 /* RxAnimated.framework */, + ); + name = Products; + sourceTree = ""; + }; + 1ED86A8523E52B0200845373 /* RxAnimated */ = { + isa = PBXGroup; + children = ( + 1ED86A8623E52B0200845373 /* RxAnimated.h */, + 1ED86A8723E52B0200845373 /* Info.plist */, + ); + path = RxAnimated; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 1ED86A7E23E52B0200845373 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 1ED86A8823E52B0200845373 /* RxAnimated.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 1ED86A8223E52B0200845373 /* RxAnimated */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1ED86A8B23E52B0200845373 /* Build configuration list for PBXNativeTarget "RxAnimated" */; + buildPhases = ( + 1ED86A7E23E52B0200845373 /* Headers */, + 1ED86A7F23E52B0200845373 /* Sources */, + 1ED86A8023E52B0200845373 /* Frameworks */, + 1ED86A8123E52B0200845373 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = RxAnimated; + productName = RxAnimated; + productReference = 1ED86A8323E52B0200845373 /* RxAnimated.framework */; + productType = "com.apple.product-type.framework"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 1ED86A7A23E52B0200845373 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1130; + ORGANIZATIONNAME = RxSwiftCommunity; + TargetAttributes = { + 1ED86A8223E52B0200845373 = { + CreatedOnToolsVersion = 11.3.1; + }; + }; + }; + buildConfigurationList = 1ED86A7D23E52B0200845373 /* Build configuration list for PBXProject "RxAnimated" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 1ED86A7923E52B0200845373; + productRefGroup = 1ED86A8423E52B0200845373 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 1ED86A8223E52B0200845373 /* RxAnimated */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 1ED86A8123E52B0200845373 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 1ED86A7F23E52B0200845373 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 1ED86A8923E52B0200845373 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.2; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 1ED86A8A23E52B0200845373 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.2; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 1ED86A8C23E52B0200845373 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = RxAnimated/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxAnimated; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 1ED86A8D23E52B0200845373 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = RxAnimated/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxAnimated; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 1ED86A7D23E52B0200845373 /* Build configuration list for PBXProject "RxAnimated" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1ED86A8923E52B0200845373 /* Debug */, + 1ED86A8A23E52B0200845373 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 1ED86A8B23E52B0200845373 /* Build configuration list for PBXNativeTarget "RxAnimated" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1ED86A8C23E52B0200845373 /* Debug */, + 1ED86A8D23E52B0200845373 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 1ED86A7A23E52B0200845373 /* Project object */; +} diff --git a/tmp/RxAnimated.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tmp/RxAnimated.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..0caf68c --- /dev/null +++ b/tmp/RxAnimated.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/tmp/RxAnimated.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/tmp/RxAnimated.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/tmp/RxAnimated.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/tmp/RxAnimated/Info.plist b/tmp/RxAnimated/Info.plist new file mode 100644 index 0000000..9bcb244 --- /dev/null +++ b/tmp/RxAnimated/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + diff --git a/tmp/RxAnimated/RxAnimated.h b/tmp/RxAnimated/RxAnimated.h new file mode 100644 index 0000000..a425b51 --- /dev/null +++ b/tmp/RxAnimated/RxAnimated.h @@ -0,0 +1,19 @@ +// +// RxAnimated.h +// RxAnimated +// +// Created by mickamy on 2020/02/01. +// Copyright © 2020 RxSwiftCommunity. All rights reserved. +// + +#import + +//! Project version number for RxAnimated. +FOUNDATION_EXPORT double RxAnimatedVersionNumber; + +//! Project version string for RxAnimated. +FOUNDATION_EXPORT const unsigned char RxAnimatedVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + From 130f60e28939a3851615b77799b28a64ab86cc49 Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 1 Feb 2020 12:50:38 +0900 Subject: [PATCH 03/14] Move RxAnimated/Core to new project dir and add it to the project --- tmp/RxAnimated.xcodeproj/project.pbxproj | 24 +++++++++++++++++++ {RxAnimated => tmp/RxAnimated}/Core/.gitkeep | 0 .../Core/RxAnimated+animations.swift | 0 .../Core/RxAnimated+bindings.swift | 0 .../RxAnimated}/Core/RxAnimated.swift | 0 5 files changed, 24 insertions(+) rename {RxAnimated => tmp/RxAnimated}/Core/.gitkeep (100%) rename {RxAnimated => tmp/RxAnimated}/Core/RxAnimated+animations.swift (100%) rename {RxAnimated => tmp/RxAnimated}/Core/RxAnimated+bindings.swift (100%) rename {RxAnimated => tmp/RxAnimated}/Core/RxAnimated.swift (100%) diff --git a/tmp/RxAnimated.xcodeproj/project.pbxproj b/tmp/RxAnimated.xcodeproj/project.pbxproj index b089ffc..fb89fe1 100644 --- a/tmp/RxAnimated.xcodeproj/project.pbxproj +++ b/tmp/RxAnimated.xcodeproj/project.pbxproj @@ -8,12 +8,20 @@ /* Begin PBXBuildFile section */ 1ED86A8823E52B0200845373 /* RxAnimated.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ED86A8623E52B0200845373 /* RxAnimated.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1ED86A9323E52CCD00845373 /* RxAnimated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED86A8F23E52CCD00845373 /* RxAnimated.swift */; }; + 1ED86A9423E52CCD00845373 /* .gitkeep in Resources */ = {isa = PBXBuildFile; fileRef = 1ED86A9023E52CCD00845373 /* .gitkeep */; }; + 1ED86A9523E52CCD00845373 /* RxAnimated+bindings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED86A9123E52CCD00845373 /* RxAnimated+bindings.swift */; }; + 1ED86A9623E52CCD00845373 /* RxAnimated+animations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED86A9223E52CCD00845373 /* RxAnimated+animations.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 1ED86A8323E52B0200845373 /* RxAnimated.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxAnimated.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1ED86A8623E52B0200845373 /* RxAnimated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxAnimated.h; sourceTree = ""; }; 1ED86A8723E52B0200845373 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 1ED86A8F23E52CCD00845373 /* RxAnimated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxAnimated.swift; sourceTree = ""; }; + 1ED86A9023E52CCD00845373 /* .gitkeep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitkeep; sourceTree = ""; }; + 1ED86A9123E52CCD00845373 /* RxAnimated+bindings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RxAnimated+bindings.swift"; sourceTree = ""; }; + 1ED86A9223E52CCD00845373 /* RxAnimated+animations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RxAnimated+animations.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -46,12 +54,24 @@ 1ED86A8523E52B0200845373 /* RxAnimated */ = { isa = PBXGroup; children = ( + 1ED86A8E23E52CCD00845373 /* Core */, 1ED86A8623E52B0200845373 /* RxAnimated.h */, 1ED86A8723E52B0200845373 /* Info.plist */, ); path = RxAnimated; sourceTree = ""; }; + 1ED86A8E23E52CCD00845373 /* Core */ = { + isa = PBXGroup; + children = ( + 1ED86A8F23E52CCD00845373 /* RxAnimated.swift */, + 1ED86A9023E52CCD00845373 /* .gitkeep */, + 1ED86A9123E52CCD00845373 /* RxAnimated+bindings.swift */, + 1ED86A9223E52CCD00845373 /* RxAnimated+animations.swift */, + ); + path = Core; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -121,6 +141,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 1ED86A9423E52CCD00845373 /* .gitkeep in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -131,6 +152,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 1ED86A9523E52CCD00845373 /* RxAnimated+bindings.swift in Sources */, + 1ED86A9623E52CCD00845373 /* RxAnimated+animations.swift in Sources */, + 1ED86A9323E52CCD00845373 /* RxAnimated.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/RxAnimated/Core/.gitkeep b/tmp/RxAnimated/Core/.gitkeep similarity index 100% rename from RxAnimated/Core/.gitkeep rename to tmp/RxAnimated/Core/.gitkeep diff --git a/RxAnimated/Core/RxAnimated+animations.swift b/tmp/RxAnimated/Core/RxAnimated+animations.swift similarity index 100% rename from RxAnimated/Core/RxAnimated+animations.swift rename to tmp/RxAnimated/Core/RxAnimated+animations.swift diff --git a/RxAnimated/Core/RxAnimated+bindings.swift b/tmp/RxAnimated/Core/RxAnimated+bindings.swift similarity index 100% rename from RxAnimated/Core/RxAnimated+bindings.swift rename to tmp/RxAnimated/Core/RxAnimated+bindings.swift diff --git a/RxAnimated/Core/RxAnimated.swift b/tmp/RxAnimated/Core/RxAnimated.swift similarity index 100% rename from RxAnimated/Core/RxAnimated.swift rename to tmp/RxAnimated/Core/RxAnimated.swift From e23a28dcdf655f8f04ba2f2aa5a9bfb7e9fcc3ab Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 1 Feb 2020 12:52:15 +0900 Subject: [PATCH 04/14] Move files under tmp/ to root --- .../RxAnimated.xcodeproj => RxAnimated.xcodeproj}/project.pbxproj | 0 .../project.xcworkspace/contents.xcworkspacedata | 0 .../project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist | 0 {tmp/RxAnimated => RxAnimated}/Core/.gitkeep | 0 {tmp/RxAnimated => RxAnimated}/Core/RxAnimated+animations.swift | 0 {tmp/RxAnimated => RxAnimated}/Core/RxAnimated+bindings.swift | 0 {tmp/RxAnimated => RxAnimated}/Core/RxAnimated.swift | 0 {tmp/RxAnimated => RxAnimated}/Info.plist | 0 {tmp/RxAnimated => RxAnimated}/RxAnimated.h | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename {tmp/RxAnimated.xcodeproj => RxAnimated.xcodeproj}/project.pbxproj (100%) rename {tmp/RxAnimated.xcodeproj => RxAnimated.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (100%) rename {tmp/RxAnimated.xcodeproj => RxAnimated.xcodeproj}/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {tmp/RxAnimated => RxAnimated}/Core/.gitkeep (100%) rename {tmp/RxAnimated => RxAnimated}/Core/RxAnimated+animations.swift (100%) rename {tmp/RxAnimated => RxAnimated}/Core/RxAnimated+bindings.swift (100%) rename {tmp/RxAnimated => RxAnimated}/Core/RxAnimated.swift (100%) rename {tmp/RxAnimated => RxAnimated}/Info.plist (100%) rename {tmp/RxAnimated => RxAnimated}/RxAnimated.h (100%) diff --git a/tmp/RxAnimated.xcodeproj/project.pbxproj b/RxAnimated.xcodeproj/project.pbxproj similarity index 100% rename from tmp/RxAnimated.xcodeproj/project.pbxproj rename to RxAnimated.xcodeproj/project.pbxproj diff --git a/tmp/RxAnimated.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/RxAnimated.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from tmp/RxAnimated.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to RxAnimated.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/tmp/RxAnimated.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/RxAnimated.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from tmp/RxAnimated.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to RxAnimated.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/tmp/RxAnimated/Core/.gitkeep b/RxAnimated/Core/.gitkeep similarity index 100% rename from tmp/RxAnimated/Core/.gitkeep rename to RxAnimated/Core/.gitkeep diff --git a/tmp/RxAnimated/Core/RxAnimated+animations.swift b/RxAnimated/Core/RxAnimated+animations.swift similarity index 100% rename from tmp/RxAnimated/Core/RxAnimated+animations.swift rename to RxAnimated/Core/RxAnimated+animations.swift diff --git a/tmp/RxAnimated/Core/RxAnimated+bindings.swift b/RxAnimated/Core/RxAnimated+bindings.swift similarity index 100% rename from tmp/RxAnimated/Core/RxAnimated+bindings.swift rename to RxAnimated/Core/RxAnimated+bindings.swift diff --git a/tmp/RxAnimated/Core/RxAnimated.swift b/RxAnimated/Core/RxAnimated.swift similarity index 100% rename from tmp/RxAnimated/Core/RxAnimated.swift rename to RxAnimated/Core/RxAnimated.swift diff --git a/tmp/RxAnimated/Info.plist b/RxAnimated/Info.plist similarity index 100% rename from tmp/RxAnimated/Info.plist rename to RxAnimated/Info.plist diff --git a/tmp/RxAnimated/RxAnimated.h b/RxAnimated/RxAnimated.h similarity index 100% rename from tmp/RxAnimated/RxAnimated.h rename to RxAnimated/RxAnimated.h From d6f4901823354edf576c7f3a0ab9ed1730878f86 Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 1 Feb 2020 16:30:34 +0900 Subject: [PATCH 05/14] Remove .gitkeep file --- RxAnimated.xcodeproj/project.pbxproj | 4 ---- RxAnimated/Core/.gitkeep | 0 2 files changed, 4 deletions(-) delete mode 100644 RxAnimated/Core/.gitkeep diff --git a/RxAnimated.xcodeproj/project.pbxproj b/RxAnimated.xcodeproj/project.pbxproj index fb89fe1..40afbbf 100644 --- a/RxAnimated.xcodeproj/project.pbxproj +++ b/RxAnimated.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 1ED86A8823E52B0200845373 /* RxAnimated.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ED86A8623E52B0200845373 /* RxAnimated.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1ED86A9323E52CCD00845373 /* RxAnimated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED86A8F23E52CCD00845373 /* RxAnimated.swift */; }; - 1ED86A9423E52CCD00845373 /* .gitkeep in Resources */ = {isa = PBXBuildFile; fileRef = 1ED86A9023E52CCD00845373 /* .gitkeep */; }; 1ED86A9523E52CCD00845373 /* RxAnimated+bindings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED86A9123E52CCD00845373 /* RxAnimated+bindings.swift */; }; 1ED86A9623E52CCD00845373 /* RxAnimated+animations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED86A9223E52CCD00845373 /* RxAnimated+animations.swift */; }; /* End PBXBuildFile section */ @@ -19,7 +18,6 @@ 1ED86A8623E52B0200845373 /* RxAnimated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxAnimated.h; sourceTree = ""; }; 1ED86A8723E52B0200845373 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 1ED86A8F23E52CCD00845373 /* RxAnimated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxAnimated.swift; sourceTree = ""; }; - 1ED86A9023E52CCD00845373 /* .gitkeep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitkeep; sourceTree = ""; }; 1ED86A9123E52CCD00845373 /* RxAnimated+bindings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RxAnimated+bindings.swift"; sourceTree = ""; }; 1ED86A9223E52CCD00845373 /* RxAnimated+animations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RxAnimated+animations.swift"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -65,7 +63,6 @@ isa = PBXGroup; children = ( 1ED86A8F23E52CCD00845373 /* RxAnimated.swift */, - 1ED86A9023E52CCD00845373 /* .gitkeep */, 1ED86A9123E52CCD00845373 /* RxAnimated+bindings.swift */, 1ED86A9223E52CCD00845373 /* RxAnimated+animations.swift */, ); @@ -141,7 +138,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1ED86A9423E52CCD00845373 /* .gitkeep in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/RxAnimated/Core/.gitkeep b/RxAnimated/Core/.gitkeep deleted file mode 100644 index e69de29..0000000 From 6d19b7bd4fb5578b33d2fa28b3e5e228806803b9 Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 1 Feb 2020 16:30:49 +0900 Subject: [PATCH 06/14] Do not support mac catalyst --- RxAnimated.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RxAnimated.xcodeproj/project.pbxproj b/RxAnimated.xcodeproj/project.pbxproj index 40afbbf..98b970a 100644 --- a/RxAnimated.xcodeproj/project.pbxproj +++ b/RxAnimated.xcodeproj/project.pbxproj @@ -295,6 +295,7 @@ PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxAnimated; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; + SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -318,6 +319,7 @@ PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxAnimated; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; + SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; From 3733939cb2e94425e6c40b17d923f41fbe58c306 Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 1 Feb 2020 16:35:05 +0900 Subject: [PATCH 07/14] Add Rx.xcodeproj and link required frameworks to RxAnimated target --- RxAnimated.xcodeproj/project.pbxproj | 184 +++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/RxAnimated.xcodeproj/project.pbxproj b/RxAnimated.xcodeproj/project.pbxproj index 98b970a..aae4036 100644 --- a/RxAnimated.xcodeproj/project.pbxproj +++ b/RxAnimated.xcodeproj/project.pbxproj @@ -11,8 +11,83 @@ 1ED86A9323E52CCD00845373 /* RxAnimated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED86A8F23E52CCD00845373 /* RxAnimated.swift */; }; 1ED86A9523E52CCD00845373 /* RxAnimated+bindings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED86A9123E52CCD00845373 /* RxAnimated+bindings.swift */; }; 1ED86A9623E52CCD00845373 /* RxAnimated+animations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED86A9223E52CCD00845373 /* RxAnimated+animations.swift */; }; + 1EEBCC1C23E560F20034B6CF /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EEBCC0A23E560D30034B6CF /* RxCocoa.framework */; }; + 1EEBCC1E23E560F20034B6CF /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EEBCC0823E560D30034B6CF /* RxSwift.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 1EEBCC0723E560D30034B6CF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C8A56AD71AD7424700B4673B; + remoteInfo = RxSwift; + }; + 1EEBCC0923E560D30034B6CF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C809396D1B8A71760088E94D; + remoteInfo = RxCocoa; + }; + 1EEBCC0B23E560D30034B6CF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A2897D53225CA1E7004EA481; + remoteInfo = RxRelay; + }; + 1EEBCC0D23E560D30034B6CF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C8093BC71B8A71F00088E94D; + remoteInfo = RxBlocking; + }; + 1EEBCC0F23E560D30034B6CF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C88FA50C1C25C44800CCFEA4; + remoteInfo = RxTest; + }; + 1EEBCC1123E560D30034B6CF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C83508C31C386F6F0027C24C; + remoteInfo = "AllTests-iOS"; + }; + 1EEBCC1323E560D30034B6CF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C83509841C38740E0027C24C; + remoteInfo = "AllTests-tvOS"; + }; + 1EEBCC1523E560D30034B6CF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C83509941C38742C0027C24C; + remoteInfo = "AllTests-macOS"; + }; + 1EEBCC1723E560D30034B6CF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C85BA04B1C3878740075D68E; + remoteInfo = Microoptimizations; + }; + 1EEBCC1923E560D30034B6CF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C8E8BA551E2C181A00A4AC2C; + remoteInfo = Benchmarks; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 1ED86A8323E52B0200845373 /* RxAnimated.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxAnimated.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1ED86A8623E52B0200845373 /* RxAnimated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxAnimated.h; sourceTree = ""; }; @@ -20,6 +95,7 @@ 1ED86A8F23E52CCD00845373 /* RxAnimated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxAnimated.swift; sourceTree = ""; }; 1ED86A9123E52CCD00845373 /* RxAnimated+bindings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RxAnimated+bindings.swift"; sourceTree = ""; }; 1ED86A9223E52CCD00845373 /* RxAnimated+animations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RxAnimated+animations.swift"; sourceTree = ""; }; + 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Rx.xcodeproj; path = Carthage/Checkouts/RxSwift/Rx.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -27,6 +103,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 1EEBCC1E23E560F20034B6CF /* RxSwift.framework in Frameworks */, + 1EEBCC1C23E560F20034B6CF /* RxCocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -38,6 +116,8 @@ children = ( 1ED86A8523E52B0200845373 /* RxAnimated */, 1ED86A8423E52B0200845373 /* Products */, + 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */, + 1EEBCC1B23E560F20034B6CF /* Frameworks */, ); sourceTree = ""; }; @@ -69,6 +149,30 @@ path = Core; sourceTree = ""; }; + 1EEBCBFB23E560D30034B6CF /* Products */ = { + isa = PBXGroup; + children = ( + 1EEBCC0823E560D30034B6CF /* RxSwift.framework */, + 1EEBCC0A23E560D30034B6CF /* RxCocoa.framework */, + 1EEBCC0C23E560D30034B6CF /* RxRelay.framework */, + 1EEBCC0E23E560D30034B6CF /* RxBlocking.framework */, + 1EEBCC1023E560D30034B6CF /* RxTest.framework */, + 1EEBCC1223E560D30034B6CF /* AllTests-iOS.xctest */, + 1EEBCC1423E560D30034B6CF /* AllTests-tvOS.xctest */, + 1EEBCC1623E560D30034B6CF /* AllTests-macOS.xctest */, + 1EEBCC1823E560D30034B6CF /* PerformanceTests.app */, + 1EEBCC1A23E560D30034B6CF /* Benchmarks.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 1EEBCC1B23E560F20034B6CF /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -126,6 +230,12 @@ mainGroup = 1ED86A7923E52B0200845373; productRefGroup = 1ED86A8423E52B0200845373 /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 1EEBCBFB23E560D30034B6CF /* Products */; + ProjectRef = 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */; + }, + ); projectRoot = ""; targets = ( 1ED86A8223E52B0200845373 /* RxAnimated */, @@ -133,6 +243,80 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 1EEBCC0823E560D30034B6CF /* RxSwift.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = RxSwift.framework; + remoteRef = 1EEBCC0723E560D30034B6CF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1EEBCC0A23E560D30034B6CF /* RxCocoa.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = RxCocoa.framework; + remoteRef = 1EEBCC0923E560D30034B6CF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1EEBCC0C23E560D30034B6CF /* RxRelay.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = RxRelay.framework; + remoteRef = 1EEBCC0B23E560D30034B6CF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1EEBCC0E23E560D30034B6CF /* RxBlocking.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = RxBlocking.framework; + remoteRef = 1EEBCC0D23E560D30034B6CF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1EEBCC1023E560D30034B6CF /* RxTest.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = RxTest.framework; + remoteRef = 1EEBCC0F23E560D30034B6CF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1EEBCC1223E560D30034B6CF /* AllTests-iOS.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "AllTests-iOS.xctest"; + remoteRef = 1EEBCC1123E560D30034B6CF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1EEBCC1423E560D30034B6CF /* AllTests-tvOS.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "AllTests-tvOS.xctest"; + remoteRef = 1EEBCC1323E560D30034B6CF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1EEBCC1623E560D30034B6CF /* AllTests-macOS.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "AllTests-macOS.xctest"; + remoteRef = 1EEBCC1523E560D30034B6CF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1EEBCC1823E560D30034B6CF /* PerformanceTests.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + name = PerformanceTests.app; + path = Microoptimizations.app; + remoteRef = 1EEBCC1723E560D30034B6CF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1EEBCC1A23E560D30034B6CF /* Benchmarks.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = Benchmarks.xctest; + remoteRef = 1EEBCC1923E560D30034B6CF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 1ED86A8123E52B0200845373 /* Resources */ = { isa = PBXResourcesBuildPhase; From 0ea2c34b2d12520ffceae4ec8517df198c7e8c1f Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 1 Feb 2020 16:35:17 +0900 Subject: [PATCH 08/14] Import UIKit instead of Foundation --- RxAnimated/RxAnimated.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RxAnimated/RxAnimated.h b/RxAnimated/RxAnimated.h index a425b51..d807c82 100644 --- a/RxAnimated/RxAnimated.h +++ b/RxAnimated/RxAnimated.h @@ -6,7 +6,7 @@ // Copyright © 2020 RxSwiftCommunity. All rights reserved. // -#import +#import //! Project version number for RxAnimated. FOUNDATION_EXPORT double RxAnimatedVersionNumber; From dd5652da115588e7cfec9de1f2b702860d972973 Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 1 Feb 2020 16:37:11 +0900 Subject: [PATCH 09/14] Support iOS 11.0~ --- RxAnimated.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RxAnimated.xcodeproj/project.pbxproj b/RxAnimated.xcodeproj/project.pbxproj index aae4036..5bcc63d 100644 --- a/RxAnimated.xcodeproj/project.pbxproj +++ b/RxAnimated.xcodeproj/project.pbxproj @@ -471,6 +471,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = RxAnimated/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -495,6 +496,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = RxAnimated/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", From 5668f0ba510ad614706e3c6164bd0d862e7fe1e1 Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 1 Feb 2020 16:38:32 +0900 Subject: [PATCH 10/14] Add tvOS support --- RxAnimated.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RxAnimated.xcodeproj/project.pbxproj b/RxAnimated.xcodeproj/project.pbxproj index 5bcc63d..ed26a76 100644 --- a/RxAnimated.xcodeproj/project.pbxproj +++ b/RxAnimated.xcodeproj/project.pbxproj @@ -479,7 +479,9 @@ ); PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxAnimated; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos"; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -504,7 +506,9 @@ ); PRODUCT_BUNDLE_IDENTIFIER = io.rx.RxAnimated; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos"; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; From 1a23eba6930598679c88174c531141f7310a74dc Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 1 Feb 2020 17:05:04 +0900 Subject: [PATCH 11/14] Make scheme to be shared --- .../xcschemes/RxAnimated.xcscheme | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 RxAnimated.xcodeproj/xcshareddata/xcschemes/RxAnimated.xcscheme diff --git a/RxAnimated.xcodeproj/xcshareddata/xcschemes/RxAnimated.xcscheme b/RxAnimated.xcodeproj/xcshareddata/xcschemes/RxAnimated.xcscheme new file mode 100644 index 0000000..b209c83 --- /dev/null +++ b/RxAnimated.xcodeproj/xcshareddata/xcschemes/RxAnimated.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9d2cc89011cb94dfb38f5e2564436ad506c4ff48 Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 11 Apr 2020 20:13:19 +0900 Subject: [PATCH 12/14] Revisit source file location --- RxAnimated.xcodeproj/project.pbxproj | 60 +++++++++---------- {RxAnimated => Sources/RxAnimated}/Info.plist | 0 .../RxAnimated}/RxAnimated.h | 0 3 files changed, 30 insertions(+), 30 deletions(-) rename {RxAnimated => Sources/RxAnimated}/Info.plist (100%) rename {RxAnimated => Sources/RxAnimated}/RxAnimated.h (100%) diff --git a/RxAnimated.xcodeproj/project.pbxproj b/RxAnimated.xcodeproj/project.pbxproj index ed26a76..02fb0eb 100644 --- a/RxAnimated.xcodeproj/project.pbxproj +++ b/RxAnimated.xcodeproj/project.pbxproj @@ -8,11 +8,11 @@ /* Begin PBXBuildFile section */ 1ED86A8823E52B0200845373 /* RxAnimated.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ED86A8623E52B0200845373 /* RxAnimated.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1ED86A9323E52CCD00845373 /* RxAnimated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED86A8F23E52CCD00845373 /* RxAnimated.swift */; }; - 1ED86A9523E52CCD00845373 /* RxAnimated+bindings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED86A9123E52CCD00845373 /* RxAnimated+bindings.swift */; }; - 1ED86A9623E52CCD00845373 /* RxAnimated+animations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED86A9223E52CCD00845373 /* RxAnimated+animations.swift */; }; 1EEBCC1C23E560F20034B6CF /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EEBCC0A23E560D30034B6CF /* RxCocoa.framework */; }; 1EEBCC1E23E560F20034B6CF /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EEBCC0823E560D30034B6CF /* RxSwift.framework */; }; + 1EF378962441DD7E006BF7C9 /* RxAnimated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EF378932441DD7E006BF7C9 /* RxAnimated.swift */; }; + 1EF378972441DD7E006BF7C9 /* RxAnimated+bindings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EF378942441DD7E006BF7C9 /* RxAnimated+bindings.swift */; }; + 1EF378982441DD7E006BF7C9 /* RxAnimated+animations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EF378952441DD7E006BF7C9 /* RxAnimated+animations.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -92,10 +92,10 @@ 1ED86A8323E52B0200845373 /* RxAnimated.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxAnimated.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1ED86A8623E52B0200845373 /* RxAnimated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxAnimated.h; sourceTree = ""; }; 1ED86A8723E52B0200845373 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 1ED86A8F23E52CCD00845373 /* RxAnimated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxAnimated.swift; sourceTree = ""; }; - 1ED86A9123E52CCD00845373 /* RxAnimated+bindings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RxAnimated+bindings.swift"; sourceTree = ""; }; - 1ED86A9223E52CCD00845373 /* RxAnimated+animations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RxAnimated+animations.swift"; sourceTree = ""; }; 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Rx.xcodeproj; path = Carthage/Checkouts/RxSwift/Rx.xcodeproj; sourceTree = ""; }; + 1EF378932441DD7E006BF7C9 /* RxAnimated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxAnimated.swift; sourceTree = ""; }; + 1EF378942441DD7E006BF7C9 /* RxAnimated+bindings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RxAnimated+bindings.swift"; sourceTree = ""; }; + 1EF378952441DD7E006BF7C9 /* RxAnimated+animations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RxAnimated+animations.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -114,7 +114,7 @@ 1ED86A7923E52B0200845373 = { isa = PBXGroup; children = ( - 1ED86A8523E52B0200845373 /* RxAnimated */, + 1EF378912441DD7E006BF7C9 /* Sources */, 1ED86A8423E52B0200845373 /* Products */, 1EEBCBFA23E560D30034B6CF /* Rx.xcodeproj */, 1EEBCC1B23E560F20034B6CF /* Frameworks */, @@ -129,26 +129,6 @@ name = Products; sourceTree = ""; }; - 1ED86A8523E52B0200845373 /* RxAnimated */ = { - isa = PBXGroup; - children = ( - 1ED86A8E23E52CCD00845373 /* Core */, - 1ED86A8623E52B0200845373 /* RxAnimated.h */, - 1ED86A8723E52B0200845373 /* Info.plist */, - ); - path = RxAnimated; - sourceTree = ""; - }; - 1ED86A8E23E52CCD00845373 /* Core */ = { - isa = PBXGroup; - children = ( - 1ED86A8F23E52CCD00845373 /* RxAnimated.swift */, - 1ED86A9123E52CCD00845373 /* RxAnimated+bindings.swift */, - 1ED86A9223E52CCD00845373 /* RxAnimated+animations.swift */, - ); - path = Core; - sourceTree = ""; - }; 1EEBCBFB23E560D30034B6CF /* Products */ = { isa = PBXGroup; children = ( @@ -173,6 +153,26 @@ name = Frameworks; sourceTree = ""; }; + 1EF378912441DD7E006BF7C9 /* Sources */ = { + isa = PBXGroup; + children = ( + 1EF378922441DD7E006BF7C9 /* RxAnimated */, + ); + path = Sources; + sourceTree = ""; + }; + 1EF378922441DD7E006BF7C9 /* RxAnimated */ = { + isa = PBXGroup; + children = ( + 1ED86A8623E52B0200845373 /* RxAnimated.h */, + 1ED86A8723E52B0200845373 /* Info.plist */, + 1EF378932441DD7E006BF7C9 /* RxAnimated.swift */, + 1EF378942441DD7E006BF7C9 /* RxAnimated+bindings.swift */, + 1EF378952441DD7E006BF7C9 /* RxAnimated+animations.swift */, + ); + path = RxAnimated; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -332,9 +332,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1ED86A9523E52CCD00845373 /* RxAnimated+bindings.swift in Sources */, - 1ED86A9623E52CCD00845373 /* RxAnimated+animations.swift in Sources */, - 1ED86A9323E52CCD00845373 /* RxAnimated.swift in Sources */, + 1EF378972441DD7E006BF7C9 /* RxAnimated+bindings.swift in Sources */, + 1EF378982441DD7E006BF7C9 /* RxAnimated+animations.swift in Sources */, + 1EF378962441DD7E006BF7C9 /* RxAnimated.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/RxAnimated/Info.plist b/Sources/RxAnimated/Info.plist similarity index 100% rename from RxAnimated/Info.plist rename to Sources/RxAnimated/Info.plist diff --git a/RxAnimated/RxAnimated.h b/Sources/RxAnimated/RxAnimated.h similarity index 100% rename from RxAnimated/RxAnimated.h rename to Sources/RxAnimated/RxAnimated.h From 17a2dd3f97c268a46214cb0fdc882c6e56ac264e Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 11 Apr 2020 20:52:16 +0900 Subject: [PATCH 13/14] Bump RxSwift version --- Cartfile.resolved | 2 +- Carthage/Checkouts/RxSwift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index b751e3d..ec14f25 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "ReactiveX/RxSwift" "5.0.1" +github "ReactiveX/RxSwift" "5.1.1" diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift index b3e888b..002d325 160000 --- a/Carthage/Checkouts/RxSwift +++ b/Carthage/Checkouts/RxSwift @@ -1 +1 @@ -Subproject commit b3e888b4972d9bc76495dd74d30a8c7fad4b9395 +Subproject commit 002d325b0bdee94e7882e1114af5ff4fe1e96afa From 969dabaa841aade48e9eb44b95aecce9d7ed7bf2 Mon Sep 17 00:00:00 2001 From: mickamy Date: Sat, 11 Apr 2020 20:53:46 +0900 Subject: [PATCH 14/14] Fix path to Info.plist file --- RxAnimated.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RxAnimated.xcodeproj/project.pbxproj b/RxAnimated.xcodeproj/project.pbxproj index 02fb0eb..9d9d49a 100644 --- a/RxAnimated.xcodeproj/project.pbxproj +++ b/RxAnimated.xcodeproj/project.pbxproj @@ -469,7 +469,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = RxAnimated/Info.plist; + INFOPLIST_FILE = Sources/RxAnimated/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -496,7 +496,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = RxAnimated/Info.plist; + INFOPLIST_FILE = Sources/RxAnimated/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = (