Skip to content

Commit

Permalink
swift5 migration
Browse files Browse the repository at this point in the history
  • Loading branch information
@daisuke0131
daisuke0131 committed Oct 21, 2020
1 parent f556ca8 commit bd9c562
Show file tree
Hide file tree
Showing 5 changed files with 223 additions and 155 deletions.
82 changes: 73 additions & 9 deletions Example/ViewMonitorExample/ViewMonitorExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
1BC3F4FF1B2FB0A800CEB59D /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1BC3F4FD1B2FB0A800CEB59D /* LaunchScreen.xib */; };
1BC3F50B1B2FB0A800CEB59D /* ViewMonitorExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BC3F50A1B2FB0A800CEB59D /* ViewMonitorExampleTests.swift */; };
2F74D0D460754588FC45A906 /* Pods_ViewMonitorExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A63BCEDEF9BE09E8CD58B0F /* Pods_ViewMonitorExample.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
FBBC04FE444D6D0929B2CFD2 /* Pods_ViewMonitorExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA02CE4E8B0FEE387CA23C63 /* Pods_ViewMonitorExampleTests.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -39,6 +40,9 @@
1BC3F50A1B2FB0A800CEB59D /* ViewMonitorExampleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewMonitorExampleTests.swift; sourceTree = "<group>"; };
5C903C39667736E61D7560CF /* Pods-ViewMonitorExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ViewMonitorExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ViewMonitorExample/Pods-ViewMonitorExample.debug.xcconfig"; sourceTree = "<group>"; };
8A63BCEDEF9BE09E8CD58B0F /* Pods_ViewMonitorExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ViewMonitorExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
AB14C5DFD051D47A1E5B1F8E /* Pods-ViewMonitorExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ViewMonitorExampleTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ViewMonitorExampleTests/Pods-ViewMonitorExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
D245EAAD392D5714256B6A60 /* Pods-ViewMonitorExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ViewMonitorExampleTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ViewMonitorExampleTests/Pods-ViewMonitorExampleTests.release.xcconfig"; sourceTree = "<group>"; };
DA02CE4E8B0FEE387CA23C63 /* Pods_ViewMonitorExampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ViewMonitorExampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F3E176C3D1DBA5F0347176AF /* Pods-ViewMonitorExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ViewMonitorExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-ViewMonitorExample/Pods-ViewMonitorExample.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -55,6 +59,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FBBC04FE444D6D0929B2CFD2 /* Pods_ViewMonitorExampleTests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -124,6 +129,8 @@
children = (
5C903C39667736E61D7560CF /* Pods-ViewMonitorExample.debug.xcconfig */,
F3E176C3D1DBA5F0347176AF /* Pods-ViewMonitorExample.release.xcconfig */,
AB14C5DFD051D47A1E5B1F8E /* Pods-ViewMonitorExampleTests.debug.xcconfig */,
D245EAAD392D5714256B6A60 /* Pods-ViewMonitorExampleTests.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand All @@ -132,6 +139,7 @@
isa = PBXGroup;
children = (
8A63BCEDEF9BE09E8CD58B0F /* Pods_ViewMonitorExample.framework */,
DA02CE4E8B0FEE387CA23C63 /* Pods_ViewMonitorExampleTests.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -143,12 +151,13 @@
isa = PBXNativeTarget;
buildConfigurationList = 1BC3F50E1B2FB0A800CEB59D /* Build configuration list for PBXNativeTarget "ViewMonitorExample" */;
buildPhases = (
E90476D31C2C877D9230482D /* [CP] Check Pods Manifest.lock */,
1C91E50915256394DB37751A /* Check Pods Manifest.lock */,
1BC3F4EB1B2FB0A800CEB59D /* Sources */,
1BC3F4EC1B2FB0A800CEB59D /* Frameworks */,
1BC3F4ED1B2FB0A800CEB59D /* Resources */,
BDF6FB28E5DDB94D2ED2FAD9 /* Embed Pods Frameworks */,
1B85D21E4F01A319A3252D8B /* Copy Pods Resources */,
E8B3A4F95A18915AD38165E3 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -163,6 +172,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 1BC3F5111B2FB0A800CEB59D /* Build configuration list for PBXNativeTarget "ViewMonitorExampleTests" */;
buildPhases = (
A6D9EEF08415A516356CF47B /* [CP] Check Pods Manifest.lock */,
1BC3F5001B2FB0A800CEB59D /* Sources */,
1BC3F5011B2FB0A800CEB59D /* Frameworks */,
1BC3F5021B2FB0A800CEB59D /* Resources */,
Expand Down Expand Up @@ -200,6 +210,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -235,34 +246,41 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
1B85D21E4F01A319A3252D8B /* Copy Pods Resources */ = {
1C91E50915256394DB37751A /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ViewMonitorExample/Pods-ViewMonitorExample-resources.sh\"\n";
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";
showEnvVarsInLog = 0;
};
1C91E50915256394DB37751A /* Check Pods Manifest.lock */ = {
A6D9EEF08415A516356CF47B /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
name = "Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-ViewMonitorExampleTests-checkManifestLockResult.txt",
);
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_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;
};
BDF6FB28E5DDB94D2ED2FAD9 /* Embed Pods Frameworks */ = {
Expand All @@ -280,6 +298,46 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ViewMonitorExample/Pods-ViewMonitorExample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E8B3A4F95A18915AD38165E3 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ViewMonitorExample/Pods-ViewMonitorExample-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/ViewMonitor/ViewMonitor.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ViewMonitor.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ViewMonitorExample/Pods-ViewMonitorExample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E90476D31C2C877D9230482D /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-ViewMonitorExample-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -366,7 +424,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -405,7 +463,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -418,9 +476,11 @@
baseConfigurationReference = 5C903C39667736E61D7560CF /* Pods-ViewMonitorExample.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = ViewMonitorExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -429,14 +489,17 @@
baseConfigurationReference = F3E176C3D1DBA5F0347176AF /* Pods-ViewMonitorExample.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = ViewMonitorExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
};
name = Release;
};
1BC3F5121B2FB0A800CEB59D /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = AB14C5DFD051D47A1E5B1F8E /* Pods-ViewMonitorExampleTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -456,6 +519,7 @@
};
1BC3F5131B2FB0A800CEB59D /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D245EAAD392D5714256B6A60 /* Pods-ViewMonitorExampleTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
Expand Down
30 changes: 2 additions & 28 deletions Example/ViewMonitorExample/ViewMonitorExample/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,10 @@ import ViewMonitor
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?


func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
// Override point for customization after application launch.

func applicationDidFinishLaunching(_ application: UIApplication) {
ViewMonitor.start()
return true
}

func applicationWillResignActive(application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
}

func applicationDidEnterBackground(application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}

func applicationWillEnterForeground(application: UIApplication) {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
}

func applicationDidBecomeActive(application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}

func applicationWillTerminate(application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}


}

84 changes: 57 additions & 27 deletions ...le/ViewMonitorExample/ViewMonitorExample/Images.xcassets/AppIcon.appiconset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,67 +2,97 @@
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
"scale" : "2x",
"size" : "20x20"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
"scale" : "3x",
"size" : "20x20"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
"scale" : "3x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
"scale" : "3x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
"scale" : "2x",
"size" : "20x20"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
"scale" : "1x",
"size" : "29x29"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
"scale" : "1x",
"size" : "40x40"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
"scale" : "1x",
"size" : "76x76"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Loading

0 comments on commit bd9c562

Please sign in to comment.