From 9330e1d93bb681ff7ed03c6f759b92b1ec5df61e Mon Sep 17 00:00:00 2001 From: Janzzen Matthew De Jesus Date: Tue, 2 Aug 2022 14:43:33 +0800 Subject: [PATCH 01/10] Update Package.swift --- Package.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 507af30..74a6847 100644 --- a/Package.swift +++ b/Package.swift @@ -1,3 +1,4 @@ +/ swift-tools-version:5.1 import PackageDescription let package = Package( @@ -5,4 +6,4 @@ let package = Package( dependencies: [], exclude: ["Sources/Info.plist", "Sources/SwiftyTimer.h", "SwiftyTimerTests"] -) \ No newline at end of file +) From 22da082e8e72a514e6c0cae9711c87bee7aea3d0 Mon Sep 17 00:00:00 2001 From: Janzzen Matthew De Jesus Date: Tue, 2 Aug 2022 14:44:08 +0800 Subject: [PATCH 02/10] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 74a6847..02cad24 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -/ swift-tools-version:5.1 +/ swift-tools-version:4.2 import PackageDescription let package = Package( From 757b9f6adb3bf5cd30e0e2ce257e2084eb23423d Mon Sep 17 00:00:00 2001 From: Janzzen Matthew De Jesus Date: Tue, 2 Aug 2022 14:46:01 +0800 Subject: [PATCH 03/10] Update Package.swift --- Package.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 02cad24..e2c586c 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,6 @@ -/ swift-tools-version:4.2 +// swift-tools-version:4.2 +// The swift-tools-version declares the minimum version of Swift required to build this package. + import PackageDescription let package = Package( From 5235aa94bc05fa5781d660436f1a0ed97b69abb6 Mon Sep 17 00:00:00 2001 From: Janzzen Matthew De Jesus Date: Tue, 2 Aug 2022 17:09:32 +0800 Subject: [PATCH 04/10] Update Package.swift --- Package.swift | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index e2c586c..fd17382 100644 --- a/Package.swift +++ b/Package.swift @@ -5,7 +5,5 @@ import PackageDescription let package = Package( name: "SwiftyTimer", - dependencies: [], - exclude: ["Sources/Info.plist", "Sources/SwiftyTimer.h", "SwiftyTimerTests"] - + dependencies: [] ) From 751b598bf63e15fd7637104c2b3e05e8a025dae7 Mon Sep 17 00:00:00 2001 From: Janzzen Matthew De Jesus Date: Tue, 2 Aug 2022 17:13:28 +0800 Subject: [PATCH 05/10] Update Package.swift --- Package.swift | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index fd17382..fe4220a 100644 --- a/Package.swift +++ b/Package.swift @@ -1,9 +1,14 @@ -// swift-tools-version:4.2 +// 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: "SwiftyTimer", - dependencies: [] + name: "SwiftyTimer", + platforms: [.iOS(.v9), .tvOS(.v9)], + products: [ + .library(name: "SwiftyTimer", targets: ["SwiftyTimer"]) + ], + targets: [ + .target(name: "SwiftyTimer") + ] ) From 551a4526518898c513049f28d3ae96095b5a07a5 Mon Sep 17 00:00:00 2001 From: Janzzen Matthew De Jesus Date: Tue, 2 Aug 2022 17:13:55 +0800 Subject: [PATCH 06/10] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index fe4220a..d5522e8 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.1 +// swift-tools-version:4.2 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription From 9ed09dfcd476f62dda99173a62a663ba4d7a5702 Mon Sep 17 00:00:00 2001 From: Janzzen Matthew De Jesus Date: Tue, 2 Aug 2022 17:15:16 +0800 Subject: [PATCH 07/10] Update Package.swift --- Package.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Package.swift b/Package.swift index d5522e8..2f4131e 100644 --- a/Package.swift +++ b/Package.swift @@ -4,7 +4,6 @@ import PackageDescription let package = Package( name: "SwiftyTimer", - platforms: [.iOS(.v9), .tvOS(.v9)], products: [ .library(name: "SwiftyTimer", targets: ["SwiftyTimer"]) ], From 3398cce5ce75692085bd6ae5a5914ce286cef822 Mon Sep 17 00:00:00 2001 From: Janzzen Matthew De Jesus Date: Tue, 2 Aug 2022 17:19:00 +0800 Subject: [PATCH 08/10] Update Package.swift --- Package.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 2f4131e..9f14e19 100644 --- a/Package.swift +++ b/Package.swift @@ -8,6 +8,9 @@ let package = Package( .library(name: "SwiftyTimer", targets: ["SwiftyTimer"]) ], targets: [ - .target(name: "SwiftyTimer") + .target( + name: "SwiftyTimer", + path: "Sources" + ) ] ) From 299bebd8f75172fab83fb28c7a37f00fd377d41d Mon Sep 17 00:00:00 2001 From: Janzzen Matthew De Jesus Date: Tue, 2 Aug 2022 17:45:47 +0800 Subject: [PATCH 09/10] Update Package.swift --- Package.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Package.swift b/Package.swift index 9f14e19..bf7565f 100644 --- a/Package.swift +++ b/Package.swift @@ -4,6 +4,7 @@ import PackageDescription let package = Package( name: "SwiftyTimer", + platforms: [.iOS(.v9), .tvOS(.v9)], products: [ .library(name: "SwiftyTimer", targets: ["SwiftyTimer"]) ], From c503354971dd424abb9ca4866fe04066cbf6c08b Mon Sep 17 00:00:00 2001 From: Janzzen Matthew De Jesus Date: Fri, 12 Aug 2022 14:46:16 +0800 Subject: [PATCH 10/10] Updated to Swift 5 --- .swift-version | 2 +- Package.swift | 2 +- SwiftyTimer.podspec | 6 ++--- SwiftyTimer.xcodeproj/project.pbxproj | 25 +++++++++++++------ .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++++++ .../xcschemes/SwiftyTimer OS X.xcscheme | 6 +---- .../xcschemes/SwiftyTimer tvOS.xcscheme | 6 +---- .../xcschemes/SwiftyTimer watchOS.xcscheme | 6 +---- .../xcschemes/SwiftyTimer.xcscheme | 6 +---- 9 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 SwiftyTimer.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/.swift-version b/.swift-version index bf77d54..819e07a 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.2 +5.0 diff --git a/Package.swift b/Package.swift index bf7565f..59fce0f 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.2 +// swift-tools-version:5.0 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription diff --git a/SwiftyTimer.podspec b/SwiftyTimer.podspec index 06db5d9..d200289 100644 --- a/SwiftyTimer.podspec +++ b/SwiftyTimer.podspec @@ -6,12 +6,12 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/radex/SwiftyTimer' s.authors = { 'Radek Pietruszewski' => 'this.is@radex.io' } s.source = { git: 'https://github.com/radex/SwiftyTimer.git', tag: s.version } - s.swift_version = '4.2' + s.swift_version = '5.0' s.requires_arc = true s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.9' - s.tvos.deployment_target = '9.0' - s.watchos.deployment_target = '2.0' + s.tvos.deployment_target = '15.4' + s.watchos.deployment_target = '8.5' s.source_files = 'Sources/*.swift' end diff --git a/SwiftyTimer.xcodeproj/project.pbxproj b/SwiftyTimer.xcodeproj/project.pbxproj index e1f7577..64350ad 100644 --- a/SwiftyTimer.xcodeproj/project.pbxproj +++ b/SwiftyTimer.xcodeproj/project.pbxproj @@ -205,12 +205,12 @@ 3E721AB21BF7255C008AF027 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1340; ORGANIZATIONNAME = "Radosław Pietruszewski"; TargetAttributes = { 3E721ABA1BF7255D008AF027 = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1340; }; 6E7E40891C84B1A20030CEBB = { CreatedOnToolsVersion = 7.2; @@ -228,6 +228,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 3E721AB11BF7255C008AF027; @@ -314,6 +315,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -332,6 +334,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -363,10 +366,12 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + TVOS_DEPLOYMENT_TARGET = 15.4; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; + WATCHOS_DEPLOYMENT_TARGET = 8.5; }; name = Debug; }; @@ -374,6 +379,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -392,6 +398,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -416,11 +423,13 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + TVOS_DEPLOYMENT_TARGET = 15.4; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; + WATCHOS_DEPLOYMENT_TARGET = 8.5; }; name = Release; }; @@ -441,7 +450,7 @@ PRODUCT_BUNDLE_IDENTIFIER = io.radex.SwiftyTimer; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -462,7 +471,7 @@ PRODUCT_BUNDLE_IDENTIFIER = io.radex.SwiftyTimer; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -530,7 +539,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -552,7 +561,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/SwiftyTimer.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/SwiftyTimer.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/SwiftyTimer.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/SwiftyTimer.xcodeproj/xcshareddata/xcschemes/SwiftyTimer OS X.xcscheme b/SwiftyTimer.xcodeproj/xcshareddata/xcschemes/SwiftyTimer OS X.xcscheme index ada9aa8..75e7ee9 100644 --- a/SwiftyTimer.xcodeproj/xcshareddata/xcschemes/SwiftyTimer OS X.xcscheme +++ b/SwiftyTimer.xcodeproj/xcshareddata/xcschemes/SwiftyTimer OS X.xcscheme @@ -1,6 +1,6 @@ - - - - - - - - - - - - - - - -