Merge pull request #1 from smartnsoft/feature/upgrade-swiftybeaver-de…

…stinations Feature/upgrade swiftybeaver destinations
smartnsoft · Mar 26, 2018 · 2050666 · 2050666
2 parents e6eda41 + df66605
commit 2050666
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,17 +2,18 @@
 # * http://www.objc.io/issue-6/travis-ci.html
 # * https://github.com/supermarin/xcpretty#usage
 
-language: swift
-osx_image: xcode8.3
+language: objective-c
+osx_image: xcode9
 xcode_project: Example/SwiftyBeaver-Destinations.xcodeproj
 before_script:
 #If one of this failed we have error and all process is stopped
 - cd Example
 - pod install --repo-update
-
+before_install:
+ - gem install cocoapods # Since Travis is not always on latest version
 script:
 # It's only one command who count for valid or not build session
-- scan -s SwiftyBeaver-Destinations-Example
+- fastlane scan -s SwiftyBeaver-Destinations-Example
 
 after_success:
 # I have put this in after_success coz it's failed.

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -6,14 +6,14 @@ PODS:
     - Reusable/View (= 4.0.0)
   - Reusable/Storyboard (4.0.0)
   - Reusable/View (4.0.0)
-  - SwiftLint (0.20.1)
-  - SwiftyBeaver (1.3.0)
-  - SwiftyBeaver-Destinations/Core (0.0.2):
-    - SwiftyBeaver (~> 1.3)
-  - SwiftyBeaver-Destinations/LogEntries (0.0.2):
+  - SwiftLint (0.24.0)
+  - SwiftyBeaver (1.5.1)
+  - SwiftyBeaver-Destinations/Core (1.0.0):
+    - SwiftyBeaver (~> 1.5)
+  - SwiftyBeaver-Destinations/LogEntries (1.0.0):
     - iOSLogEntries (~> 1.2)
     - SwiftyBeaver-Destinations/Core
-  - SwiftyBeaver-Destinations/Logmatic (0.0.2):
+  - SwiftyBeaver-Destinations/Logmatic (1.0.0):
     - Logmatic (~> 1.0)
     - SwiftyBeaver-Destinations/Core
 
@@ -25,16 +25,16 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   SwiftyBeaver-Destinations:
-    :path: "../"
+    :path: ../
 
 SPEC CHECKSUMS:
   iOSLogEntries: f7eb65033a09b8850e092d0aed3ad75d3553f1f1
   Logmatic: c89f3bdab0dac02f7f8b365dabcbf548b0c5f25a
   Reusable: 98e5fff1e0e2e00872199699b276dde08ee56c07
-  SwiftLint: f60095dc173a3f3ec505bb34f5229c3dfd779a54
-  SwiftyBeaver: d4b551ba34b4206c52cc4684ae90444b8aaa5afd
-  SwiftyBeaver-Destinations: 4f0dedd92eb1d4fd0fbfee94d0b8105eb13ecd5a
+  SwiftLint: a014c92b4664e8b13f380f8640a51bb1733778ba
+  SwiftyBeaver: 4f74563624b2c1e821c522c54142b5dd5ebb0f30
+  SwiftyBeaver-Destinations: cce1baf3e54f7eab41860f15d0e8d47c174646c9
 
 PODFILE CHECKSUM: 27205d2b1bc56a4e8d180282270ebed6016ebffe
 
-COCOAPODS: 1.2.1
+COCOAPODS: 1.4.0
diff --git a/Example/SwiftyBeaver-Destinations.xcodeproj/project.pbxproj b/Example/SwiftyBeaver-Destinations.xcodeproj/project.pbxproj
@@ -53,7 +53,7 @@
 		6D4228E91EC2182F008CE8ED /* Environment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Environment.swift; path = ../Environment.swift; sourceTree = "<group>"; };
 		6D4228EC1EC21926008CE8ED /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = "<group>"; };
 		6D57B3021EC5BECD002B5B43 /* DestinationCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DestinationCell.xib; sourceTree = "<group>"; };
-		8FA5A526ECE42F4E0511732B /* SwiftyBeaver-Destinations.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = "SwiftyBeaver-Destinations.podspec"; path = "../SwiftyBeaver-Destinations.podspec"; sourceTree = "<group>"; };
+		8FA5A526ECE42F4E0511732B /* SwiftyBeaver-Destinations.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = "SwiftyBeaver-Destinations.podspec"; path = "../SwiftyBeaver-Destinations.podspec"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		B2DBCB532701C1F275E06D90 /* Pods-SwiftyBeaver-Destinations_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftyBeaver-Destinations_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SwiftyBeaver-Destinations_Example/Pods-SwiftyBeaver-Destinations_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		BEA5F9B30EACE6B4312CC6A5 /* Pods-SwiftyBeaver-Destinations_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftyBeaver-Destinations_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SwiftyBeaver-Destinations_Tests/Pods-SwiftyBeaver-Destinations_Tests.debug.xcconfig"; sourceTree = "<group>"; };
 		F4136C325F52BA5BD9B9AAA8 /* Pods-SwiftyBeaver-Destinations_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftyBeaver-Destinations_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-SwiftyBeaver-Destinations_Tests/Pods-SwiftyBeaver-Destinations_Tests.release.xcconfig"; sourceTree = "<group>"; };
@@ -240,7 +240,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = "Smart&Soft";
 				TargetAttributes = {
 					447A9B1B1EC5E42F00A75BCF = {
@@ -251,6 +251,7 @@
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						LastSwiftMigration = 0820;
+						ProvisioningStyle = Automatic;
 					};
 				};
 			};
@@ -316,9 +317,20 @@
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-SwiftyBeaver-Destinations_Example/Pods-SwiftyBeaver-Destinations_Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/Logmatic/Logmatic.framework",
+				"${BUILT_PRODUCTS_DIR}/Reusable/Reusable.framework",
+				"${BUILT_PRODUCTS_DIR}/SwiftyBeaver/SwiftyBeaver.framework",
+				"${BUILT_PRODUCTS_DIR}/SwiftyBeaver-Destinations/SwiftyBeaver_Destinations.framework",
+				"${BUILT_PRODUCTS_DIR}/iOSLogEntries/iOSLogEntries.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Logmatic.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reusable.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver_Destinations.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/iOSLogEntries.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -345,13 +357,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-SwiftyBeaver-Destinations_Example-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";
+			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 */
@@ -423,7 +438,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "SwiftyBeaver-Destinations-ExampleTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftyBeaver-Destinations_Example.app/SwiftyBeaver-Destinations_Example";
 			};
 			name = Debug;
@@ -440,7 +455,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "SwiftyBeaver-Destinations-ExampleTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftyBeaver-Destinations_Example.app/SwiftyBeaver-Destinations_Example";
 			};
 			name = Release;
@@ -453,14 +468,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_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_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -489,6 +510,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -500,14 +522,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				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_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_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -528,6 +556,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -537,12 +566,16 @@
 			baseConfigurationReference = B2DBCB532701C1F275E06D90 /* Pods-SwiftyBeaver-Destinations_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "SwiftyBeaver-Destinations/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -551,12 +584,16 @@
 			baseConfigurationReference = F770C46C40BF4ABAD8AD4D51 /* Pods-SwiftyBeaver-Destinations_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "SwiftyBeaver-Destinations/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -570,6 +607,7 @@
 				447A9B251EC5E42F00A75BCF /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "SwiftyBeaver-Destinations" */ = {
 			isa = XCConfigurationList;

diff --git a/...-Destinations.xcodeproj/xcshareddata/xcschemes/SwiftyBeaver-Destinations-Example.xcscheme b/...-Destinations.xcodeproj/xcshareddata/xcschemes/SwiftyBeaver-Destinations-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Example/SwiftyBeaver-Destinations/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/SwiftyBeaver-Destinations/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -45,6 +45,11 @@
       "idiom" : "iphone",
       "filename" : "[email protected]",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 [![License](https://img.shields.io/cocoapods/l/SwiftyBeaver-Destinations.svg?style=flat)](http://cocoapods.org/pods/SwiftyBeaver-Destinations)
 [![Platform](https://img.shields.io/cocoapods/p/SwiftyBeaver-Destinations.svg?style=flat)](http://cocoapods.org/pods/SwiftyBeaver-Destinations)
 
-Add pre-configured console destinations for and based on [SwiftyBeaver](https://github.com/SwiftyBeaver/SwiftyBeaver).
+Add pre-configured console destinations 🔌 for, and based on [SwiftyBeaver](https://github.com/SwiftyBeaver/SwiftyBeaver).
 
 Available destinations:
 
@@ -19,7 +19,8 @@ Available destinations:
 ## Requirements 
 
 - iOS 9
-- Xcode 8.3.2+
+- Xcode 9.2+
+- Swift 4
 
 ## Installation
 
@@ -70,9 +71,9 @@ Available destinations at the moment are:
 
 - Default console with emojis 🎉: `log.addDestination(Destinations.console)`
 
-## Author
+## Contributors
 
-The iOS Team @Smart&Soft, software agency [http://www.smartnsoft.com](http://www.smartnsoft.com)
+Made in 🇫🇷 by the [Smart&Soft](https://smartnsoft.com/) iOS Team.
 
 ## License
 

diff --git a/SwiftyBeaver-Destinations.podspec b/SwiftyBeaver-Destinations.podspec
@@ -1,29 +1,30 @@
 Pod::Spec.new do |s|
   s.name             = 'SwiftyBeaver-Destinations'
-  s.version          = '0.1.0'
-  s.summary          = 'Additionals destinations (LogEntries, Logmatic) and utilities for SwiftyBeaver.'
+  s.version          = '1.0.0'
+  s.summary          = 'Additionals destinations 🔌 (LogEntries, Logmatic) and utilities for SwiftyBeaver.'
 
   s.homepage         = 'https://github.com/smartnsoft/SwiftyBeaver-Destinations'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'Smart&Soft' => '[email protected]' }
   s.source           = { :git => 'https://github.com/smartnsoft/SwiftyBeaver-Destinations.git', :tag => s.version.to_s }
+  s.social_media_url = 'https://twitter.com/smartnsoft'
 
   s.default_subspec  = 'Core'
   s.ios.deployment_target = '9.0'
 
   s.subspec 'Core' do |ss|
     ss.source_files = 'SwiftyBeaver-Destinations/Classes/Utils/*.{swift,h,m}'
-    ss.dependency 'SwiftyBeaver', '~> 1.3'
+    ss.dependency 'SwiftyBeaver', '~> 1.5'
   end
 
   s.subspec 'LogEntries' do |ss|
-    ss.source_files = "SwiftyBeaver-Destinations/Classes/LogEntries/**/*.{swift,h,m}"
+    ss.source_files = 'SwiftyBeaver-Destinations/Classes/LogEntries/**/*.{swift,h,m}'
     ss.dependency 'SwiftyBeaver-Destinations/Core'
     ss.dependency 'iOSLogEntries', '~> 1.2'
   end
 
   s.subspec 'Logmatic' do |ss|
-    ss.source_files = "SwiftyBeaver-Destinations/Classes/Logmatic/**/*.{swift,h,m}"
+    ss.source_files = 'SwiftyBeaver-Destinations/Classes/Logmatic/**/*.{swift,h,m}'
     ss.dependency 'SwiftyBeaver-Destinations/Core'
     ss.dependency 'Logmatic', '~> 1.0'
   end