From fcecb5b0bf9417a1164345616828f60343fbdfbd Mon Sep 17 00:00:00 2001 From: Adrian Bobrowski Date: Mon, 18 Jan 2021 12:08:54 +0100 Subject: [PATCH] Release 5.7.3. --- CHANGELOG.md | 3 ++ .../xcshareddata/WorkspaceSettings.xcsettings | 5 ++- L10n-swift.podspec | 4 +-- L10n_swift.xcodeproj/project.pbxproj | 16 ++++----- Package.swift | 34 +++++++++---------- 5 files changed, 34 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1740e78..deaeb85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ # Change Log --- +## [5.7.3](https://github.com/Decybel07/L10n-swift/tree/5.7.3) (2021-01-18) +* Update `Package.swift` + ## [5.7.2](https://github.com/Decybel07/L10n-swift/tree/5.7.2) (2020-07-20) * Prular bugfix with `stringsdict` diff --git a/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index 0c67376..f9b0d7c 100644 --- a/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -1,5 +1,8 @@ - + + PreviewsEnabled + + diff --git a/L10n-swift.podspec b/L10n-swift.podspec index a00d799..58b36fb 100644 --- a/L10n-swift.podspec +++ b/L10n-swift.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |spec| spec.name = 'L10n-swift' spec.module_name = 'L10n_swift' - spec.version = '5.7.2' + spec.version = '5.7.3' spec.summary = 'Localization of an application with ability to change language "on the fly" and support for plural forms in any language.' spec.description = <<-DESC @@ -24,7 +24,7 @@ Pod::Spec.new do |spec| spec.source = { :git => "https://github.com/Decybel07/L10n-swift.git", :tag => spec.version } spec.frameworks = 'Foundation' - spec.swift_versions = ['4.0', '4.1', '4.2', '5.0', '5.1'] + spec.swift_versions = ['4.0', '4.1', '4.2', '5.0', '5.1', '5.2', '5.3'] spec.ios.deployment_target = '9.0' spec.watchos.deployment_target = '2.0' diff --git a/L10n_swift.xcodeproj/project.pbxproj b/L10n_swift.xcodeproj/project.pbxproj index 641f935..18e5a31 100644 --- a/L10n_swift.xcodeproj/project.pbxproj +++ b/L10n_swift.xcodeproj/project.pbxproj @@ -1441,7 +1441,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 5.7.2; + MARKETING_VERSION = 5.7.3; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-iOS"; @@ -1504,7 +1504,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 5.7.2; + MARKETING_VERSION = 5.7.3; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-iOS"; PRODUCT_NAME = "$(PROJECT_NAME)"; @@ -1684,7 +1684,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 5.7.2; + MARKETING_VERSION = 5.7.3; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-watchOS"; @@ -1747,7 +1747,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 5.7.2; + MARKETING_VERSION = 5.7.3; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-watchOS"; PRODUCT_NAME = "$(PROJECT_NAME)"; @@ -1814,7 +1814,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 5.7.2; + MARKETING_VERSION = 5.7.3; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-tvOS"; @@ -1876,7 +1876,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 5.7.2; + MARKETING_VERSION = 5.7.3; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-tvOS"; PRODUCT_NAME = "$(PROJECT_NAME)"; @@ -2051,7 +2051,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 5.7.2; + MARKETING_VERSION = 5.7.3; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-macOS"; @@ -2114,7 +2114,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 5.7.2; + MARKETING_VERSION = 5.7.3; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-macOS"; PRODUCT_NAME = "$(PROJECT_NAME)"; diff --git a/Package.swift b/Package.swift index c82eb57..9a860ba 100644 --- a/Package.swift +++ b/Package.swift @@ -1,8 +1,6 @@ -// swift-tools-version:5.0 -// The swift-tools-version declares the minimum version of Swift required to build this package. +// swift-tools-version:5.3 // // Package.swift -// swift-tools-version:5.0 // Created by Adrian Bobrowski on 30.04.2017. // Copyright © 2017 Adrian Bobrowski (Decybel07), adrian071993@gmail.com. All rights reserved. // @@ -11,6 +9,7 @@ import PackageDescription let package = Package( name: "L10n-swift", + defaultLocalization: "en", platforms: [ .macOS(.v10_10), .iOS(.v9), .tvOS(.v9), .watchOS(.v2) ], @@ -20,24 +19,25 @@ let package = Package( targets: [ .target( name: "L10n-swift", - path: "Source", + path: "./Source", exclude: { - var paths: [String] = [] - #if !canImport(WatchKit) - paths.append("IBInspectables/WatchKit") + var paths: [String] = ["Info.plist", "L10n_swift.h"] + #if !os(watchOS) + paths.append("./IBInspectables/WatchKit") #endif - #if canImport(UIKit) - #if os(iOS) - paths.append("IBInspectables/UIKit/tvOS") - #elseif os(tvOS) - paths.append("IBInspectables/UIKit/iOS") - #endif - #else - paths.append("IBInspectables/UIKit") - #endif + if #available(iOS 9.0, *) { + paths.append("./IBInspectables/UIKit/tvOS") + } else if #available(tvOS 9.0, *) { + paths.append("./IBInspectables/UIKit/iOS") + } else { + paths.append("./IBInspectables/UIKit") + } return paths - }() + }(), + resources: [ + .process("./Core/Plural/Plural.stringsdict", localization: .default) + ] ), ], swiftLanguageVersions: [.v4, .v4_2, .v5]