diff --git a/.gitignore b/.gitignore index 3794e7a..c32fd16 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,7 @@ Pods #Carthage Carthage + +# SwiftPM +.build +.swiftpm diff --git a/MBDebugPanel.podspec b/MBDebugPanel.podspec index 52af5e8..1cdce64 100644 --- a/MBDebugPanel.podspec +++ b/MBDebugPanel.podspec @@ -3,9 +3,9 @@ Pod::Spec.new do |s| s.version = "0.2.3" s.summary = "A painless, configurable, hidden panel to add shortcuts to run code, test features, or whatever you like." s.description = <<-DESC - MBDebugPanel offers a simple way to embed a set of dev-mode-only features + MBDebugPanel offers a simple way to embed a set of dev-mode-only features (Though you could ship it with your app if you really wanted to.) - + It's like the Konami code, but for your app. DESC s.homepage = "https://github.com/mindbody/MBDebugPanel.git" @@ -13,10 +13,9 @@ Pod::Spec.new do |s| s.author = { "Matthew Holden" => "matthew.holden@mindbodyonline.com" } s.source = { :git => "https://github.com/mindbody/MBDebugPanel.git", :tag => s.version.to_s } - s.platform = :ios, '7.0' + s.platform = :ios, '8.0' s.requires_arc = true - s.source_files = 'MBDebugPanel/Sources/Classes/**/*.{h,m}' - s.resources = 'MBDebugPanel/Sources/Assets/componentCells/*.xib' - s.private_header_files = 'MBDebugPanel/Sources/Classes/ios/private/*.h' + s.source_files = 'MBDebugPanel/Sources/MBDebugPanel/Classes/**/*.{h,m}', 'MBDebugPanel/Sources/MBDebugPanel/Headers/**/*.{h}' + s.resources = 'MBDebugPanel/Sources/MBDebugPanel/Assets/componentCells/*.xib' end diff --git a/MBDebugPanel/MBDebugPanel.xcodeproj/project.pbxproj b/MBDebugPanel.xcodeproj/project.pbxproj similarity index 98% rename from MBDebugPanel/MBDebugPanel.xcodeproj/project.pbxproj rename to MBDebugPanel.xcodeproj/project.pbxproj index 398cde6..9108361 100644 --- a/MBDebugPanel/MBDebugPanel.xcodeproj/project.pbxproj +++ b/MBDebugPanel.xcodeproj/project.pbxproj @@ -93,6 +93,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 1B2A4CC7255C2C7F00DA9688 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; 9A10FA381EA5633500D2B095 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 9A10FA391EA5633500D2B095 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 9A10FA3A1EA5633500D2B095 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -174,6 +175,32 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 1B2A4CC3255C2BD100DA9688 /* MBDebugPanel */ = { + isa = PBXGroup; + children = ( + 1B2A4CCE255C2F9800DA9688 /* Headers */, + 9A5DE2991EA55DC500C90F62 /* Assets */, + 9A5DE29E1EA55DC500C90F62 /* Classes */, + 9A5DE2B51EA55DC500C90F62 /* SupportingFiles */, + ); + path = MBDebugPanel; + sourceTree = ""; + }; + 1B2A4CCE255C2F9800DA9688 /* Headers */ = { + isa = PBXGroup; + children = ( + 9A5DE2A91EA55DC500C90F62 /* MBDebugPanel.h */, + 9A5DE2AD1EA55DC500C90F62 /* MBDebugPanel_Private.h */, + 9A5DE2AB1EA55DC500C90F62 /* MBDebugPanelComponent.h */, + 9A5DE2A11EA55DC500C90F62 /* MBDebugPanelSimpleButtonComponent.h */, + 9A5DE2A31EA55DC500C90F62 /* MBDebugPanelSimpleComponent.h */, + 9A5DE2AE1EA55DC500C90F62 /* MBDebugPanelSimpleComponent_Protected.h */, + 9A5DE2A51EA55DC500C90F62 /* MBDebugPanelSimpleSwitchComponent.h */, + 9A5DE2A71EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponent.h */, + ); + path = Headers; + sourceTree = ""; + }; 9A10FA361EA5633500D2B095 /* MBDebugPanelTestsApplicationContainer */ = { isa = PBXGroup; children = ( @@ -191,9 +218,7 @@ 9A5DE2981EA55DC500C90F62 /* Sources */ = { isa = PBXGroup; children = ( - 9A5DE2991EA55DC500C90F62 /* Assets */, - 9A5DE29E1EA55DC500C90F62 /* Classes */, - 9A5DE2B51EA55DC500C90F62 /* Supporting Files */, + 1B2A4CC3255C2BD100DA9688 /* MBDebugPanel */, ); path = Sources; sourceTree = ""; @@ -228,10 +253,7 @@ isa = PBXGroup; children = ( 9A5DE2A01EA55DC500C90F62 /* components */, - 9A5DE2A91EA55DC500C90F62 /* MBDebugPanel.h */, 9A5DE2AA1EA55DC500C90F62 /* MBDebugPanel.m */, - 9A5DE2AB1EA55DC500C90F62 /* MBDebugPanelComponent.h */, - 9A5DE2AC1EA55DC500C90F62 /* private */, ); path = ios; sourceTree = ""; @@ -239,34 +261,21 @@ 9A5DE2A01EA55DC500C90F62 /* components */ = { isa = PBXGroup; children = ( - 9A5DE2A11EA55DC500C90F62 /* MBDebugPanelSimpleButtonComponent.h */, 9A5DE2A21EA55DC500C90F62 /* MBDebugPanelSimpleButtonComponent.m */, - 9A5DE2A31EA55DC500C90F62 /* MBDebugPanelSimpleComponent.h */, 9A5DE2A41EA55DC500C90F62 /* MBDebugPanelSimpleComponent.m */, - 9A5DE2A51EA55DC500C90F62 /* MBDebugPanelSimpleSwitchComponent.h */, 9A5DE2A61EA55DC500C90F62 /* MBDebugPanelSimpleSwitchComponent.m */, - 9A5DE2A71EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponent.h */, 9A5DE2A81EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponent.m */, ); path = components; sourceTree = ""; }; - 9A5DE2AC1EA55DC500C90F62 /* private */ = { - isa = PBXGroup; - children = ( - 9A5DE2AD1EA55DC500C90F62 /* MBDebugPanel_Private.h */, - 9A5DE2AE1EA55DC500C90F62 /* MBDebugPanelSimpleComponent_Protected.h */, - ); - path = private; - sourceTree = ""; - }; - 9A5DE2B51EA55DC500C90F62 /* Supporting Files */ = { + 9A5DE2B51EA55DC500C90F62 /* SupportingFiles */ = { isa = PBXGroup; children = ( 9A5DE2B61EA55DC500C90F62 /* Info-iOS.plist */, 9A5DE2BA1EA55DC500C90F62 /* MBDebugPanel.h */, ); - path = "Supporting Files"; + path = SupportingFiles; sourceTree = ""; }; 9A5DE3331EA55DEC00C90F62 /* Tests */ = { @@ -302,6 +311,7 @@ FDCFACE418A49E6800E4AD74 = { isa = PBXGroup; children = ( + 1B2A4CC7255C2C7F00DA9688 /* Package.swift */, 9A5DE2981EA55DC500C90F62 /* Sources */, 9A5DE3331EA55DEC00C90F62 /* Tests */, FDCFACF118A49E9200E4AD74 /* Frameworks */, @@ -462,6 +472,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = FDCFACE418A49E6800E4AD74; @@ -650,7 +661,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(SRCROOT)/Sources/Supporting Files/Info-iOS.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/MBDebugPanel/SupportingFiles/Info-iOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -713,7 +724,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(SRCROOT)/Sources/Supporting Files/Info-iOS.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/MBDebugPanel/SupportingFiles/Info-iOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; diff --git a/MBDebugPanel/MBDebugPanel.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/MBDebugPanel.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from MBDebugPanel/MBDebugPanel.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to MBDebugPanel.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/MBDebugPanel.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/MBDebugPanel.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/MBDebugPanel.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/MBDebugPanel/MBDebugPanel.xcodeproj/xcshareddata/xcschemes/MBDebugPanel iOS.xcscheme b/MBDebugPanel.xcodeproj/xcshareddata/xcschemes/MBDebugPanel iOS.xcscheme similarity index 100% rename from MBDebugPanel/MBDebugPanel.xcodeproj/xcshareddata/xcschemes/MBDebugPanel iOS.xcscheme rename to MBDebugPanel.xcodeproj/xcshareddata/xcschemes/MBDebugPanel iOS.xcscheme diff --git a/MBDebugPanel.xcworkspace/contents.xcworkspacedata b/MBDebugPanel.xcworkspace/contents.xcworkspacedata index 6bbf91c..98a14e4 100644 --- a/MBDebugPanel.xcworkspace/contents.xcworkspacedata +++ b/MBDebugPanel.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:MBDebugPanel.xcodeproj"> diff --git a/MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/Images.xcassets/AppIcon.appiconset/Contents.json b/MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index b8236c6..0000000 --- a/MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Info.plist b/MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Info.plist deleted file mode 100644 index 5860c3f..0000000 --- a/MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - LSRequiresIPhoneOS - - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/LaunchImage.launchimage/Contents.json b/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100644 index c79ebd3..0000000 --- a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "subtype" : "retina4", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/MBAppDelegate.h b/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/MBAppDelegate.h deleted file mode 100644 index 6d92e3f..0000000 --- a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/MBAppDelegate.h +++ /dev/null @@ -1,35 +0,0 @@ -//Copyright (c) 2014 MINDBODY, Inc. -// -//Permission is hereby granted, free of charge, to any person obtaining a copy -//of this software and associated documentation files (the "Software"), to deal -//in the Software without restriction, including without limitation the rights -//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -//copies of the Software, and to permit persons to whom the Software is -//furnished to do so, subject to the following conditions: -// -//The above copyright notice and this permission notice shall be included in -//all copies or substantial portions of the Software. -// -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -//THE SOFTWARE. -// -// -// MBAppDelegate.h -// MBDebugPanelTestsApplicationContainer -// -// Created by Matthew Holden on 2/12/14. -// -// - -#import - -@interface MBAppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - -@end diff --git a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/MBAppDelegate.m b/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/MBAppDelegate.m deleted file mode 100644 index 01f524e..0000000 --- a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/MBAppDelegate.m +++ /dev/null @@ -1,47 +0,0 @@ -//Copyright (c) 2014 MINDBODY, Inc. -// -//Permission is hereby granted, free of charge, to any person obtaining a copy -//of this software and associated documentation files (the "Software"), to deal -//in the Software without restriction, including without limitation the rights -//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -//copies of the Software, and to permit persons to whom the Software is -//furnished to do so, subject to the following conditions: -// -//The above copyright notice and this permission notice shall be included in -//all copies or substantial portions of the Software. -// -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -//THE SOFTWARE. -// -// -// MBAppDelegate.m -// MBDebugPanelTestsApplicationContainer -// -// Created by Matthew Holden on 2/12/14. -// -// - -#import "MBAppDelegate.h" - -@implementation MBAppDelegate - -// This entire "App" is just a test host for the MBDebugPanelTests target, -// When the test target was running independent of a test host (i.e. as a "logic test"), -// UITableView methods were not behaving correctly. Running the tests inside an app -// container solves our troubles. - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions -{ - self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; - // Override point for customization after application launch. - self.window.backgroundColor = [UIColor whiteColor]; - [self.window makeKeyAndVisible]; - [self.window setRootViewController:[UIViewController new]]; - return YES; -} -@end diff --git a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Prefix.pch b/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Prefix.pch deleted file mode 100644 index b0b39a5..0000000 --- a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Prefix.pch +++ /dev/null @@ -1,36 +0,0 @@ -//Copyright (c) 2014 MINDBODY, Inc. -// -//Permission is hereby granted, free of charge, to any person obtaining a copy -//of this software and associated documentation files (the "Software"), to deal -//in the Software without restriction, including without limitation the rights -//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -//copies of the Software, and to permit persons to whom the Software is -//furnished to do so, subject to the following conditions: -// -//The above copyright notice and this permission notice shall be included in -//all copies or substantial portions of the Software. -// -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -//THE SOFTWARE. -// -// -// Prefix header -// -// The contents of this file are implicitly included at the beginning of every source file. -// - -#import - -#ifndef __IPHONE_3_0 -#warning "This project uses features only available in iOS SDK 3.0 and later." -#endif - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/en.lproj/InfoPlist.strings b/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/main.m b/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/main.m deleted file mode 100644 index 07c1038..0000000 --- a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/main.m +++ /dev/null @@ -1,38 +0,0 @@ -//Copyright (c) 2014 MINDBODY, Inc. -// -//Permission is hereby granted, free of charge, to any person obtaining a copy -//of this software and associated documentation files (the "Software"), to deal -//in the Software without restriction, including without limitation the rights -//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -//copies of the Software, and to permit persons to whom the Software is -//furnished to do so, subject to the following conditions: -// -//The above copyright notice and this permission notice shall be included in -//all copies or substantial portions of the Software. -// -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -//THE SOFTWARE. -// -// -// main.m -// MBDebugPanelTestsApplicationContainer -// -// Created by Matthew Holden on 2/12/14. -// -// - -#import - -#import "MBAppDelegate.h" - -int main(int argc, char * argv[]) -{ - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([MBAppDelegate class])); - } -} diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..b2b8a78 --- /dev/null +++ b/Package.swift @@ -0,0 +1,29 @@ +// swift-tools-version:5.3 +// Package.swift +// UXComponents +// +// Created by John Hammerlund on 11/11/20. +// Copyright © 2020 MINDBODY. All rights reserved. +// + +import PackageDescription + +let package = Package( + name: "MBDebugPanel", + platforms: [ + .macOS(.v10_15), + .iOS(.v9), + .tvOS(.v14), + .watchOS(.v7) + ], + products: [ + .library(name: "MBDebugPanel", targets: ["MBDebugPanel"]) + ], + dependencies: [], + targets: [ + .target(name: "MBDebugPanel", + dependencies: [], + exclude: ["SupportingFiles/Info-iOS.plist"], + publicHeadersPath: "Headers") + ] +) diff --git a/MBDebugPanel/Sources/Assets/componentCells/MBDebugPanelSimpleButtonComponentCell.xib b/Sources/MBDebugPanel/Assets/componentCells/MBDebugPanelSimpleButtonComponentCell.xib similarity index 100% rename from MBDebugPanel/Sources/Assets/componentCells/MBDebugPanelSimpleButtonComponentCell.xib rename to Sources/MBDebugPanel/Assets/componentCells/MBDebugPanelSimpleButtonComponentCell.xib diff --git a/MBDebugPanel/Sources/Assets/componentCells/MBDebugPanelSimpleSwitchComponentCell.xib b/Sources/MBDebugPanel/Assets/componentCells/MBDebugPanelSimpleSwitchComponentCell.xib similarity index 100% rename from MBDebugPanel/Sources/Assets/componentCells/MBDebugPanelSimpleSwitchComponentCell.xib rename to Sources/MBDebugPanel/Assets/componentCells/MBDebugPanelSimpleSwitchComponentCell.xib diff --git a/MBDebugPanel/Sources/Assets/componentCells/MBDebugPanelSimpleTextFieldComponentCell.xib b/Sources/MBDebugPanel/Assets/componentCells/MBDebugPanelSimpleTextFieldComponentCell.xib similarity index 100% rename from MBDebugPanel/Sources/Assets/componentCells/MBDebugPanelSimpleTextFieldComponentCell.xib rename to Sources/MBDebugPanel/Assets/componentCells/MBDebugPanelSimpleTextFieldComponentCell.xib diff --git a/MBDebugPanel/Sources/Classes/ios/MBDebugPanel.m b/Sources/MBDebugPanel/Classes/ios/MBDebugPanel.m similarity index 97% rename from MBDebugPanel/Sources/Classes/ios/MBDebugPanel.m rename to Sources/MBDebugPanel/Classes/ios/MBDebugPanel.m index acbfdf7..aeaacb9 100644 --- a/MBDebugPanel/Sources/Classes/ios/MBDebugPanel.m +++ b/Sources/MBDebugPanel/Classes/ios/MBDebugPanel.m @@ -41,6 +41,15 @@ +(MBDebugPanel*)sharedPanel_ return inst; } ++ (NSBundle *)bundle +{ +#ifdef SWIFTPM_MODULE_BUNDLE + return SWIFTPM_MODULE_BUNDLE; +#else + return [NSBundle bundleForClass:self]; +#endif +} + +(void)addComponent:(id)component { [self.sharedPanel_.components addObject:component]; diff --git a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleButtonComponent.m b/Sources/MBDebugPanel/Classes/ios/components/MBDebugPanelSimpleButtonComponent.m similarity index 100% rename from MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleButtonComponent.m rename to Sources/MBDebugPanel/Classes/ios/components/MBDebugPanelSimpleButtonComponent.m diff --git a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleComponent.m b/Sources/MBDebugPanel/Classes/ios/components/MBDebugPanelSimpleComponent.m similarity index 95% rename from MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleComponent.m rename to Sources/MBDebugPanel/Classes/ios/components/MBDebugPanelSimpleComponent.m index 83d75d0..00e4a31 100644 --- a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleComponent.m +++ b/Sources/MBDebugPanel/Classes/ios/components/MBDebugPanelSimpleComponent.m @@ -27,6 +27,7 @@ // #import "MBDebugPanel.h" +#import "MBDebugPanel_Private.h" #import "MBDebugPanelSimpleComponent.h" #import "MBDebugPanelSimpleButtonComponent.h" @@ -68,7 +69,7 @@ -(UITableViewCell*)dummyCellInstance_ -(UINib*)cellNib_ { - return [UINib nibWithNibName:[self cellClassName] bundle:[NSBundle bundleForClass:[MBDebugPanel class]]]; + return [UINib nibWithNibName:[self cellClassName] bundle:[MBDebugPanel bundle]]; } -(void)bindToReusableCell:(UITableViewCell*)cell diff --git a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleSwitchComponent.m b/Sources/MBDebugPanel/Classes/ios/components/MBDebugPanelSimpleSwitchComponent.m similarity index 100% rename from MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleSwitchComponent.m rename to Sources/MBDebugPanel/Classes/ios/components/MBDebugPanelSimpleSwitchComponent.m diff --git a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.m b/Sources/MBDebugPanel/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.m similarity index 100% rename from MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.m rename to Sources/MBDebugPanel/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.m diff --git a/MBDebugPanel/Sources/Classes/ios/MBDebugPanel.h b/Sources/MBDebugPanel/Headers/MBDebugPanel.h similarity index 100% rename from MBDebugPanel/Sources/Classes/ios/MBDebugPanel.h rename to Sources/MBDebugPanel/Headers/MBDebugPanel.h diff --git a/MBDebugPanel/Sources/Classes/ios/MBDebugPanelComponent.h b/Sources/MBDebugPanel/Headers/MBDebugPanelComponent.h similarity index 98% rename from MBDebugPanel/Sources/Classes/ios/MBDebugPanelComponent.h rename to Sources/MBDebugPanel/Headers/MBDebugPanelComponent.h index f83971f..c6b1128 100644 --- a/MBDebugPanel/Sources/Classes/ios/MBDebugPanelComponent.h +++ b/Sources/MBDebugPanel/Headers/MBDebugPanelComponent.h @@ -26,7 +26,7 @@ // // -#import +#import /** Custom components need only implement the two methods provided by this protocol. diff --git a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleButtonComponent.h b/Sources/MBDebugPanel/Headers/MBDebugPanelSimpleButtonComponent.h similarity index 100% rename from MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleButtonComponent.h rename to Sources/MBDebugPanel/Headers/MBDebugPanelSimpleButtonComponent.h diff --git a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleComponent.h b/Sources/MBDebugPanel/Headers/MBDebugPanelSimpleComponent.h similarity index 100% rename from MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleComponent.h rename to Sources/MBDebugPanel/Headers/MBDebugPanelSimpleComponent.h diff --git a/MBDebugPanel/Sources/Classes/ios/private/MBDebugPanelSimpleComponent_Protected.h b/Sources/MBDebugPanel/Headers/MBDebugPanelSimpleComponent_Protected.h similarity index 100% rename from MBDebugPanel/Sources/Classes/ios/private/MBDebugPanelSimpleComponent_Protected.h rename to Sources/MBDebugPanel/Headers/MBDebugPanelSimpleComponent_Protected.h diff --git a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleSwitchComponent.h b/Sources/MBDebugPanel/Headers/MBDebugPanelSimpleSwitchComponent.h similarity index 100% rename from MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleSwitchComponent.h rename to Sources/MBDebugPanel/Headers/MBDebugPanelSimpleSwitchComponent.h diff --git a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.h b/Sources/MBDebugPanel/Headers/MBDebugPanelSimpleTextFieldComponent.h similarity index 100% rename from MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.h rename to Sources/MBDebugPanel/Headers/MBDebugPanelSimpleTextFieldComponent.h diff --git a/MBDebugPanel/Sources/Classes/ios/private/MBDebugPanel_Private.h b/Sources/MBDebugPanel/Headers/MBDebugPanel_Private.h similarity index 98% rename from MBDebugPanel/Sources/Classes/ios/private/MBDebugPanel_Private.h rename to Sources/MBDebugPanel/Headers/MBDebugPanel_Private.h index 509c53f..b73b13b 100644 --- a/MBDebugPanel/Sources/Classes/ios/private/MBDebugPanel_Private.h +++ b/Sources/MBDebugPanel/Headers/MBDebugPanel_Private.h @@ -33,4 +33,5 @@ @property (nonatomic, getter = isPresented) BOOL presented; @property (nonatomic) UIViewController *wrappingViewController; +(MBDebugPanel*)sharedPanel_; ++ (NSBundle *)bundle; @end diff --git a/MBDebugPanel/Sources/Supporting Files/Info-iOS.plist b/Sources/MBDebugPanel/SupportingFiles/Info-iOS.plist similarity index 100% rename from MBDebugPanel/Sources/Supporting Files/Info-iOS.plist rename to Sources/MBDebugPanel/SupportingFiles/Info-iOS.plist diff --git a/MBDebugPanel/Sources/Supporting Files/MBDebugPanel.h b/Sources/MBDebugPanel/SupportingFiles/MBDebugPanel.h similarity index 100% rename from MBDebugPanel/Sources/Supporting Files/MBDebugPanel.h rename to Sources/MBDebugPanel/SupportingFiles/MBDebugPanel.h diff --git a/MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelSimpleComponentTests.m b/Tests/MBDebugPanelTests/MBDebugPanelSimpleComponentTests.m similarity index 100% rename from MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelSimpleComponentTests.m rename to Tests/MBDebugPanelTests/MBDebugPanelSimpleComponentTests.m diff --git a/MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelTests-Info.plist b/Tests/MBDebugPanelTests/MBDebugPanelTests-Info.plist similarity index 100% rename from MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelTests-Info.plist rename to Tests/MBDebugPanelTests/MBDebugPanelTests-Info.plist diff --git a/MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelTests-Prefix.pch b/Tests/MBDebugPanelTests/MBDebugPanelTests-Prefix.pch similarity index 100% rename from MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelTests-Prefix.pch rename to Tests/MBDebugPanelTests/MBDebugPanelTests-Prefix.pch diff --git a/MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelTests.m b/Tests/MBDebugPanelTests/MBDebugPanelTests.m similarity index 100% rename from MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelTests.m rename to Tests/MBDebugPanelTests/MBDebugPanelTests.m diff --git a/MBDebugPanel/Tests/MBDebugPanelTests/Supporting Files/Info-Tests-iOS.plist b/Tests/MBDebugPanelTests/Supporting Files/Info-Tests-iOS.plist similarity index 100% rename from MBDebugPanel/Tests/MBDebugPanelTests/Supporting Files/Info-Tests-iOS.plist rename to Tests/MBDebugPanelTests/Supporting Files/Info-Tests-iOS.plist diff --git a/MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/en.lproj/InfoPlist.strings b/Tests/MBDebugPanelTests/en.lproj/InfoPlist.strings similarity index 100% rename from MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/en.lproj/InfoPlist.strings rename to Tests/MBDebugPanelTests/en.lproj/InfoPlist.strings diff --git a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/AppIcon.appiconset/Contents.json b/Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/AppIcon.appiconset/Contents.json rename to Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/Images.xcassets/LaunchImage.launchimage/Contents.json b/Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/LaunchImage.launchimage/Contents.json similarity index 100% rename from MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/Images.xcassets/LaunchImage.launchimage/Contents.json rename to Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/LaunchImage.launchimage/Contents.json diff --git a/MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/MBAppDelegate.h b/Tests/MBDebugPanelTestsApplicationContainer/MBAppDelegate.h similarity index 100% rename from MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/MBAppDelegate.h rename to Tests/MBDebugPanelTestsApplicationContainer/MBAppDelegate.h diff --git a/MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/MBAppDelegate.m b/Tests/MBDebugPanelTestsApplicationContainer/MBAppDelegate.m similarity index 100% rename from MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/MBAppDelegate.m rename to Tests/MBDebugPanelTestsApplicationContainer/MBAppDelegate.m diff --git a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Info.plist b/Tests/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Info.plist similarity index 100% rename from MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Info.plist rename to Tests/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Info.plist diff --git a/MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Prefix.pch b/Tests/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Prefix.pch similarity index 100% rename from MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Prefix.pch rename to Tests/MBDebugPanelTestsApplicationContainer/MBDebugPanelTestsApplicationContainer-Prefix.pch diff --git a/MBDebugPanel/Tests/MBDebugPanelTests/en.lproj/InfoPlist.strings b/Tests/MBDebugPanelTestsApplicationContainer/en.lproj/InfoPlist.strings similarity index 100% rename from MBDebugPanel/Tests/MBDebugPanelTests/en.lproj/InfoPlist.strings rename to Tests/MBDebugPanelTestsApplicationContainer/en.lproj/InfoPlist.strings diff --git a/MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/main.m b/Tests/MBDebugPanelTestsApplicationContainer/main.m similarity index 100% rename from MBDebugPanel/Sources/Classes/MBDebugPanelTestsApplicationContainer/main.m rename to Tests/MBDebugPanelTestsApplicationContainer/main.m