From 903a178c4ca145a3d006a3b8cf0a4debc03d2132 Mon Sep 17 00:00:00 2001 From: Florian Friedrich Date: Thu, 1 Oct 2020 15:39:45 +0200 Subject: [PATCH 1/7] Update schemes and project files with Xcode 12 --- Integration/Integration.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/iOSFrameworkIntegration.xcscheme | 2 +- .../xcshareddata/xcschemes/iOSStaticLibraryIntegration.xcscheme | 2 +- .../xcshareddata/xcschemes/iOSSwiftIntegration.xcscheme | 2 +- .../xcshareddata/xcschemes/macOSSwiftIntegration.xcscheme | 2 +- .../xcshareddata/xcschemes/tvOSSwiftIntegration.xcscheme | 2 +- .../xcschemes/watchOSSwiftIntegration (Notification).xcscheme | 2 +- .../xcshareddata/xcschemes/watchOSSwiftIntegration.xcscheme | 2 +- Lumberjack.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/CocoaLumberjack-Static.xcscheme | 2 +- .../xcshareddata/xcschemes/CocoaLumberjack.xcscheme | 2 +- .../xcshareddata/xcschemes/CocoaLumberjackSwift.xcscheme | 2 +- Tests/Tests.xcodeproj/project.pbxproj | 2 +- .../Tests.xcodeproj/xcshareddata/xcschemes/OS X Tests.xcscheme | 2 +- .../Tests.xcodeproj/xcshareddata/xcschemes/Swift Tests.xcscheme | 2 +- Tests/Tests.xcodeproj/xcshareddata/xcschemes/iOS Tests.xcscheme | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Integration/Integration.xcodeproj/project.pbxproj b/Integration/Integration.xcodeproj/project.pbxproj index 0ce3d29f1..a3edca725 100644 --- a/Integration/Integration.xcodeproj/project.pbxproj +++ b/Integration/Integration.xcodeproj/project.pbxproj @@ -517,7 +517,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1000; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = CocoaLumberjack; TargetAttributes = { 0A87D3C32175E56200BD0C4C = { diff --git a/Integration/Integration.xcodeproj/xcshareddata/xcschemes/iOSFrameworkIntegration.xcscheme b/Integration/Integration.xcodeproj/xcshareddata/xcschemes/iOSFrameworkIntegration.xcscheme index 03313b916..8918a706a 100644 --- a/Integration/Integration.xcodeproj/xcshareddata/xcschemes/iOSFrameworkIntegration.xcscheme +++ b/Integration/Integration.xcodeproj/xcshareddata/xcschemes/iOSFrameworkIntegration.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 1 Oct 2020 15:42:10 +0200 Subject: [PATCH 2/7] Cleanup podspec --- CocoaLumberjack.podspec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CocoaLumberjack.podspec b/CocoaLumberjack.podspec index cce1314ab..1bfac9eac 100644 --- a/CocoaLumberjack.podspec +++ b/CocoaLumberjack.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| s.name = 'CocoaLumberjack' s.version = '3.6.2' s.license = 'BSD' - s.summary = 'A fast & simple, yet powerful & flexible logging framework for Mac and iOS.' + s.summary = 'A fast & simple, yet powerful & flexible logging framework for Mac, iOS, tvOS and watchOS.' s.homepage = 'https://github.com/CocoaLumberjack/CocoaLumberjack' s.author = { 'Robbie Hanson' => 'robbiehanson@deusty.com' } s.source = { :git => 'https://github.com/CocoaLumberjack/CocoaLumberjack.git', @@ -14,8 +14,6 @@ Pod::Spec.new do |s| 'such as multi-threading, grand central dispatch (if available), lockless ' \ 'atomic operations, and the dynamic nature of the objective-c runtime.' - s.requires_arc = true - s.preserve_paths = 'README.md' s.ios.deployment_target = '9.0' @@ -24,6 +22,7 @@ Pod::Spec.new do |s| s.tvos.deployment_target = '9.0' s.cocoapods_version = '>= 1.4.0' + s.requires_arc = true s.swift_version = '5.0' s.default_subspecs = 'Core' @@ -37,5 +36,4 @@ Pod::Spec.new do |s| ss.dependency 'CocoaLumberjack/Core' ss.source_files = 'Sources/CocoaLumberjackSwift/**/*.swift', 'Sources/CocoaLumberjackSwiftSupport/include/**/*.{h}' end - end From d8623baf183142183a6146f70ed0ee9210acd7d8 Mon Sep 17 00:00:00 2001 From: Florian Friedrich Date: Thu, 1 Oct 2020 15:42:17 +0200 Subject: [PATCH 3/7] Set version to 3.7.0 --- CocoaLumberjack.podspec | 2 +- Configs/Module-Shared.xcconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CocoaLumberjack.podspec b/CocoaLumberjack.podspec index 1bfac9eac..0f63497ba 100644 --- a/CocoaLumberjack.podspec +++ b/CocoaLumberjack.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'CocoaLumberjack' - s.version = '3.6.2' + s.version = '3.7.0' s.license = 'BSD' s.summary = 'A fast & simple, yet powerful & flexible logging framework for Mac, iOS, tvOS and watchOS.' s.homepage = 'https://github.com/CocoaLumberjack/CocoaLumberjack' diff --git a/Configs/Module-Shared.xcconfig b/Configs/Module-Shared.xcconfig index 8915a8bd1..d00722110 100644 --- a/Configs/Module-Shared.xcconfig +++ b/Configs/Module-Shared.xcconfig @@ -200,7 +200,7 @@ LIBRARY_SEARCH_PATHS = $(inherited) // Code will load on this and later versions of macOS. Framework APIs that are unavailable in earlier versions will be weak-linked; your code should check for null function pointers or specific system versions before calling newer APIs. MACOSX_DEPLOYMENT_TARGET = 10.10 -MARKETING_VERSION = 3.6.2 +MARKETING_VERSION = 3.7.0 OTHER_C_FLAGS = -Wextra From 859b40c919c012a3ca642c220483bb18ce4b8f0a Mon Sep 17 00:00:00 2001 From: Florian Friedrich Date: Thu, 1 Oct 2020 15:43:41 +0200 Subject: [PATCH 4/7] Update CHANGELOG --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76902a589..33bdc3c93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -## [3.7.0 - Xcode 12 on ???, 2020](https://github.com/CocoaLumberjack/CocoaLumberjack/releases/tag/3.7.0) +## [3.7.1 - Xcode 12 on ???, 2020](https://github.com/CocoaLumberjack/CocoaLumberjack/releases/tag/3.7.0) + +### Public + +- _TBD_ + +## [3.7.0 - Xcode 12 on Oct 2nd, 2020](https://github.com/CocoaLumberjack/CocoaLumberjack/releases/tag/3.7.0) ### Public From c876252e8f473dfd7caf3c57238fa1fa3fdf0581 Mon Sep 17 00:00:00 2001 From: Florian Friedrich Date: Thu, 1 Oct 2020 15:45:47 +0200 Subject: [PATCH 5/7] Update README --- CocoaLumberjack.podspec | 2 +- README.md | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CocoaLumberjack.podspec b/CocoaLumberjack.podspec index 0f63497ba..6450f187c 100644 --- a/CocoaLumberjack.podspec +++ b/CocoaLumberjack.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| s.name = 'CocoaLumberjack' s.version = '3.7.0' s.license = 'BSD' - s.summary = 'A fast & simple, yet powerful & flexible logging framework for Mac, iOS, tvOS and watchOS.' + s.summary = 'A fast & simple, yet powerful & flexible logging framework for macOS, iOS, tvOS and watchOS.' s.homepage = 'https://github.com/CocoaLumberjack/CocoaLumberjack' s.author = { 'Robbie Hanson' => 'robbiehanson@deusty.com' } s.source = { :git => 'https://github.com/CocoaLumberjack/CocoaLumberjack.git', diff --git a/README.md b/README.md index 1bc2f2c01..dd3d4838d 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ CocoaLumberjack [![codebeat badge](https://codebeat.co/badges/840b714a-c8f3-4936-ada4-363473cd4e6b)](https://codebeat.co/projects/github-com-cocoalumberjack-cocoalumberjack-master) -**CocoaLumberjack** is a fast & simple, yet powerful & flexible logging framework for Mac and iOS. +**CocoaLumberjack** is a fast & simple, yet powerful & flexible logging framework for macOS, iOS, tvOS and watchOS. ### How to get started @@ -60,7 +60,7 @@ As of CocoaLumberjack 3.6.0, you can use the Swift Package Manager as integratio If you want to use the Swift Package Manager as integration method, either use Xcode to add the package dependency or add the following dependency to your Package.swift: ```swift -.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", from: "3.6.0"), +.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", from: "3.7.0"), ``` Note that you may need to add both products, `CocoaLumberjack` and `CocoaLumberjackSwift` to your target since SPM sometimes fails to detect that `CocoaLumerjackSwift` depends on `CocoaLumberjack`. @@ -180,14 +180,15 @@ Configure your logging however you want. Change log levels per file (perfect for ### Requirements The current version of Lumberjack requires: -- Xcode 11 or later -- Swift 5.0 or later +- Xcode 12 or later +- Swift 5.3 or later - iOS 9 or later - macOS 10.10 or later - watchOS 3 or later - tvOS 9 or later #### Backwards compatibility +- for Xcode 11 and Swift up to 5.2, use the 3.6.2 version - for Xcode 10 and Swift 4.2, use the 3.5.2 version - for iOS 8, use the 3.6.1 version - for iOS 6, iOS 7, OS X 10.8, OS X 10.9 and Xcode 9, use the 3.4.2 version From 4043a1143f7269eeaed640f5f3dc6c3e29948a65 Mon Sep 17 00:00:00 2001 From: Florian Friedrich Date: Thu, 1 Oct 2020 15:55:55 +0200 Subject: [PATCH 6/7] Fix project file check in Dangerfile --- Dangerfile.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dangerfile.swift b/Dangerfile.swift index 2ad2de321..2240e03dd 100644 --- a/Dangerfile.swift +++ b/Dangerfile.swift @@ -70,7 +70,8 @@ SwiftLint.lint(.modifiedAndCreatedFiles(directory: "Sources")) // Added (or removed) library files need to be added (or removed) from the // Carthage Xcode project to avoid breaking things for our Carthage users. -let xcodeProjectWasModified = git.modifiedFiles.contains("Lumberjack.xcodeproj") +let xcodeProjectFile: Danger.File = "Lumberjack.xcodeproj/project.pbxproj" +let xcodeProjectWasModified = git.modifiedFiles.contains(xcodeProjectFile) if (git.createdFiles + git.deletedFiles).contains(where: { $0.isInSources && $0.isSourceFile && !$0.isSPMOnlySourceFile }) && !xcodeProjectWasModified { fail("Added or removed library files require the Carthage Xcode project to be updated.") @@ -110,7 +111,7 @@ if xcodeProjectWasModified { "TARGETED_DEVICE_FAMILY", "WRAPPER_EXTENSION", ] - ["Lumberjack.xcodeproj/project.pbxproj"] + [xcodeProjectFile] .lazy .filter { FileManager.default.fileExists(atPath: $0) } .forEach { projectFile in From 1cefe898c4b3b24f57f397a7ffa36525d6531425 Mon Sep 17 00:00:00 2001 From: Florian Friedrich Date: Thu, 1 Oct 2020 16:02:17 +0200 Subject: [PATCH 7/7] Update Xcode projects to require Xcode 10+ --- .../Integration.xcodeproj/project.pbxproj | 4 +-- Lumberjack.xcodeproj/project.pbxproj | 15 ++-------- Tests/Tests.xcodeproj/project.pbxproj | 28 +++++++++++++++---- .../contents.xcworkspacedata | 3 -- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Integration/Integration.xcodeproj/project.pbxproj b/Integration/Integration.xcodeproj/project.pbxproj index a3edca725..df2787d90 100644 --- a/Integration/Integration.xcodeproj/project.pbxproj +++ b/Integration/Integration.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -547,7 +547,7 @@ }; }; buildConfigurationList = 0A87D3582175E4A300BD0C4C /* Build configuration list for PBXProject "Integration" */; - compatibilityVersion = "Xcode 9.3"; + compatibilityVersion = "Xcode 10.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( diff --git a/Lumberjack.xcodeproj/project.pbxproj b/Lumberjack.xcodeproj/project.pbxproj index 21a74473b..85e67b727 100644 --- a/Lumberjack.xcodeproj/project.pbxproj +++ b/Lumberjack.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -168,7 +168,6 @@ 435F03AC2174A39200A86B2D /* Module-Shared.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Module-Shared.xcconfig"; sourceTree = ""; }; 4CFE77942439202B0068D7C6 /* DDLog+Combine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DDLog+Combine.swift"; sourceTree = ""; }; DCB3185914EB418E001CFBEE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - DCB3186014EB418E001CFBEE /* CocoaLumberjack-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CocoaLumberjack-Prefix.pch"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -322,7 +321,6 @@ children = ( 0A26B53222DE346B004EE6A7 /* Sources */, 435F03A92174A39200A86B2D /* Configs */, - DCB3185B14EB418E001CFBEE /* Supporting Files */, DCB3185314EB418E001CFBEE /* Frameworks */, DCB3185214EB418E001CFBEE /* Products */, ); @@ -355,15 +353,6 @@ name = "Other Frameworks"; sourceTree = ""; }; - DCB3185B14EB418E001CFBEE /* Supporting Files */ = { - isa = PBXGroup; - children = ( - DCB3186014EB418E001CFBEE /* CocoaLumberjack-Prefix.pch */, - ); - name = "Supporting Files"; - path = Framework/Lumberjack; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -483,7 +472,7 @@ }; }; buildConfigurationList = DCB3184A14EB418D001CFBEE /* Build configuration list for PBXProject "Lumberjack" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 10.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( diff --git a/Tests/Tests.xcodeproj/project.pbxproj b/Tests/Tests.xcodeproj/project.pbxproj index ebd6b5703..cbd778ce9 100644 --- a/Tests/Tests.xcodeproj/project.pbxproj +++ b/Tests/Tests.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -265,7 +265,7 @@ }; }; buildConfigurationList = 432B53201AAE40EB00843E69 /* Build configuration list for PBXProject "Tests" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 10.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -407,7 +407,11 @@ "$(inherited)", ); INFOPLIST_FILE = Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); SUPPORTED_PLATFORMS = macosx; TARGETED_DEVICE_FAMILY = ""; }; @@ -422,7 +426,11 @@ "$(inherited)", ); INFOPLIST_FILE = Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); SUPPORTED_PLATFORMS = macosx; TARGETED_DEVICE_FAMILY = ""; }; @@ -452,7 +460,11 @@ isa = XCBuildConfiguration; buildSettings = { INFOPLIST_FILE = Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -463,7 +475,11 @@ isa = XCBuildConfiguration; buildSettings = { INFOPLIST_FILE = Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/Xcode/Lumberjack.xcworkspace/contents.xcworkspacedata b/Xcode/Lumberjack.xcworkspace/contents.xcworkspacedata index 5a6d52ea6..cbbf3a14f 100644 --- a/Xcode/Lumberjack.xcworkspace/contents.xcworkspacedata +++ b/Xcode/Lumberjack.xcworkspace/contents.xcworkspacedata @@ -1,9 +1,6 @@ - -