diff --git a/MunkiAdmin.xcodeproj/project.pbxproj b/MunkiAdmin.xcodeproj/project.pbxproj index 6a2e998..a51ebe3 100644 --- a/MunkiAdmin.xcodeproj/project.pbxproj +++ b/MunkiAdmin.xcodeproj/project.pbxproj @@ -3,10 +3,11 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 47; objects = { /* Begin PBXBuildFile section */ + 0678154D1DA590A500382DDA /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0678154C1DA590A400382DDA /* Images.xcassets */; }; 26504A00172C1FFD00EA67CA /* _InstallerEnvironmentVariableMO.m in Sources */ = {isa = PBXBuildFile; fileRef = 265049FD172C1FFD00EA67CA /* _InstallerEnvironmentVariableMO.m */; }; 26504A01172C1FFD00EA67CA /* InstallerEnvironmentVariableMO.m in Sources */ = {isa = PBXBuildFile; fileRef = 265049FF172C1FFD00EA67CA /* InstallerEnvironmentVariableMO.m */; }; 2F7446990DB6B7EA00F9684A /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2F7446970DB6B7EA00F9684A /* MainMenu.xib */; }; @@ -181,6 +182,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 0678154C1DA590A400382DDA /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = MunkiAdmin/Images.xcassets; sourceTree = ""; }; 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 0FDB177FE71AD8B3731D7675 /* libPods-MunkiAdmin.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MunkiAdmin.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; @@ -662,6 +664,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 0678154C1DA590A400382DDA /* Images.xcassets */, F5674AFE1B314DE90010B6E2 /* appstoreTemplate.pdf */, F5EC182B1AAEE30A00C88669 /* book.pdf */, F5A2CD541AAF358E00A8466E /* calendar_ok.pdf */, @@ -954,10 +957,10 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0700; + LastUpgradeCheck = 0800; }; buildConfigurationList = 26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "MunkiAdmin" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 6.3"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -967,6 +970,7 @@ German, ); mainGroup = 29B97314FDCFA39411CA2CEA /* MunkiAdmin */; + productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( @@ -996,6 +1000,7 @@ F5674AFF1B314DE90010B6E2 /* appstoreTemplate.pdf in Resources */, F5F63383111824CC007CC030 /* packageIcon2.png in Resources */, F5F6339511182934007CC030 /* catalogIcon3.png in Resources */, + 0678154D1DA590A500382DDA /* Images.xcassets in Resources */, F564874911B504520061B190 /* MAPreferences.xib in Resources */, F59279F01917BC8F0028276C /* tagMultipleTemplate.pdf in Resources */, F5E420821ABC081900E9AEDA /* MAManifestEditor.xib in Resources */, @@ -1062,7 +1067,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + 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"; showEnvVarsInLog = 0; }; 54F6514855D1097BC243BC67 /* [CP] Embed Pods Frameworks */ = { @@ -1250,6 +1255,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F5A11C6C195706C6005A39AE /* Warnings.xcconfig */; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_ARC = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; @@ -1274,6 +1280,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F5A11C6C195706C6005A39AE /* Warnings.xcconfig */; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_ARC = YES; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -1295,11 +1302,27 @@ 26FC0A890875C7B200E6366F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = NO; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; @@ -1310,9 +1333,25 @@ 26FC0A8A0875C7B200E6366F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.8; SDKROOT = macosx; diff --git a/MunkiAdmin.xcodeproj/xcshareddata/xcschemes/MunkiAdmin.xcscheme b/MunkiAdmin.xcodeproj/xcshareddata/xcschemes/MunkiAdmin.xcscheme index d11c2ea..fda77c0 100644 --- a/MunkiAdmin.xcodeproj/xcshareddata/xcschemes/MunkiAdmin.xcscheme +++ b/MunkiAdmin.xcodeproj/xcshareddata/xcschemes/MunkiAdmin.xcscheme @@ -1,6 +1,6 @@ - + + - + @@ -24,7 +24,6 @@ - @@ -37,7 +36,6 @@ - @@ -50,7 +48,6 @@ - diff --git a/MunkiAdmin/Graphics/MunkiAdmin.icns b/MunkiAdmin/Graphics/MunkiAdmin.icns index 26baabf..293b284 100644 Binary files a/MunkiAdmin/Graphics/MunkiAdmin.icns and b/MunkiAdmin/Graphics/MunkiAdmin.icns differ diff --git a/MunkiAdmin/Graphics/MunkiAdminIcon_32x32.png b/MunkiAdmin/Graphics/MunkiAdminIcon_32x32.png index 6a2e84e..9fa056d 100644 Binary files a/MunkiAdmin/Graphics/MunkiAdminIcon_32x32.png and b/MunkiAdmin/Graphics/MunkiAdminIcon_32x32.png differ diff --git a/MunkiAdmin/Graphics/MunkiAdminIcon_32x32@2x.png b/MunkiAdmin/Graphics/MunkiAdminIcon_32x32@2x.png index f868fb6..ea14c25 100644 Binary files a/MunkiAdmin/Graphics/MunkiAdminIcon_32x32@2x.png and b/MunkiAdmin/Graphics/MunkiAdminIcon_32x32@2x.png differ diff --git a/MunkiAdmin/Images.xcassets/AppIcon.appiconset/Contents.json b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..7cd4f8e --- /dev/null +++ b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "icon_16x16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "icon_16x16@2x.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "icon_32x32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "icon_32x32@2x.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "icon_128x128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "icon_128x128@2x.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "icon_256x256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "icon_256x256@2x.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "icon_512x512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "icon_512x512@2x.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_128x128.png b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_128x128.png new file mode 100644 index 0000000..d36dba6 Binary files /dev/null and b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png new file mode 100644 index 0000000..ef785c6 Binary files /dev/null and b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_16x16.png b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_16x16.png new file mode 100644 index 0000000..aa74bb0 Binary files /dev/null and b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png new file mode 100644 index 0000000..9fa056d Binary files /dev/null and b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_256x256.png b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_256x256.png new file mode 100644 index 0000000..ef785c6 Binary files /dev/null and b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_256x256.png differ diff --git a/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png new file mode 100644 index 0000000..ad81e68 Binary files /dev/null and b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png differ diff --git a/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_32x32.png b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_32x32.png new file mode 100644 index 0000000..9fa056d Binary files /dev/null and b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png new file mode 100644 index 0000000..ea14c25 Binary files /dev/null and b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png differ diff --git a/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_512x512.png b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_512x512.png new file mode 100644 index 0000000..ad81e68 Binary files /dev/null and b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_512x512.png differ diff --git a/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png new file mode 100644 index 0000000..a07fc9d Binary files /dev/null and b/MunkiAdmin/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png differ diff --git a/MunkiAdmin/MunkiAdmin-Info.plist b/MunkiAdmin/MunkiAdmin-Info.plist index d4967a2..733390c 100644 --- a/MunkiAdmin/MunkiAdmin-Info.plist +++ b/MunkiAdmin/MunkiAdmin-Info.plist @@ -6,8 +6,6 @@ English CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - MunkiAdmin.icns CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/Podfile.lock b/Podfile.lock index c11c3ac..97fcb5e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -25,4 +25,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 60afde4de8dffb4021dfe5ecee7cd6a6a2c7ce19 -COCOAPODS: 1.0.1 +COCOAPODS: 1.1.0.rc.2 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index c11c3ac..97fcb5e 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -25,4 +25,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 60afde4de8dffb4021dfe5ecee7cd6a6a2c7ce19 -COCOAPODS: 1.0.1 +COCOAPODS: 1.1.0.rc.2 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 0edb77b..8241aca 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -639,62 +639,45 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 1580CB7EBA1AB28D9525F15C329823C2 /* Debug */ = { + 05EDC3D41752ABAE38BF7AB514F7D9CD /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 398E8D85E9CCFD262BD0B781420DE57C /* Pods-MunkiAdmin.debug.xcconfig */; + baseConfigurationReference = 37EA137117BA344BD508B7DC1BDB45A5 /* CocoaLumberjack.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; GCC_NO_COMMON_BLOCKS = YES; - MACH_O_TYPE = staticlib; - MACOSX_DEPLOYMENT_TARGET = 10.8; + GCC_PREFIX_HEADER = "Target Support Files/CocoaLumberjack/CocoaLumberjack-prefix.pch"; + MACOSX_DEPLOYMENT_TARGET = 10.7; MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRIVATE_HEADERS_FOLDER_PATH = ""; PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; - SKIP_INSTALL = YES; }; name = Debug; }; - 324BF5E5397CAA4119865967470497AB /* Release */ = { + 0FBA4D416E228DB2E7457A358D476245 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3674D9755D2A46EBA0ABA68CA5C624BD /* Pods-MunkiAdmin.release.xcconfig */; + baseConfigurationReference = C13102389FBF085051A0CB1A6217B6CF /* NSHash.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; GCC_NO_COMMON_BLOCKS = YES; - MACH_O_TYPE = staticlib; - MACOSX_DEPLOYMENT_TARGET = 10.8; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - }; - name = Release; - }; - 55739BEA989CD440CCA5DD43D14E9A3E /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 37EA137117BA344BD508B7DC1BDB45A5 /* CocoaLumberjack.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/CocoaLumberjack/CocoaLumberjack-prefix.pch"; + GCC_PREFIX_HEADER = "Target Support Files/NSHash/NSHash-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.7; - MTL_ENABLE_DEBUG_INFO = YES; + MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; @@ -702,9 +685,9 @@ PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; }; - name = Debug; + name = Release; }; - 68409A7CC907C65CC4632EA7B8F024D8 /* Debug */ = { + 1865F37252872448E01953C385E6AFAA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -722,17 +705,14 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - ENABLE_TESTABILITY = YES; + CODE_SIGNING_REQUIRED = NO; + COPY_PHASE_STRIP = YES; + ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_DEBUG=1", - "DEBUG=1", + "POD_CONFIGURATION_RELEASE=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -740,38 +720,21 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.8; - ONLY_ACTIVE_ARCH = YES; + PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; SYMROOT = "${SRCROOT}/../build"; - }; - name = Debug; - }; - 6D0596A461BBEA9A9D7DF2143828431F /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 1F9F7FED630C656D2E68EA544D1FC127 /* PXSourceList.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - EXECUTABLE_PREFIX = lib; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/PXSourceList/PXSourceList-prefix.pch"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PRIVATE_HEADERS_FOLDER_PATH = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - PUBLIC_HEADERS_FOLDER_PATH = ""; - SDKROOT = macosx; + VALIDATE_PRODUCT = YES; }; name = Release; }; - 985270F30FDC51F7EB6B9296E64EF5C0 /* Release */ = { + 1E9A5D155A16BFDFEA00671CFAB6BF48 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 37EA137117BA344BD508B7DC1BDB45A5 /* CocoaLumberjack.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; @@ -788,18 +751,21 @@ }; name = Release; }; - 996AF6D271B2433A643970162CCC2536 /* Release */ = { + 2E823C39070A30A0567E85B063B4C95D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C13102389FBF085051A0CB1A6217B6CF /* NSHash.xcconfig */; + baseConfigurationReference = 1F9F7FED630C656D2E68EA544D1FC127 /* PXSourceList.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/NSHash/NSHash-prefix.pch"; + GCC_PREFIX_HEADER = "Target Support Files/PXSourceList/PXSourceList-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.7; - MTL_ENABLE_DEBUG_INFO = NO; + MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; @@ -807,20 +773,23 @@ PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; }; - name = Release; + name = Debug; }; - AAB3C3D1B7F37C0B3A462D8348845C35 /* Debug */ = { + 54027ADD294D4C0E2D7783C918E8947C /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 1F9F7FED630C656D2E68EA544D1FC127 /* PXSourceList.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; - DEBUG_INFORMATION_FORMAT = dwarf; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; GCC_NO_COMMON_BLOCKS = YES; GCC_PREFIX_HEADER = "Target Support Files/PXSourceList/PXSourceList-prefix.pch"; MACOSX_DEPLOYMENT_TARGET = 10.7; - MTL_ENABLE_DEBUG_INFO = YES; + MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; @@ -828,9 +797,9 @@ PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = macosx; }; - name = Debug; + name = Release; }; - B5527E718D62AA611740378AF093618F /* Release */ = { + 66AA31CB836890BFE48ECF14D23C3C2E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -848,13 +817,18 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; + CODE_SIGNING_REQUIRED = NO; + COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_RELEASE=1", + "POD_CONFIGURATION_DEBUG=1", + "DEBUG=1", "$(inherited)", ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -862,17 +836,46 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.8; + ONLY_ACTIVE_ARCH = YES; + PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; SYMROOT = "${SRCROOT}/../build"; - VALIDATE_PRODUCT = YES; }; - name = Release; + name = Debug; + }; + 6C27AD487F1CC470665452459245E224 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 398E8D85E9CCFD262BD0B781420DE57C /* Pods-MunkiAdmin.debug.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = "-"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + EXECUTABLE_PREFIX = lib; + GCC_NO_COMMON_BLOCKS = YES; + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.8; + MTL_ENABLE_DEBUG_INFO = YES; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + }; + name = Debug; }; - EB3A83A7399C373F6524EF9C3048FCB2 /* Debug */ = { + 824376F84787BE1AF10B4BC4FBB7DB9A /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = C13102389FBF085051A0CB1A6217B6CF /* NSHash.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; EXECUTABLE_PREFIX = lib; @@ -889,14 +892,39 @@ }; name = Debug; }; + EF18DCD83854DCC32FE4CE9C20F132C4 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3674D9755D2A46EBA0ABA68CA5C624BD /* Pods-MunkiAdmin.release.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = "-"; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + EXECUTABLE_PREFIX = lib; + GCC_NO_COMMON_BLOCKS = YES; + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.8; + MTL_ENABLE_DEBUG_INFO = NO; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 25574AAE223C5E9EEFE0BF2EB80C1B54 /* Build configuration list for PBXNativeTarget "PXSourceList" */ = { isa = XCConfigurationList; buildConfigurations = ( - AAB3C3D1B7F37C0B3A462D8348845C35 /* Debug */, - 6D0596A461BBEA9A9D7DF2143828431F /* Release */, + 2E823C39070A30A0567E85B063B4C95D /* Debug */, + 54027ADD294D4C0E2D7783C918E8947C /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -904,8 +932,8 @@ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 68409A7CC907C65CC4632EA7B8F024D8 /* Debug */, - B5527E718D62AA611740378AF093618F /* Release */, + 66AA31CB836890BFE48ECF14D23C3C2E /* Debug */, + 1865F37252872448E01953C385E6AFAA /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -913,8 +941,8 @@ 399B47ED3F6B84CFDE41C7A0627ECEE8 /* Build configuration list for PBXNativeTarget "NSHash" */ = { isa = XCConfigurationList; buildConfigurations = ( - EB3A83A7399C373F6524EF9C3048FCB2 /* Debug */, - 996AF6D271B2433A643970162CCC2536 /* Release */, + 824376F84787BE1AF10B4BC4FBB7DB9A /* Debug */, + 0FBA4D416E228DB2E7457A358D476245 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -922,8 +950,8 @@ D0B0F0CEB0E6B8CA0AB9C29A2460E553 /* Build configuration list for PBXNativeTarget "Pods-MunkiAdmin" */ = { isa = XCConfigurationList; buildConfigurations = ( - 1580CB7EBA1AB28D9525F15C329823C2 /* Debug */, - 324BF5E5397CAA4119865967470497AB /* Release */, + 6C27AD487F1CC470665452459245E224 /* Debug */, + EF18DCD83854DCC32FE4CE9C20F132C4 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -931,8 +959,8 @@ E0C8BB684C9CCC379207FFA69ED0D571 /* Build configuration list for PBXNativeTarget "CocoaLumberjack" */ = { isa = XCConfigurationList; buildConfigurations = ( - 55739BEA989CD440CCA5DD43D14E9A3E /* Debug */, - 985270F30FDC51F7EB6B9296E64EF5C0 /* Release */, + 05EDC3D41752ABAE38BF7AB514F7D9CD /* Debug */, + 1E9A5D155A16BFDFEA00671CFAB6BF48 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin-acknowledgements.plist b/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin-acknowledgements.plist index da4ad47..d979416 100644 --- a/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin-acknowledgements.plist @@ -32,6 +32,8 @@ with or without modification, are permitted provided that the following conditio written permission of Deusty, LLC. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + License + BSD Title CocoaLumberjack Type @@ -41,6 +43,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND FooterText © 2012-2016 DevMate Inc. All rights reserved. + License + Copyright Title DevMateKit Type @@ -250,6 +254,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + License + Apache License, Version 2.0 Title NSHash Type @@ -268,6 +274,8 @@ Redistributions in binary form must reproduce the above copyright notice, this l Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + License + BSD Title PXSourceList Type diff --git a/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin.debug.xcconfig b/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin.debug.xcconfig index 859995e..30aac7d 100644 --- a/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin.debug.xcconfig +++ b/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin.debug.xcconfig @@ -1,3 +1,4 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO FRAMEWORK_SEARCH_PATHS = $(inherited) $(PODS_ROOT)/DevMateKit/DevMateKit.framework/Frameworks "${PODS_ROOT}/DevMateKit" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/DevMateKit" "${PODS_ROOT}/Headers/Public/NSHash" "${PODS_ROOT}/Headers/Public/PXSourceList" diff --git a/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin.release.xcconfig b/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin.release.xcconfig index 859995e..30aac7d 100644 --- a/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin.release.xcconfig +++ b/Pods/Target Support Files/Pods-MunkiAdmin/Pods-MunkiAdmin.release.xcconfig @@ -1,3 +1,4 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO FRAMEWORK_SEARCH_PATHS = $(inherited) $(PODS_ROOT)/DevMateKit/DevMateKit.framework/Frameworks "${PODS_ROOT}/DevMateKit" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/DevMateKit" "${PODS_ROOT}/Headers/Public/NSHash" "${PODS_ROOT}/Headers/Public/PXSourceList"