From bed66a5c2f08fc11de6dc0d97af95a84fdb640d4 Mon Sep 17 00:00:00 2001 From: iko Date: Sat, 25 May 2019 02:18:32 +0300 Subject: [PATCH] Made it build --- PixelImage.xcodeproj/project.pbxproj | 30 ++++++++++------------------ PixelImage/SwiftSugar/Numeric.swift | 9 +-------- Podfile.lock | 4 ++-- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/PixelImage.xcodeproj/project.pbxproj b/PixelImage.xcodeproj/project.pbxproj index 1d4fbb0..871d0cb 100644 --- a/PixelImage.xcodeproj/project.pbxproj +++ b/PixelImage.xcodeproj/project.pbxproj @@ -144,7 +144,6 @@ 242686811C63B72A00D62456 /* Frameworks */, 242686821C63B72A00D62456 /* Resources */, 3CA888DC160972BAEB74EC52 /* [CP] Embed Pods Frameworks */, - 47F9F13E3CB75C7B4B0136A5 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -167,7 +166,7 @@ TargetAttributes = { 242686831C63B72A00D62456 = { CreatedOnToolsVersion = 7.2; - DevelopmentTeam = HHT774898M; + DevelopmentTeam = 8J63JZYYHZ; LastSwiftMigration = 0830; }; }; @@ -210,13 +209,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-PixelImage-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 3CA888DC160972BAEB74EC52 /* [CP] Embed Pods Frameworks */ = { @@ -225,30 +227,18 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-PixelImage/Pods-PixelImage-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/ChameleonFramework/ChameleonFramework.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ChameleonFramework.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PixelImage/Pods-PixelImage-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 47F9F13E3CB75C7B4B0136A5 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PixelImage/Pods-PixelImage-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -388,7 +378,7 @@ baseConfigurationReference = 6659D12A5984961F335BDF69 /* Pods-PixelImage.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = HHT774898M; + DEVELOPMENT_TEAM = 8J63JZYYHZ; INFOPLIST_FILE = PixelImage/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = vinivendra.PixelImage; @@ -402,7 +392,7 @@ baseConfigurationReference = 0C9CE70F7D2C2896912B7B14 /* Pods-PixelImage.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = HHT774898M; + DEVELOPMENT_TEAM = 8J63JZYYHZ; INFOPLIST_FILE = PixelImage/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = vinivendra.PixelImage; diff --git a/PixelImage/SwiftSugar/Numeric.swift b/PixelImage/SwiftSugar/Numeric.swift index dc57dd7..b085b5e 100644 --- a/PixelImage/SwiftSugar/Numeric.swift +++ b/PixelImage/SwiftSugar/Numeric.swift @@ -4,20 +4,13 @@ protocol DoubleValuable { static func fromDouble(_ double: Double) -> Self } -postfix operator ++ { } - -protocol Incrementable { - postfix func ++ (_: inout Self) -> Self -} - -protocol Numeric: DoubleValuable, Incrementable, Comparable, +protocol Numeric: DoubleValuable, Comparable, ExpressibleByIntegerLiteral { @warn_unused_result func / (lhs: Self, rhs: Self) -> Self @warn_unused_result func - (lhs: Self, rhs: Self) -> Self @warn_unused_result func + (lhs: Self, rhs: Self) -> Self @warn_unused_result func * (lhs: Self, rhs: Self) -> Self - postfix func ++ (_: inout Self) -> Self } protocol FastNumeric: Numeric {} diff --git a/Podfile.lock b/Podfile.lock index 15ecb31..d99865b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -12,7 +12,7 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: ChameleonFramework: - :commit: acc480fbe023c6e5fe40f68593f4a70a8c4c7ad5 + :commit: 6dd284bde21ea2e7f9fd89bc36f40df16e16369d :git: https://github.com/ViccAlexander/Chameleon.git SPEC CHECKSUMS: @@ -20,4 +20,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 01ad8f20bdbed983c319dde08426f855f26bc5a0 -COCOAPODS: 1.2.0 +COCOAPODS: 1.5.2