From 6abe3e20926b89cb3fe0df9e76759d166cd4041e Mon Sep 17 00:00:00 2001 From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com> Date: Tue, 5 Nov 2019 18:37:11 +0100 Subject: [PATCH 1/4] Convert Xcode project to Swift package --- Logger.xcodeproj/project.pbxproj | 508 ------------------ .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/xcschemes/Logger.xcscheme | 100 ---- Package.swift | 24 + .../SwiftLogger}/LogStringConvertible.swift | 0 {Logger => Sources/SwiftLogger}/Logger.swift | 0 .../SwiftLogger}/Loggers/AgregateLogger.swift | 0 .../SwiftLogger}/Loggers/ConsoleLogger.swift | 0 .../Loggers/DiskLogger/DiskLogger.swift | 0 .../Loggers/DiskLogger/Logrotate.swift | 0 .../Loggers/DiskLogger/OSFileHandle.swift | 0 .../Loggers/DiskLogger/OSFileManager.swift | 0 .../Loggers/DiskLogger/SizeLimitedFile.swift | 0 .../SwiftLogger}/Loggers/NullLogger.swift | 0 Tests/LinuxMain.swift | 7 + .../AgregateLoggerTests.swift | 2 +- .../SwiftLoggerTests}/DiskLoggerTests.swift | 2 +- .../LogStringConvertibleTests.swift | 2 +- .../SwiftLoggerTests}/LoggetTests.swift | 2 +- .../SwiftLoggerTests}/LogrotateTests.swift | 2 +- .../SizeLimitedFileTests.swift | 2 +- Tests/SwiftLoggerTests/XCTestManifests.swift | 9 + UnitTests/Info.plist | 22 - 24 files changed, 46 insertions(+), 651 deletions(-) delete mode 100644 Logger.xcodeproj/project.pbxproj delete mode 100644 Logger.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 Logger.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 Logger.xcodeproj/xcshareddata/xcschemes/Logger.xcscheme create mode 100644 Package.swift rename {Logger => Sources/SwiftLogger}/LogStringConvertible.swift (100%) rename {Logger => Sources/SwiftLogger}/Logger.swift (100%) rename {Logger => Sources/SwiftLogger}/Loggers/AgregateLogger.swift (100%) rename {Logger => Sources/SwiftLogger}/Loggers/ConsoleLogger.swift (100%) rename {Logger => Sources/SwiftLogger}/Loggers/DiskLogger/DiskLogger.swift (100%) rename {Logger => Sources/SwiftLogger}/Loggers/DiskLogger/Logrotate.swift (100%) rename {Logger => Sources/SwiftLogger}/Loggers/DiskLogger/OSFileHandle.swift (100%) rename {Logger => Sources/SwiftLogger}/Loggers/DiskLogger/OSFileManager.swift (100%) rename {Logger => Sources/SwiftLogger}/Loggers/DiskLogger/SizeLimitedFile.swift (100%) rename {Logger => Sources/SwiftLogger}/Loggers/NullLogger.swift (100%) create mode 100644 Tests/LinuxMain.swift rename {UnitTests => Tests/SwiftLoggerTests}/AgregateLoggerTests.swift (98%) rename {UnitTests => Tests/SwiftLoggerTests}/DiskLoggerTests.swift (99%) rename {UnitTests => Tests/SwiftLoggerTests}/LogStringConvertibleTests.swift (98%) rename {UnitTests => Tests/SwiftLoggerTests}/LoggetTests.swift (98%) rename {UnitTests => Tests/SwiftLoggerTests}/LogrotateTests.swift (99%) rename {UnitTests => Tests/SwiftLoggerTests}/SizeLimitedFileTests.swift (99%) create mode 100644 Tests/SwiftLoggerTests/XCTestManifests.swift delete mode 100644 UnitTests/Info.plist diff --git a/Logger.xcodeproj/project.pbxproj b/Logger.xcodeproj/project.pbxproj deleted file mode 100644 index 220338c..0000000 --- a/Logger.xcodeproj/project.pbxproj +++ /dev/null @@ -1,508 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 50; - objects = { - -/* Begin PBXBuildFile section */ - 2E58D35D21316C3500BEF81A /* LogStringConvertibleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E58D35C21316C3500BEF81A /* LogStringConvertibleTests.swift */; }; - 2E58D35F21316C3500BEF81A /* libLogger.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EBF4B3A2122AA34008E4117 /* libLogger.a */; }; - 2EBF4B3E2122AA34008E4117 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EBF4B3D2122AA34008E4117 /* Logger.swift */; }; - 2EBF4B452122ACD6008E4117 /* LogStringConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EBF4B442122ACD6008E4117 /* LogStringConvertible.swift */; }; - 2EBF4B4A2122AF53008E4117 /* AgregateLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EBF4B472122AF53008E4117 /* AgregateLogger.swift */; }; - 2EBF4B4B2122AF53008E4117 /* ConsoleLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EBF4B482122AF53008E4117 /* ConsoleLogger.swift */; }; - 2EBF4B4C2122AF53008E4117 /* NullLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EBF4B492122AF53008E4117 /* NullLogger.swift */; }; - 2EBF4B572122B598008E4117 /* DiskLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EBF4B542122B598008E4117 /* DiskLogger.swift */; }; - 2EBF4B582122B598008E4117 /* SizeLimitedFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EBF4B552122B598008E4117 /* SizeLimitedFile.swift */; }; - 2EBF4B592122B598008E4117 /* Logrotate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EBF4B562122B598008E4117 /* Logrotate.swift */; }; - 2ED077D721329CA30058EEFC /* LoggetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED077D621329CA30058EEFC /* LoggetTests.swift */; }; - 2ED077D92132A4820058EEFC /* AgregateLoggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED077D82132A4820058EEFC /* AgregateLoggerTests.swift */; }; - 2ED077DB2132B0320058EEFC /* OSFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED077DA2132B0320058EEFC /* OSFileManager.swift */; }; - 2ED103E12135C61100EB3683 /* LogrotateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED103E02135C61100EB3683 /* LogrotateTests.swift */; }; - 2ED103E32135D3FB00EB3683 /* SizeLimitedFileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED103E22135D3FB00EB3683 /* SizeLimitedFileTests.swift */; }; - 2ED103E52138553B00EB3683 /* DiskLoggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED103E42138553B00EB3683 /* DiskLoggerTests.swift */; }; - 2ED83781236A19A60008C01F /* OSFileHandle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ED83780236A19A60008C01F /* OSFileHandle.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 2E58D36021316C3500BEF81A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 2EBF4B322122AA34008E4117 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 2EBF4B392122AA34008E4117; - remoteInfo = Logger; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 2EBF4B382122AA34008E4117 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 2E58D35A21316C3500BEF81A /* UnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 2E58D35C21316C3500BEF81A /* LogStringConvertibleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogStringConvertibleTests.swift; sourceTree = ""; }; - 2E58D35E21316C3500BEF81A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2EBF4B3A2122AA34008E4117 /* libLogger.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libLogger.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 2EBF4B3D2122AA34008E4117 /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = ""; }; - 2EBF4B442122ACD6008E4117 /* LogStringConvertible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LogStringConvertible.swift; sourceTree = ""; }; - 2EBF4B472122AF53008E4117 /* AgregateLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AgregateLogger.swift; sourceTree = ""; }; - 2EBF4B482122AF53008E4117 /* ConsoleLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConsoleLogger.swift; sourceTree = ""; }; - 2EBF4B492122AF53008E4117 /* NullLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NullLogger.swift; sourceTree = ""; }; - 2EBF4B542122B598008E4117 /* DiskLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiskLogger.swift; sourceTree = ""; }; - 2EBF4B552122B598008E4117 /* SizeLimitedFile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SizeLimitedFile.swift; sourceTree = ""; }; - 2EBF4B562122B598008E4117 /* Logrotate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logrotate.swift; sourceTree = ""; }; - 2ED077D621329CA30058EEFC /* LoggetTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggetTests.swift; sourceTree = ""; }; - 2ED077D82132A4820058EEFC /* AgregateLoggerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgregateLoggerTests.swift; sourceTree = ""; }; - 2ED077DA2132B0320058EEFC /* OSFileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSFileManager.swift; sourceTree = ""; }; - 2ED103E02135C61100EB3683 /* LogrotateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogrotateTests.swift; sourceTree = ""; }; - 2ED103E22135D3FB00EB3683 /* SizeLimitedFileTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SizeLimitedFileTests.swift; sourceTree = ""; }; - 2ED103E42138553B00EB3683 /* DiskLoggerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiskLoggerTests.swift; sourceTree = ""; }; - 2ED83780236A19A60008C01F /* OSFileHandle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSFileHandle.swift; sourceTree = ""; }; - 2EDA8AE8213ACCFF00FE5840 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 2E58D35721316C3500BEF81A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 2E58D35F21316C3500BEF81A /* libLogger.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2EBF4B372122AA34008E4117 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 2E58D35B21316C3500BEF81A /* UnitTests */ = { - isa = PBXGroup; - children = ( - 2E58D35C21316C3500BEF81A /* LogStringConvertibleTests.swift */, - 2ED077D621329CA30058EEFC /* LoggetTests.swift */, - 2ED077D82132A4820058EEFC /* AgregateLoggerTests.swift */, - 2ED103E42138553B00EB3683 /* DiskLoggerTests.swift */, - 2ED103E22135D3FB00EB3683 /* SizeLimitedFileTests.swift */, - 2ED103E02135C61100EB3683 /* LogrotateTests.swift */, - 2E58D35E21316C3500BEF81A /* Info.plist */, - ); - path = UnitTests; - sourceTree = ""; - }; - 2EBF4B312122AA34008E4117 = { - isa = PBXGroup; - children = ( - 2EDA8AE8213ACCFF00FE5840 /* README.md */, - 2EBF4B3C2122AA34008E4117 /* Logger */, - 2E58D35B21316C3500BEF81A /* UnitTests */, - 2EBF4B3B2122AA34008E4117 /* Products */, - ); - sourceTree = ""; - }; - 2EBF4B3B2122AA34008E4117 /* Products */ = { - isa = PBXGroup; - children = ( - 2EBF4B3A2122AA34008E4117 /* libLogger.a */, - 2E58D35A21316C3500BEF81A /* UnitTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 2EBF4B3C2122AA34008E4117 /* Logger */ = { - isa = PBXGroup; - children = ( - 2EBF4B442122ACD6008E4117 /* LogStringConvertible.swift */, - 2EBF4B3D2122AA34008E4117 /* Logger.swift */, - 2EBF4B462122AF53008E4117 /* Loggers */, - ); - path = Logger; - sourceTree = ""; - }; - 2EBF4B462122AF53008E4117 /* Loggers */ = { - isa = PBXGroup; - children = ( - 2EBF4B472122AF53008E4117 /* AgregateLogger.swift */, - 2EBF4B482122AF53008E4117 /* ConsoleLogger.swift */, - 2EBF4B492122AF53008E4117 /* NullLogger.swift */, - 2EBF4B4D2122B034008E4117 /* DiskLogger */, - ); - path = Loggers; - sourceTree = ""; - }; - 2EBF4B4D2122B034008E4117 /* DiskLogger */ = { - isa = PBXGroup; - children = ( - 2EBF4B542122B598008E4117 /* DiskLogger.swift */, - 2EBF4B552122B598008E4117 /* SizeLimitedFile.swift */, - 2EBF4B562122B598008E4117 /* Logrotate.swift */, - 2ED077DA2132B0320058EEFC /* OSFileManager.swift */, - 2ED83780236A19A60008C01F /* OSFileHandle.swift */, - ); - path = DiskLogger; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 2E58D35921316C3500BEF81A /* UnitTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 2E58D36221316C3500BEF81A /* Build configuration list for PBXNativeTarget "UnitTests" */; - buildPhases = ( - 2E58D35621316C3500BEF81A /* Sources */, - 2E58D35721316C3500BEF81A /* Frameworks */, - 2E58D35821316C3500BEF81A /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 2E58D36121316C3500BEF81A /* PBXTargetDependency */, - ); - name = UnitTests; - productName = UnitTests; - productReference = 2E58D35A21316C3500BEF81A /* UnitTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 2EBF4B392122AA34008E4117 /* Logger */ = { - isa = PBXNativeTarget; - buildConfigurationList = 2EBF4B412122AA34008E4117 /* Build configuration list for PBXNativeTarget "Logger" */; - buildPhases = ( - 2EBF4B362122AA34008E4117 /* Sources */, - 2EBF4B372122AA34008E4117 /* Frameworks */, - 2EBF4B382122AA34008E4117 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Logger; - productName = Logger; - productReference = 2EBF4B3A2122AA34008E4117 /* libLogger.a */; - productType = "com.apple.product-type.library.static"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 2EBF4B322122AA34008E4117 /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 1000; - LastUpgradeCheck = 1000; - ORGANIZATIONNAME = "Wojciech Nagrodzki"; - TargetAttributes = { - 2E58D35921316C3500BEF81A = { - CreatedOnToolsVersion = 10.0; - LastSwiftMigration = 1020; - }; - 2EBF4B392122AA34008E4117 = { - CreatedOnToolsVersion = 10.0; - LastSwiftMigration = 1020; - }; - }; - }; - buildConfigurationList = 2EBF4B352122AA34008E4117 /* Build configuration list for PBXProject "Logger" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 2EBF4B312122AA34008E4117; - productRefGroup = 2EBF4B3B2122AA34008E4117 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 2EBF4B392122AA34008E4117 /* Logger */, - 2E58D35921316C3500BEF81A /* UnitTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 2E58D35821316C3500BEF81A /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 2E58D35621316C3500BEF81A /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2E58D35D21316C3500BEF81A /* LogStringConvertibleTests.swift in Sources */, - 2ED103E32135D3FB00EB3683 /* SizeLimitedFileTests.swift in Sources */, - 2ED103E52138553B00EB3683 /* DiskLoggerTests.swift in Sources */, - 2ED077D92132A4820058EEFC /* AgregateLoggerTests.swift in Sources */, - 2ED103E12135C61100EB3683 /* LogrotateTests.swift in Sources */, - 2ED077D721329CA30058EEFC /* LoggetTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2EBF4B362122AA34008E4117 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2EBF4B582122B598008E4117 /* SizeLimitedFile.swift in Sources */, - 2ED83781236A19A60008C01F /* OSFileHandle.swift in Sources */, - 2EBF4B572122B598008E4117 /* DiskLogger.swift in Sources */, - 2EBF4B4C2122AF53008E4117 /* NullLogger.swift in Sources */, - 2EBF4B3E2122AA34008E4117 /* Logger.swift in Sources */, - 2EBF4B4B2122AF53008E4117 /* ConsoleLogger.swift in Sources */, - 2ED077DB2132B0320058EEFC /* OSFileManager.swift in Sources */, - 2EBF4B4A2122AF53008E4117 /* AgregateLogger.swift in Sources */, - 2EBF4B592122B598008E4117 /* Logrotate.swift in Sources */, - 2EBF4B452122ACD6008E4117 /* LogStringConvertible.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 2E58D36121316C3500BEF81A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 2EBF4B392122AA34008E4117 /* Logger */; - targetProxy = 2E58D36021316C3500BEF81A /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 2E58D36321316C3500BEF81A /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = UnitTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.UnitTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 2E58D36421316C3500BEF81A /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = UnitTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.UnitTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 2EBF4B3F2122AA34008E4117 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 2EBF4B402122AA34008E4117 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 2EBF4B422122AA34008E4117 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Automatic; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 2EBF4B432122AA34008E4117 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Automatic; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 2E58D36221316C3500BEF81A /* Build configuration list for PBXNativeTarget "UnitTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2E58D36321316C3500BEF81A /* Debug */, - 2E58D36421316C3500BEF81A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 2EBF4B352122AA34008E4117 /* Build configuration list for PBXProject "Logger" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2EBF4B3F2122AA34008E4117 /* Debug */, - 2EBF4B402122AA34008E4117 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 2EBF4B412122AA34008E4117 /* Build configuration list for PBXNativeTarget "Logger" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2EBF4B422122AA34008E4117 /* Debug */, - 2EBF4B432122AA34008E4117 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 2EBF4B322122AA34008E4117 /* Project object */; -} diff --git a/Logger.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Logger.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 0ca1195..0000000 --- a/Logger.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Logger.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Logger.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/Logger.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/Logger.xcodeproj/xcshareddata/xcschemes/Logger.xcscheme b/Logger.xcodeproj/xcshareddata/xcschemes/Logger.xcscheme deleted file mode 100644 index 3fdcd78..0000000 --- a/Logger.xcodeproj/xcshareddata/xcschemes/Logger.xcscheme +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..44673a3 --- /dev/null +++ b/Package.swift @@ -0,0 +1,24 @@ +// swift-tools-version:5.1 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "SwiftLogger", + products: [ + // Products define the executables and libraries produced by a package, and make them visible to other packages. + .library( + name: "SwiftLogger", + targets: ["SwiftLogger"]), + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages which this package depends on. + .target( + name: "SwiftLogger", + dependencies: []), + .testTarget( + name: "SwiftLoggerTests", + dependencies: ["SwiftLogger"]), + ] +) diff --git a/Logger/LogStringConvertible.swift b/Sources/SwiftLogger/LogStringConvertible.swift similarity index 100% rename from Logger/LogStringConvertible.swift rename to Sources/SwiftLogger/LogStringConvertible.swift diff --git a/Logger/Logger.swift b/Sources/SwiftLogger/Logger.swift similarity index 100% rename from Logger/Logger.swift rename to Sources/SwiftLogger/Logger.swift diff --git a/Logger/Loggers/AgregateLogger.swift b/Sources/SwiftLogger/Loggers/AgregateLogger.swift similarity index 100% rename from Logger/Loggers/AgregateLogger.swift rename to Sources/SwiftLogger/Loggers/AgregateLogger.swift diff --git a/Logger/Loggers/ConsoleLogger.swift b/Sources/SwiftLogger/Loggers/ConsoleLogger.swift similarity index 100% rename from Logger/Loggers/ConsoleLogger.swift rename to Sources/SwiftLogger/Loggers/ConsoleLogger.swift diff --git a/Logger/Loggers/DiskLogger/DiskLogger.swift b/Sources/SwiftLogger/Loggers/DiskLogger/DiskLogger.swift similarity index 100% rename from Logger/Loggers/DiskLogger/DiskLogger.swift rename to Sources/SwiftLogger/Loggers/DiskLogger/DiskLogger.swift diff --git a/Logger/Loggers/DiskLogger/Logrotate.swift b/Sources/SwiftLogger/Loggers/DiskLogger/Logrotate.swift similarity index 100% rename from Logger/Loggers/DiskLogger/Logrotate.swift rename to Sources/SwiftLogger/Loggers/DiskLogger/Logrotate.swift diff --git a/Logger/Loggers/DiskLogger/OSFileHandle.swift b/Sources/SwiftLogger/Loggers/DiskLogger/OSFileHandle.swift similarity index 100% rename from Logger/Loggers/DiskLogger/OSFileHandle.swift rename to Sources/SwiftLogger/Loggers/DiskLogger/OSFileHandle.swift diff --git a/Logger/Loggers/DiskLogger/OSFileManager.swift b/Sources/SwiftLogger/Loggers/DiskLogger/OSFileManager.swift similarity index 100% rename from Logger/Loggers/DiskLogger/OSFileManager.swift rename to Sources/SwiftLogger/Loggers/DiskLogger/OSFileManager.swift diff --git a/Logger/Loggers/DiskLogger/SizeLimitedFile.swift b/Sources/SwiftLogger/Loggers/DiskLogger/SizeLimitedFile.swift similarity index 100% rename from Logger/Loggers/DiskLogger/SizeLimitedFile.swift rename to Sources/SwiftLogger/Loggers/DiskLogger/SizeLimitedFile.swift diff --git a/Logger/Loggers/NullLogger.swift b/Sources/SwiftLogger/Loggers/NullLogger.swift similarity index 100% rename from Logger/Loggers/NullLogger.swift rename to Sources/SwiftLogger/Loggers/NullLogger.swift diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift new file mode 100644 index 0000000..5e88a5e --- /dev/null +++ b/Tests/LinuxMain.swift @@ -0,0 +1,7 @@ +import XCTest + +import SwiftLoggerTests + +var tests = [XCTestCaseEntry]() +tests += SwiftLoggerTests.allTests() +XCTMain(tests) diff --git a/UnitTests/AgregateLoggerTests.swift b/Tests/SwiftLoggerTests/AgregateLoggerTests.swift similarity index 98% rename from UnitTests/AgregateLoggerTests.swift rename to Tests/SwiftLoggerTests/AgregateLoggerTests.swift index c3c2704..87cb73e 100644 --- a/UnitTests/AgregateLoggerTests.swift +++ b/Tests/SwiftLoggerTests/AgregateLoggerTests.swift @@ -23,7 +23,7 @@ // import XCTest -@testable import Logger +@testable import SwiftLogger class AgregateLoggerTests: XCTestCase { diff --git a/UnitTests/DiskLoggerTests.swift b/Tests/SwiftLoggerTests/DiskLoggerTests.swift similarity index 99% rename from UnitTests/DiskLoggerTests.swift rename to Tests/SwiftLoggerTests/DiskLoggerTests.swift index 3748884..a86ad26 100644 --- a/UnitTests/DiskLoggerTests.swift +++ b/Tests/SwiftLoggerTests/DiskLoggerTests.swift @@ -23,7 +23,7 @@ // import XCTest -@testable import Logger +@testable import SwiftLogger class DiskLoggerTests: XCTestCase { diff --git a/UnitTests/LogStringConvertibleTests.swift b/Tests/SwiftLoggerTests/LogStringConvertibleTests.swift similarity index 98% rename from UnitTests/LogStringConvertibleTests.swift rename to Tests/SwiftLoggerTests/LogStringConvertibleTests.swift index 58bc9b2..4397405 100644 --- a/UnitTests/LogStringConvertibleTests.swift +++ b/Tests/SwiftLoggerTests/LogStringConvertibleTests.swift @@ -23,7 +23,7 @@ // import XCTest -@testable import Logger +@testable import SwiftLogger class LogStringConvertibleTests: XCTestCase { diff --git a/UnitTests/LoggetTests.swift b/Tests/SwiftLoggerTests/LoggetTests.swift similarity index 98% rename from UnitTests/LoggetTests.swift rename to Tests/SwiftLoggerTests/LoggetTests.swift index a753ca7..2d63a4b 100644 --- a/UnitTests/LoggetTests.swift +++ b/Tests/SwiftLoggerTests/LoggetTests.swift @@ -23,7 +23,7 @@ // import XCTest -@testable import Logger +@testable import SwiftLogger class LoggetTests: XCTestCase { diff --git a/UnitTests/LogrotateTests.swift b/Tests/SwiftLoggerTests/LogrotateTests.swift similarity index 99% rename from UnitTests/LogrotateTests.swift rename to Tests/SwiftLoggerTests/LogrotateTests.swift index 0aa968b..ae00f22 100644 --- a/UnitTests/LogrotateTests.swift +++ b/Tests/SwiftLoggerTests/LogrotateTests.swift @@ -23,7 +23,7 @@ // import XCTest -@testable import Logger +@testable import SwiftLogger class LogrotateTests: XCTestCase { diff --git a/UnitTests/SizeLimitedFileTests.swift b/Tests/SwiftLoggerTests/SizeLimitedFileTests.swift similarity index 99% rename from UnitTests/SizeLimitedFileTests.swift rename to Tests/SwiftLoggerTests/SizeLimitedFileTests.swift index 83db64b..93d82bd 100644 --- a/UnitTests/SizeLimitedFileTests.swift +++ b/Tests/SwiftLoggerTests/SizeLimitedFileTests.swift @@ -23,7 +23,7 @@ // import XCTest -@testable import Logger +@testable import SwiftLogger class SizeLimitedFileTests: XCTestCase { diff --git a/Tests/SwiftLoggerTests/XCTestManifests.swift b/Tests/SwiftLoggerTests/XCTestManifests.swift new file mode 100644 index 0000000..52deb45 --- /dev/null +++ b/Tests/SwiftLoggerTests/XCTestManifests.swift @@ -0,0 +1,9 @@ +import XCTest + +#if !canImport(ObjectiveC) +public func allTests() -> [XCTestCaseEntry] { + return [ + testCase(SwiftLoggerTests.allTests), + ] +} +#endif diff --git a/UnitTests/Info.plist b/UnitTests/Info.plist deleted file mode 100644 index 6c40a6c..0000000 --- a/UnitTests/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - From db25f8a10b395f43d8db7c37d69ee4b2bcffa7bb Mon Sep 17 00:00:00 2001 From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com> Date: Tue, 5 Nov 2019 18:38:30 +0100 Subject: [PATCH 2/4] Update travis-ci configuration file --- .travis.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fc4d7e..0e3d00b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,11 @@ -language: swift -osx_image: xcode11.2 -xcode_project: Logger.xcodeproj -script: xcodebuild test -project Logger.xcodeproj -scheme Logger -destination 'platform=iOS Simulator,name=iPhone 11,OS=13.2' -after_success: bash <(curl -s https://codecov.io/bash) \ No newline at end of file +os: + osx +language: + swift +osx_image: + xcode11.2 +script: + - swift build + - swift test +after_success: + - bash <(curl -s https://codecov.io/bash) From deceb93eecdff33cc8611159a880746c35969973 Mon Sep 17 00:00:00 2001 From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com> Date: Tue, 5 Nov 2019 19:25:01 +0100 Subject: [PATCH 3/4] Turn "gather code coverage" option on --- .../xcschemes/SwiftLogger.xcscheme | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/SwiftLogger.xcscheme diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SwiftLogger.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SwiftLogger.xcscheme new file mode 100644 index 0000000..0aa4bb4 --- /dev/null +++ b/.swiftpm/xcode/xcshareddata/xcschemes/SwiftLogger.xcscheme @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 93a14c91243c415020329d2cd17f3efe7bdcf047 Mon Sep 17 00:00:00 2001 From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com> Date: Tue, 5 Nov 2019 21:13:42 +0100 Subject: [PATCH 4/4] Enable code coverage when testing swift package --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e3d00b..6708a38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,10 @@ language: osx_image: xcode11.2 script: + - sw_vers - swift build - - swift test -after_success: - - bash <(curl -s https://codecov.io/bash) + - swift test --enable-code-coverage +after_success: + - xcrun llvm-cov report .build/debug/SwiftLoggerPackageTests.xctest/Contents/MacOS/SwiftLoggerPackageTests -instr-profile .build/debug/codecov/default.profdata + - xcrun llvm-cov export -format="lcov" .build/debug/SwiftLoggerPackageTests.xctest/Contents/MacOS/SwiftLoggerPackageTests -instr-profile .build/debug/codecov/default.profdata > info.lcov + - bash <(curl https://codecov.io/bash)