From d813c1780ed341f582145ff5c9ccab158939f620 Mon Sep 17 00:00:00 2001 From: Maxim Volgin Date: Thu, 15 Jun 2017 12:33:39 +0200 Subject: [PATCH] fixed module name --- RaspSwift.xcodeproj/project.pbxproj | 40 +++++++++++++++++------------ 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/RaspSwift.xcodeproj/project.pbxproj b/RaspSwift.xcodeproj/project.pbxproj index 8126278..3a9bad1 100644 --- a/RaspSwift.xcodeproj/project.pbxproj +++ b/RaspSwift.xcodeproj/project.pbxproj @@ -7,7 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 9446ADBC1EF05B160036A603 /* iOS_RaspSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9446ADB21EF05B150036A603 /* iOS_RaspSwift.framework */; }; + 9424AAAF1EF27CC100E8646D /* RxSwift.framework.dSYM in Carthage */ = {isa = PBXBuildFile; fileRef = 9424AAAE1EF27CC100E8646D /* RxSwift.framework.dSYM */; }; + 9424AAB01EF27DFF00E8646D /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9465525A1EF26828001AD6AC /* RxSwift.framework */; }; + 9446ADBC1EF05B160036A603 /* RaspSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9446ADB21EF05B150036A603 /* RaspSwift.framework */; }; 9446ADD41EF05D3F0036A603 /* RaspReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9446ADD31EF05D3F0036A603 /* RaspReducer.swift */; }; 9446ADD61EF05D4B0036A603 /* RaspSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9446ADD51EF05D4B0036A603 /* RaspSelector.swift */; }; 9446ADD81EF05D560036A603 /* RaspState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9446ADD71EF05D560036A603 /* RaspState.swift */; }; @@ -17,7 +19,7 @@ 9446ADE01EF05E360036A603 /* Observable+Rasp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9446ADDF1EF05E360036A603 /* Observable+Rasp.swift */; }; 9446ADE31EF066860036A603 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9446ADE21EF066860036A603 /* RxSwift.framework */; }; 946552351EF267D2001AD6AC /* iOS_RaspSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 946552331EF267D2001AD6AC /* iOS_RaspSwift.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 946552451EF267F9001AD6AC /* macOS_RaspSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9465523C1EF267F8001AD6AC /* macOS_RaspSwift.framework */; }; + 946552451EF267F9001AD6AC /* RaspSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9465523C1EF267F8001AD6AC /* RaspSwift.framework */; }; 9465524A1EF267F9001AD6AC /* macOS_RaspSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946552491EF267F9001AD6AC /* macOS_RaspSwiftTests.swift */; }; 9465524C1EF267F9001AD6AC /* macOS_RaspSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 9465523E1EF267F8001AD6AC /* macOS_RaspSwift.h */; settings = {ATTRIBUTES = (Public, ); }; }; 946552531EF26814001AD6AC /* RaspReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9446ADD31EF05D3F0036A603 /* RaspReducer.swift */; }; @@ -27,7 +29,6 @@ 946552571EF26814001AD6AC /* RaspEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9446ADDB1EF05DB70036A603 /* RaspEvent.swift */; }; 946552581EF26814001AD6AC /* RaspSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9446ADDD1EF05E110036A603 /* RaspSource.swift */; }; 946552591EF26814001AD6AC /* Observable+Rasp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9446ADDF1EF05E360036A603 /* Observable+Rasp.swift */; }; - 9465525B1EF26828001AD6AC /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9465525A1EF26828001AD6AC /* RxSwift.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -54,6 +55,7 @@ dstPath = ""; dstSubfolderSpec = 16; files = ( + 9424AAAF1EF27CC100E8646D /* RxSwift.framework.dSYM in Carthage */, ); name = Carthage; runOnlyForDeploymentPostprocessing = 0; @@ -62,7 +64,8 @@ /* Begin PBXFileReference section */ 9424AAAC1EF2763500E8646D /* RxSwift.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = RxSwift.framework.dSYM; path = Carthage/Build/Mac/RxSwift.framework.dSYM; sourceTree = ""; }; - 9446ADB21EF05B150036A603 /* iOS_RaspSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = iOS_RaspSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9424AAAE1EF27CC100E8646D /* RxSwift.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = RxSwift.framework.dSYM; path = Carthage/Build/Mac/RxSwift.framework.dSYM; sourceTree = ""; }; + 9446ADB21EF05B150036A603 /* RaspSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RaspSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9446ADBB1EF05B160036A603 /* iOS_RaspSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iOS_RaspSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 9446ADCC1EF05B370036A603 /* Cartfile.resolved */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile.resolved; sourceTree = ""; }; 9446ADCD1EF05B370036A603 /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = ""; }; @@ -79,7 +82,7 @@ 9465522F1EF267B0001AD6AC /* iOS_RaspSwiftTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iOS_RaspSwiftTests.swift; sourceTree = ""; }; 946552331EF267D2001AD6AC /* iOS_RaspSwift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iOS_RaspSwift.h; sourceTree = ""; }; 946552341EF267D2001AD6AC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9465523C1EF267F8001AD6AC /* macOS_RaspSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = macOS_RaspSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9465523C1EF267F8001AD6AC /* RaspSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RaspSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9465523E1EF267F8001AD6AC /* macOS_RaspSwift.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = macOS_RaspSwift.h; sourceTree = ""; }; 9465523F1EF267F8001AD6AC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 946552441EF267F9001AD6AC /* macOS_RaspSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = macOS_RaspSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -102,7 +105,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9446ADBC1EF05B160036A603 /* iOS_RaspSwift.framework in Frameworks */, + 9446ADBC1EF05B160036A603 /* RaspSwift.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -110,7 +113,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9465525B1EF26828001AD6AC /* RxSwift.framework in Frameworks */, + 9424AAB01EF27DFF00E8646D /* RxSwift.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -118,7 +121,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 946552451EF267F9001AD6AC /* macOS_RaspSwift.framework in Frameworks */, + 946552451EF267F9001AD6AC /* RaspSwift.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -128,6 +131,7 @@ 9446ADA81EF05B150036A603 = { isa = PBXGroup; children = ( + 9424AAAE1EF27CC100E8646D /* RxSwift.framework.dSYM */, 9424AAAC1EF2763500E8646D /* RxSwift.framework.dSYM */, 9465525D1EF2685F001AD6AC /* RxSwift.framework.dSYM */, 9446ADD11EF05CE20036A603 /* README.md */, @@ -146,9 +150,9 @@ 9446ADB31EF05B150036A603 /* Products */ = { isa = PBXGroup; children = ( - 9446ADB21EF05B150036A603 /* iOS_RaspSwift.framework */, + 9446ADB21EF05B150036A603 /* RaspSwift.framework */, 9446ADBB1EF05B160036A603 /* iOS_RaspSwiftTests.xctest */, - 9465523C1EF267F8001AD6AC /* macOS_RaspSwift.framework */, + 9465523C1EF267F8001AD6AC /* RaspSwift.framework */, 946552441EF267F9001AD6AC /* macOS_RaspSwiftTests.xctest */, ); name = Products; @@ -251,7 +255,7 @@ ); name = iOS_RaspSwift; productName = RaspSwift; - productReference = 9446ADB21EF05B150036A603 /* iOS_RaspSwift.framework */; + productReference = 9446ADB21EF05B150036A603 /* RaspSwift.framework */; productType = "com.apple.product-type.framework"; }; 9446ADBA1EF05B160036A603 /* iOS_RaspSwiftTests */ = { @@ -288,7 +292,7 @@ ); name = macOS_RaspSwift; productName = macOS_RaspSwift; - productReference = 9465523C1EF267F8001AD6AC /* macOS_RaspSwift.framework */; + productReference = 9465523C1EF267F8001AD6AC /* RaspSwift.framework */; productType = "com.apple.product-type.framework"; }; 946552431EF267F9001AD6AC /* macOS_RaspSwiftTests */ = { @@ -510,8 +514,10 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(PROJECT_NAME)"; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -558,7 +564,9 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(PROJECT_NAME)"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -585,7 +593,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = maxvol.RaspSwift; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "$(PROJECT_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; @@ -609,7 +617,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = maxvol.RaspSwift; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "$(PROJECT_NAME)"; SKIP_INSTALL = YES; SWIFT_VERSION = 3.0; }; @@ -658,7 +666,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = maxvol.RaspSwift; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "$(PROJECT_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_VERSION = 3.0; @@ -684,7 +692,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = maxvol.RaspSwift; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "$(PROJECT_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_VERSION = 3.0;