From df0bdf449003a6595393839af9b8a2720a2cfa19 Mon Sep 17 00:00:00 2001 From: Tomoki Yamashita Date: Mon, 12 Nov 2018 14:11:59 +0900 Subject: [PATCH 1/2] gibo dump macOS Xcode Swift > .gitignore --- .gitignore | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 136 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 09eaebb..b7bbb0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,35 @@ -# Created by https://www.gitignore.io/api/swift,objective-c +### https://raw.github.com/github/gitignore/f2bd62d680e2c17027525caf5fd67aa1b3e8ae03/Global/macOS.gitignore + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + + +### https://raw.github.com/github/gitignore/f2bd62d680e2c17027525caf5fd67aa1b3e8ae03/Global/Xcode.gitignore -### Swift ### # Xcode # # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore @@ -22,11 +51,14 @@ xcuserdata/ ## Other *.moved-aside -*.xcuserstate +*.xccheckout +*.xcscmblueprint ## Obj-C/Swift specific *.hmap *.ipa +*.dSYM.zip +*.dSYM ## Playgrounds timeline.xctimeline @@ -36,6 +68,8 @@ playground.xcworkspace # # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. # Packages/ +# Package.pins +# Package.resolved .build/ # CocoaPods @@ -44,7 +78,10 @@ playground.xcworkspace # you should judge for yourself, the pros and cons are mentioned at: # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control # -Pods/ +# Pods/ +# +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace # Carthage # @@ -55,12 +92,104 @@ Carthage/Build # fastlane # -# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the # screenshots whenever they are needed. # For more information about the recommended setup visit: -# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md +# https://docs.fastlane.tools/best-practices/source-control/#source-control fastlane/report.xml -fastlane/screenshots +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +# +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ + + + +### https://raw.github.com/github/gitignore/f2bd62d680e2c17027525caf5fd67aa1b3e8ae03/Swift.gitignore + +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## Build generated +build/ +DerivedData/ + +## Various settings +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata/ + +## Other +*.moved-aside +*.xccheckout +*.xcscmblueprint + +## Obj-C/Swift specific +*.hmap +*.ipa +*.dSYM.zip +*.dSYM + +## Playgrounds +timeline.xctimeline +playground.xcworkspace + +# Swift Package Manager +# +# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. +# Packages/ +# Package.pins +# Package.resolved +.build/ + +# CocoaPods +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# +# Pods/ +# +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace + +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +# +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ From 8967952c02e5ee38d5b77097823a51f493f018c5 Mon Sep 17 00:00:00 2001 From: Tomoki Yamashita Date: Mon, 12 Nov 2018 14:51:01 +0900 Subject: [PATCH 2/2] Split projects to support modern build system --- Demo/Demo.xcodeproj/project.pbxproj | 12 ++++ ScrollingFollowView.xcodeproj/project.pbxproj | 55 ------------------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++ .../xcshareddata/WorkspaceSettings.xcsettings | 5 ++ .../contents.xcworkspacedata | 10 ++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++ .../xcshareddata/WorkspaceSettings.xcsettings | 5 ++ 7 files changed, 48 insertions(+), 55 deletions(-) create mode 100644 ScrollingFollowView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ScrollingFollowView.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ScrollingFollowView.xcworkspace/contents.xcworkspacedata create mode 100644 ScrollingFollowView.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ScrollingFollowView.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj index b289313..a424a96 100644 --- a/Demo/Demo.xcodeproj/project.pbxproj +++ b/Demo/Demo.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 29F9EA3B1D42095400A9E9BC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29F9EA3A1D42095400A9E9BC /* Assets.xcassets */; }; 29F9EA3E1D42095400A9E9BC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29F9EA3C1D42095400A9E9BC /* LaunchScreen.storyboard */; }; 29F9EA6F1D42161500A9E9BC /* ScrollingFollowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29F9EA6E1D42161400A9E9BC /* ScrollingFollowView.swift */; }; + 7E29FCE621994061004CF035 /* ScrollingFollowView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E29FCE521994061004CF035 /* ScrollingFollowView.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -24,6 +25,7 @@ 29F9EA3D1D42095400A9E9BC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 29F9EA3F1D42095400A9E9BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 29F9EA6E1D42161400A9E9BC /* ScrollingFollowView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ScrollingFollowView.swift; path = ../../ScrollingFollowView/ScrollingFollowView.swift; sourceTree = ""; }; + 7E29FCE521994061004CF035 /* ScrollingFollowView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ScrollingFollowView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -31,6 +33,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7E29FCE621994061004CF035 /* ScrollingFollowView.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -42,6 +45,7 @@ children = ( 29F9EA321D42095400A9E9BC /* Demo */, 29F9EA311D42095400A9E9BC /* Products */, + 7E29FCE421994061004CF035 /* Frameworks */, ); sourceTree = ""; }; @@ -67,6 +71,14 @@ path = Demo; sourceTree = ""; }; + 7E29FCE421994061004CF035 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 7E29FCE521994061004CF035 /* ScrollingFollowView.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ diff --git a/ScrollingFollowView.xcodeproj/project.pbxproj b/ScrollingFollowView.xcodeproj/project.pbxproj index 5a45bd1..0ed964c 100644 --- a/ScrollingFollowView.xcodeproj/project.pbxproj +++ b/ScrollingFollowView.xcodeproj/project.pbxproj @@ -11,22 +11,8 @@ 291F7BCB1D40E7C90024374A /* ScrollingFollowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291F7BCA1D40E7C90024374A /* ScrollingFollowView.swift */; }; 29F9EA1B1D4208CF00A9E9BC /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29F9EA121D4208CF00A9E9BC /* ViewController.swift */; }; 29F9EA1E1D4208CF00A9E9BC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29F9EA181D4208CF00A9E9BC /* AppDelegate.swift */; }; - 29F9EA1F1D4208CF00A9E9BC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29F9EA191D4208CF00A9E9BC /* Assets.xcassets */; }; - 29F9EA201D4208CF00A9E9BC /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 29F9EA1A1D4208CF00A9E9BC /* Info.plist */; }; - 29F9EA251D4208DB00A9E9BC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29F9EA211D4208DB00A9E9BC /* LaunchScreen.storyboard */; }; - 29F9EA261D4208DB00A9E9BC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29F9EA231D4208DB00A9E9BC /* Main.storyboard */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 299E0B201D8FC28B001C5B2C /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29F9EA461D420A0B00A9E9BC /* Demo.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 29F9EA301D42095400A9E9BC; - remoteInfo = Demo; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 291F7B5A1D40E6230024374A /* ScrollingFollowView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ScrollingFollowView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 291F7B5D1D40E6230024374A /* ScrollingFollowView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScrollingFollowView.h; sourceTree = ""; }; @@ -38,7 +24,6 @@ 29F9EA1A1D4208CF00A9E9BC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 29F9EA221D4208DB00A9E9BC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 29F9EA241D4208DB00A9E9BC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 29F9EA461D420A0B00A9E9BC /* Demo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Demo.xcodeproj; path = Demo/Demo.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -56,7 +41,6 @@ isa = PBXGroup; children = ( 291F7BB11D40E7740024374A /* Demo */, - 29F9EA461D420A0B00A9E9BC /* Demo.xcodeproj */, 291F7B5C1D40E6230024374A /* ScrollingFollowView */, 291F7B5B1D40E6230024374A /* Products */, ); @@ -101,14 +85,6 @@ path = Demo; sourceTree = ""; }; - 299E0B1D1D8FC286001C5B2C /* Products */ = { - isa = PBXGroup; - children = ( - 299E0B211D8FC28B001C5B2C /* Demo.app */, - ); - name = Products; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -130,7 +106,6 @@ 291F7B551D40E6230024374A /* Sources */, 291F7B561D40E6230024374A /* Frameworks */, 291F7B571D40E6230024374A /* Headers */, - 291F7B581D40E6230024374A /* Resources */, ); buildRules = ( ); @@ -167,12 +142,6 @@ mainGroup = 291F7B501D40E6230024374A; productRefGroup = 291F7B5B1D40E6230024374A /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 299E0B1D1D8FC286001C5B2C /* Products */; - ProjectRef = 29F9EA461D420A0B00A9E9BC /* Demo.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 291F7B591D40E6230024374A /* ScrollingFollowView */, @@ -180,30 +149,6 @@ }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 299E0B211D8FC28B001C5B2C /* Demo.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = Demo.app; - remoteRef = 299E0B201D8FC28B001C5B2C /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - -/* Begin PBXResourcesBuildPhase section */ - 291F7B581D40E6230024374A /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 29F9EA251D4208DB00A9E9BC /* LaunchScreen.storyboard in Resources */, - 29F9EA201D4208CF00A9E9BC /* Info.plist in Resources */, - 29F9EA1F1D4208CF00A9E9BC /* Assets.xcassets in Resources */, - 29F9EA261D4208DB00A9E9BC /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 291F7B551D40E6230024374A /* Sources */ = { isa = PBXSourcesBuildPhase; diff --git a/ScrollingFollowView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ScrollingFollowView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ScrollingFollowView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ScrollingFollowView.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ScrollingFollowView.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..0c67376 --- /dev/null +++ b/ScrollingFollowView.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,5 @@ + + + + + diff --git a/ScrollingFollowView.xcworkspace/contents.xcworkspacedata b/ScrollingFollowView.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..c61adfb --- /dev/null +++ b/ScrollingFollowView.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/ScrollingFollowView.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ScrollingFollowView.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ScrollingFollowView.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ScrollingFollowView.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ScrollingFollowView.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..0c67376 --- /dev/null +++ b/ScrollingFollowView.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,5 @@ + + + + +