diff --git a/.travis.yml b/.travis.yml index e3d2afd..c6f701c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,12 @@ language: objective-c +sudo: false +osx_image: xcode7 + before_install: - gem install xcpretty --no-document --quiet - gem install cocoapods --no-document --quiet - cd EasyMappingExample - export LANG=en_US.UTF-8 - + script: rake diff --git a/EasyMappingExample/Benchmarks/Targets/MacOS Benchmark/MacOS Benchmark-Info.plist b/EasyMappingExample/Benchmarks/Targets/MacOS Benchmark/MacOS Benchmark-Info.plist index acb35e2..11acbb5 100644 --- a/EasyMappingExample/Benchmarks/Targets/MacOS Benchmark/MacOS Benchmark-Info.plist +++ b/EasyMappingExample/Benchmarks/Targets/MacOS Benchmark/MacOS Benchmark-Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile CFBundleIdentifier - com.mlsdev.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/EasyMappingExample/Benchmarks/Targets/iOS Benchmark/iOS Benchmark-Info.plist b/EasyMappingExample/Benchmarks/Targets/iOS Benchmark/iOS Benchmark-Info.plist index 5057af7..6a012bd 100644 --- a/EasyMappingExample/Benchmarks/Targets/iOS Benchmark/iOS Benchmark-Info.plist +++ b/EasyMappingExample/Benchmarks/Targets/iOS Benchmark/iOS Benchmark-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.mlsdev.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/EasyMappingExample/EasyMappingExample.xcodeproj/project.pbxproj b/EasyMappingExample/EasyMappingExample.xcodeproj/project.pbxproj index 118568f..87855e8 100644 --- a/EasyMappingExample/EasyMappingExample.xcodeproj/project.pbxproj +++ b/EasyMappingExample/EasyMappingExample.xcodeproj/project.pbxproj @@ -1202,7 +1202,7 @@ attributes = { CLASSPREFIX = EK; LastTestingUpgradeCheck = 0510; - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0700; ORGANIZATIONNAME = EasyKit; TargetAttributes = { 9A2A37D81AEA593F0021E97D = { @@ -1818,6 +1818,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + FRAMEWORK_SEARCH_PATHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/Targets/iOS Tests/EasyMappingExampleTests-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1831,6 +1832,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "Tests/Targets/iOS Tests/EasyMappingExampleTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.1; + PRODUCT_BUNDLE_IDENTIFIER = "vc.cb3.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = xctest; }; @@ -1845,6 +1847,7 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; ENABLE_NS_ASSERTIONS = NO; + FRAMEWORK_SEARCH_PATHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/Targets/iOS Tests/EasyMappingExampleTests-Prefix.pch"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1854,6 +1857,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "Tests/Targets/iOS Tests/EasyMappingExampleTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.1; + PRODUCT_BUNDLE_IDENTIFIER = "vc.cb3.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = xctest; }; @@ -1868,6 +1872,7 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/Targets/OS X Tests/OS X Tests-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1880,6 +1885,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "Tests/Targets/OS X Tests/OS X Tests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.mlsdev.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; WRAPPER_EXTENSION = xctest; @@ -1896,6 +1902,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; COMBINE_HIDPI_IMAGES = YES; ENABLE_NS_ASSERTIONS = NO; + FRAMEWORK_SEARCH_PATHS = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/Targets/OS X Tests/OS X Tests-Prefix.pch"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1904,6 +1911,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "Tests/Targets/OS X Tests/OS X Tests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.mlsdev.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; WRAPPER_EXTENSION = xctest; @@ -1940,6 +1948,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "vc.cb3.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = EasyMapping; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1976,6 +1985,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "vc.cb3.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = EasyMapping; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2016,6 +2026,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "vc.cb3.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = EasyMapping; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -2054,6 +2065,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "vc.cb3.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = EasyMapping; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -2086,6 +2098,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "Benchmarks/Targets/iOS Benchmark/iOS Benchmark-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.1; + PRODUCT_BUNDLE_IDENTIFIER = "com.mlsdev.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2114,6 +2127,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "Benchmarks/Targets/iOS Benchmark/iOS Benchmark-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.1; + PRODUCT_BUNDLE_IDENTIFIER = "com.mlsdev.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2148,6 +2162,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "Benchmarks/Targets/MacOS Benchmark/MacOS Benchmark-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_BUNDLE_IDENTIFIER = "com.mlsdev.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; WRAPPER_EXTENSION = app; @@ -2179,6 +2194,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "Benchmarks/Targets/MacOS Benchmark/MacOS Benchmark-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_BUNDLE_IDENTIFIER = "com.mlsdev.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; WRAPPER_EXTENSION = app; @@ -2188,9 +2204,6 @@ C6557E4816D6621E005D2D3E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -2199,7 +2212,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; + ENABLE_TESTABILITY = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -2220,9 +2233,6 @@ C6557E4916D6621E005D2D3E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -2231,7 +2241,6 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; diff --git a/EasyMappingExample/EasyMappingExample.xcodeproj/xcshareddata/xcschemes/EasyMapping OSX.xcscheme b/EasyMappingExample/EasyMappingExample.xcodeproj/xcshareddata/xcschemes/EasyMapping OSX.xcscheme index 6f3f080..e0c5544 100644 --- a/EasyMappingExample/EasyMappingExample.xcodeproj/xcshareddata/xcschemes/EasyMapping OSX.xcscheme +++ b/EasyMappingExample/EasyMappingExample.xcodeproj/xcshareddata/xcschemes/EasyMapping OSX.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:EasyMappingExample.xcodeproj"> + + + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:EasyMappingExample.xcodeproj"> + + + shouldUseLaunchSchemeArgsEnv = "YES"> + + @@ -53,10 +56,10 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -39,15 +39,18 @@ + + + shouldUseLaunchSchemeArgsEnv = "YES"> + + @@ -53,10 +56,10 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -39,15 +39,18 @@ + + 1.4' - pod 'MagicalRecord' + pod 'MagicalRecord', '~> 2.3' end target "OS X Tests" do -platform :osx, '10.7' +platform :osx, '10.8' pod 'Kiwi', '2.3.1' pod 'CMFactory', '~> 1.4' - pod 'MagicalRecord' + pod 'MagicalRecord', '~> 2.3' end target "iOS Benchmark" do -platform :ios, '5.0' +platform :ios, '6.1' pod 'CMFactory', '~> 1.4' end target "MacOS Benchmark" do -platform :osx, '10.7' +platform :osx, '10.8' pod 'CMFactory', '~> 1.4' end - - - - - diff --git a/EasyMappingExample/Podfile.lock b/EasyMappingExample/Podfile.lock index ac7fb8a..827f538 100644 --- a/EasyMappingExample/Podfile.lock +++ b/EasyMappingExample/Podfile.lock @@ -15,7 +15,7 @@ PODS: DEPENDENCIES: - CMFactory (~> 1.4) - Kiwi (= 2.3.1) - - MagicalRecord + - MagicalRecord (~> 2.3) SPEC CHECKSUMS: CMFactory: 535c1473e91f4d0d13cb290de2144faa75a882a3 @@ -24,4 +24,4 @@ SPEC CHECKSUMS: MagicalRecord: 89eb7d7ead39fb37f01c3d010665ee94d17f8dba Mantle: 3fbcca07bdfe76c54a08c241689a60d34d08e783 -COCOAPODS: 0.37.1 +COCOAPODS: 0.38.2 diff --git a/EasyMappingExample/Supporting files/EasyMapping-Info.plist b/EasyMappingExample/Supporting files/EasyMapping-Info.plist index 6b4a909..169b6f7 100644 --- a/EasyMappingExample/Supporting files/EasyMapping-Info.plist +++ b/EasyMappingExample/Supporting files/EasyMapping-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - vc.cb3.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/EasyMappingExample/Tests/Targets/OS X Tests/OS X Tests-Info.plist b/EasyMappingExample/Tests/Targets/OS X Tests/OS X Tests-Info.plist index 782768c..169b6f7 100644 --- a/EasyMappingExample/Tests/Targets/OS X Tests/OS X Tests-Info.plist +++ b/EasyMappingExample/Tests/Targets/OS X Tests/OS X Tests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.mlsdev.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/EasyMappingExample/Tests/Targets/iOS Tests/EasyMappingExampleTests-Info.plist b/EasyMappingExample/Tests/Targets/iOS Tests/EasyMappingExampleTests-Info.plist index 6b4a909..169b6f7 100644 --- a/EasyMappingExample/Tests/Targets/iOS Tests/EasyMappingExampleTests-Info.plist +++ b/EasyMappingExample/Tests/Targets/iOS Tests/EasyMappingExampleTests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - vc.cb3.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType