From 585686569c334ff0feefd09075ddf76760f31ace Mon Sep 17 00:00:00 2001 From: Benoit Briatte Date: Fri, 31 May 2019 13:21:37 +0200 Subject: [PATCH 1/3] fix build error --- Podfile | 6 +-- .../project.pbxproj | 21 ---------- .../project.pbxproj | 21 ---------- .../project.pbxproj | 21 ---------- .../project.pbxproj | 42 ------------------- 5 files changed, 3 insertions(+), 108 deletions(-) diff --git a/Podfile b/Podfile index 999095a..ddfe73a 100644 --- a/Podfile +++ b/Podfile @@ -2,12 +2,12 @@ workspace 'DependencyInjectorObjectMapper.xcworkspace' use_frameworks! -pod 'DependencyInjector', '~> 2.2' -pod 'ObjectMapper', '~> 3.4', :inhibit_warnings => true - ## Frameworks targets abstract_target 'Frameworks' do + pod 'DependencyInjector', '~> 2.2' + pod 'ObjectMapper', '~> 3.4', :inhibit_warnings => true + target 'DependencyInjectorObjectMapper-iOS' do platform :ios, '8.0' end diff --git a/Samples/DependencyInjectorObjectMapperSample-OSX/DependencyInjectorObjectMapperSample-OSX.xcodeproj/project.pbxproj b/Samples/DependencyInjectorObjectMapperSample-OSX/DependencyInjectorObjectMapperSample-OSX.xcodeproj/project.pbxproj index 5fa7f50..0fe1716 100644 --- a/Samples/DependencyInjectorObjectMapperSample-OSX/DependencyInjectorObjectMapperSample-OSX.xcodeproj/project.pbxproj +++ b/Samples/DependencyInjectorObjectMapperSample-OSX/DependencyInjectorObjectMapperSample-OSX.xcodeproj/project.pbxproj @@ -120,7 +120,6 @@ A30D64AD1E0D7CD800A3CE45 /* Frameworks */, A30D64AE1E0D7CD800A3CE45 /* Resources */, A30D64C31E0D7CF700A3CE45 /* Embed Frameworks */, - ECAA84BA0EDB990281411393 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -198,26 +197,6 @@ 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; }; - ECAA84BA0EDB990281411393 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Samples-DependencyInjectorObjectMapperSample-OSX/Pods-Samples-DependencyInjectorObjectMapperSample-OSX-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/DependencyInjector-macOS/DependencyInjector.framework", - "${BUILT_PRODUCTS_DIR}/ObjectMapper-macOS/ObjectMapper.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DependencyInjector.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectMapper.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Samples-DependencyInjectorObjectMapperSample-OSX/Pods-Samples-DependencyInjectorObjectMapperSample-OSX-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/Samples/DependencyInjectorObjectMapperSample-iOS/DependencyInjectorObjectMapperSample-iOS.xcodeproj/project.pbxproj b/Samples/DependencyInjectorObjectMapperSample-iOS/DependencyInjectorObjectMapperSample-iOS.xcodeproj/project.pbxproj index aee5d65..1b7f121 100644 --- a/Samples/DependencyInjectorObjectMapperSample-iOS/DependencyInjectorObjectMapperSample-iOS.xcodeproj/project.pbxproj +++ b/Samples/DependencyInjectorObjectMapperSample-iOS/DependencyInjectorObjectMapperSample-iOS.xcodeproj/project.pbxproj @@ -126,7 +126,6 @@ A30D63EB1E0D717E00A3CE45 /* Frameworks */, A30D63EC1E0D717E00A3CE45 /* Resources */, A30D640C1E0D71CB00A3CE45 /* Embed Frameworks */, - 761B88D2861272099C580E2F /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -187,26 +186,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 761B88D2861272099C580E2F /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Samples-DependencyInjectorObjectMapperSample-iOS/Pods-Samples-DependencyInjectorObjectMapperSample-iOS-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/DependencyInjector-iOS/DependencyInjector.framework", - "${BUILT_PRODUCTS_DIR}/ObjectMapper-iOS/ObjectMapper.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DependencyInjector.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectMapper.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Samples-DependencyInjectorObjectMapperSample-iOS/Pods-Samples-DependencyInjectorObjectMapperSample-iOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 986B8F2F5A04B5574D6124D9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/Samples/DependencyInjectorObjectMapperSample-tvOS/DependencyInjectorObjectMapperSample-tvOS.xcodeproj/project.pbxproj b/Samples/DependencyInjectorObjectMapperSample-tvOS/DependencyInjectorObjectMapperSample-tvOS.xcodeproj/project.pbxproj index c597bcf..5822566 100644 --- a/Samples/DependencyInjectorObjectMapperSample-tvOS/DependencyInjectorObjectMapperSample-tvOS.xcodeproj/project.pbxproj +++ b/Samples/DependencyInjectorObjectMapperSample-tvOS/DependencyInjectorObjectMapperSample-tvOS.xcodeproj/project.pbxproj @@ -128,7 +128,6 @@ A30D64891E0D7B2A00A3CE45 /* Frameworks */, A30D648A1E0D7B2A00A3CE45 /* Resources */, A30D64A11E0D7BA200A3CE45 /* Embed Frameworks */, - 6F91670C5C8679B959E65CFB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -188,26 +187,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 6F91670C5C8679B959E65CFB /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Samples-DependencyInjectorObjectMapperSample-tvOS/Pods-Samples-DependencyInjectorObjectMapperSample-tvOS-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/DependencyInjector-tvOS/DependencyInjector.framework", - "${BUILT_PRODUCTS_DIR}/ObjectMapper-tvOS/ObjectMapper.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DependencyInjector.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectMapper.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Samples-DependencyInjectorObjectMapperSample-tvOS/Pods-Samples-DependencyInjectorObjectMapperSample-tvOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; C9C3C7D7C59B1AB10EA77253 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/Samples/DependencyInjectorObjectMapperSample-watchOS/DependencyInjectorObjectMapperSample-watchOS.xcodeproj/project.pbxproj b/Samples/DependencyInjectorObjectMapperSample-watchOS/DependencyInjectorObjectMapperSample-watchOS.xcodeproj/project.pbxproj index f8d12cd..b726a19 100644 --- a/Samples/DependencyInjectorObjectMapperSample-watchOS/DependencyInjectorObjectMapperSample-watchOS.xcodeproj/project.pbxproj +++ b/Samples/DependencyInjectorObjectMapperSample-watchOS/DependencyInjectorObjectMapperSample-watchOS.xcodeproj/project.pbxproj @@ -250,7 +250,6 @@ A30D64191E0D759D00A3CE45 /* Resources */, A30D64511E0D759D00A3CE45 /* Embed Watch Content */, A30D645C1E0D76AC00A3CE45 /* Embed Frameworks */, - 140E695A0845EF0F82FE4B2D /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -288,7 +287,6 @@ A30D64381E0D759D00A3CE45 /* Sources */, A30D64391E0D759D00A3CE45 /* Frameworks */, A30D643A1E0D759D00A3CE45 /* Resources */, - D00B153FF6EA33827EDD269E /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -379,46 +377,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 140E695A0845EF0F82FE4B2D /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Samples-watchOS-DependencyInjectorObjectMapperSample-watchOS/Pods-Samples-watchOS-DependencyInjectorObjectMapperSample-watchOS-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/DependencyInjector-iOS/DependencyInjector.framework", - "${BUILT_PRODUCTS_DIR}/ObjectMapper-iOS/ObjectMapper.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DependencyInjector.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectMapper.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Samples-watchOS-DependencyInjectorObjectMapperSample-watchOS/Pods-Samples-watchOS-DependencyInjectorObjectMapperSample-watchOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - D00B153FF6EA33827EDD269E /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Samples-watchOS-DependencyInjectorObjectMapperSample-watchOS WatchKit Extension/Pods-Samples-watchOS-DependencyInjectorObjectMapperSample-watchOS WatchKit Extension-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/DependencyInjector-watchOS/DependencyInjector.framework", - "${BUILT_PRODUCTS_DIR}/ObjectMapper-watchOS/ObjectMapper.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DependencyInjector.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectMapper.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Samples-watchOS-DependencyInjectorObjectMapperSample-watchOS WatchKit Extension/Pods-Samples-watchOS-DependencyInjectorObjectMapperSample-watchOS WatchKit Extension-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; E2538F3EA116A9FD50336DEF /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; From f1c2109f7389cbf6fce5c1888486fac052217b2f Mon Sep 17 00:00:00 2001 From: Benoit Briatte Date: Fri, 31 May 2019 13:24:57 +0200 Subject: [PATCH 2/3] Bumped release version '1.0.6' build #1 --- DependencyInjectorObjectMapper.podspec | 2 +- Sources/Info.plist | 2 +- Tests/Info.plist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DependencyInjectorObjectMapper.podspec b/DependencyInjectorObjectMapper.podspec index 86a3d4b..e47d628 100644 --- a/DependencyInjectorObjectMapper.podspec +++ b/DependencyInjectorObjectMapper.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "DependencyInjectorObjectMapper" -s.version = "1.0.5" +s.version = "1.0.6" s.summary = "Add Mappable support with dependency injection" s.homepage = "https://github.com/Digipolitan/dependency-injector-object-mapper" s.authors = "Digipolitan" diff --git a/Sources/Info.plist b/Sources/Info.plist index 6fb2e75..47cfd13 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.5 + 1.0.6 CFBundleVersion 1 NSPrincipalClass diff --git a/Tests/Info.plist b/Tests/Info.plist index 7926e5e..e677825 100644 --- a/Tests/Info.plist +++ b/Tests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.0.5 + 1.0.6 CFBundleVersion 1 From 60b7758195ccf66332b7b9e58565bcdb0a3ea010 Mon Sep 17 00:00:00 2001 From: Benoit Briatte Date: Fri, 31 May 2019 13:26:05 +0200 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba64701..1ebc43e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. --- +## [1.0.6](https://github.com/Digipolitan/dependency-injector-object-mapper/releases/tag/v1.0.6) + +fix build error + +--- + ## [1.0.5](https://github.com/Digipolitan/dependency-injector-object-mapper/releases/tag/v1.0.5) swift 5 support