From 4a3a1915cdad3dcab1e4d6d628708f3895460323 Mon Sep 17 00:00:00 2001 From: Kristian Andersen Date: Fri, 20 Apr 2018 14:32:55 +0200 Subject: [PATCH] Updated for Swift 4.1 --- .swift-version | 2 +- GoogleReporter macOS/Info.plist | 2 +- GoogleReporter tvOS/Info.plist | 2 +- GoogleReporter.podspec | 2 +- GoogleReporter.swift | 3 +-- GoogleReporter.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/GoogleReporter macOS.xcscheme | 4 +--- .../xcshareddata/xcschemes/GoogleReporter tvOS.xcscheme | 4 +--- .../xcshareddata/xcschemes/GoogleReporter.xcscheme | 4 +--- GoogleReporter/Info.plist | 2 +- 10 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.swift-version b/.swift-version index 4d54dad..7d5c902 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0.2 +4.1 diff --git a/GoogleReporter macOS/Info.plist b/GoogleReporter macOS/Info.plist index 7a696d9..71657ca 100644 --- a/GoogleReporter macOS/Info.plist +++ b/GoogleReporter macOS/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.3 + 1.3.1 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright diff --git a/GoogleReporter tvOS/Info.plist b/GoogleReporter tvOS/Info.plist index e3dd2b3..9f9016a 100644 --- a/GoogleReporter tvOS/Info.plist +++ b/GoogleReporter tvOS/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.3 + 1.3.1 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/GoogleReporter.podspec b/GoogleReporter.podspec index 1df0b10..6be6937 100644 --- a/GoogleReporter.podspec +++ b/GoogleReporter.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.name = "GoogleReporter" - s.version = "1.3" + s.version = "1.3.1" s.summary = "Easily integrate your app with Google Analytics" s.description = <<-DESC diff --git a/GoogleReporter.swift b/GoogleReporter.swift index ce2d36f..0390340 100644 --- a/GoogleReporter.swift +++ b/GoogleReporter.swift @@ -10,8 +10,8 @@ import UIKit #elseif os(OSX) import AppKit - import WebKit import Foundation + import WebKit #endif extension Dictionary { @@ -39,7 +39,6 @@ extension Dictionary { /// - Note: A valid Google Analytics tracker ID must be set with `configure(withTrackerId:)` before /// reporting any events. public class GoogleReporter { - /// Returns the singleton reporter instance. public static let shared = GoogleReporter() diff --git a/GoogleReporter.xcodeproj/project.pbxproj b/GoogleReporter.xcodeproj/project.pbxproj index 8ac1ca3..b50929d 100644 --- a/GoogleReporter.xcodeproj/project.pbxproj +++ b/GoogleReporter.xcodeproj/project.pbxproj @@ -197,7 +197,7 @@ 8187DED01ED2E85100839D40 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0910; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Kristian Co"; TargetAttributes = { 8121F86A1ED88E9E0098C85C = { @@ -435,6 +435,7 @@ 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; @@ -442,6 +443,7 @@ 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; @@ -496,6 +498,7 @@ 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; @@ -503,6 +506,7 @@ 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; diff --git a/GoogleReporter.xcodeproj/xcshareddata/xcschemes/GoogleReporter macOS.xcscheme b/GoogleReporter.xcodeproj/xcshareddata/xcschemes/GoogleReporter macOS.xcscheme index 537ff15..ebe28ec 100644 --- a/GoogleReporter.xcodeproj/xcshareddata/xcschemes/GoogleReporter macOS.xcscheme +++ b/GoogleReporter.xcodeproj/xcshareddata/xcschemes/GoogleReporter macOS.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/GoogleReporter.xcodeproj/xcshareddata/xcschemes/GoogleReporter tvOS.xcscheme b/GoogleReporter.xcodeproj/xcshareddata/xcschemes/GoogleReporter tvOS.xcscheme index 6dfcdea..eafa771 100644 --- a/GoogleReporter.xcodeproj/xcshareddata/xcschemes/GoogleReporter tvOS.xcscheme +++ b/GoogleReporter.xcodeproj/xcshareddata/xcschemes/GoogleReporter tvOS.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/GoogleReporter.xcodeproj/xcshareddata/xcschemes/GoogleReporter.xcscheme b/GoogleReporter.xcodeproj/xcshareddata/xcschemes/GoogleReporter.xcscheme index 3e2cab0..dae87d5 100644 --- a/GoogleReporter.xcodeproj/xcshareddata/xcschemes/GoogleReporter.xcscheme +++ b/GoogleReporter.xcodeproj/xcshareddata/xcschemes/GoogleReporter.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/GoogleReporter/Info.plist b/GoogleReporter/Info.plist index e3dd2b3..9f9016a 100644 --- a/GoogleReporter/Info.plist +++ b/GoogleReporter/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.3 + 1.3.1 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass