Updated to Swift 5.3, Xcode 12.4, RxSwift & RxCocoa to 6.1.0

RxSwiftCommunity · Mar 11, 2021 · bd40d55 · bd40d55
1 parent e0fa3da
commit bd40d55
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+### 1.6.0
+
+Updated to Swift 5.3,  Xcode 12.4,  `RxSwift` &  `RxCocoa`  to 6.1.0
+
+
 ### 1.5.0
 
 Updated to Swift 5.2,  Xcode 11.4,  `RxSwift` & `RxCocoa` to 5.1.1

diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		7F7EC35F25FA9E4800B1E2F7 /* RxLocalizer in Frameworks */ = {isa = PBXBuildFile; productRef = 7F7EC35E25FA9E4800B1E2F7 /* RxLocalizer */; };
 		862F06CB2162AFA1000C89E9 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 862F06CD2162AFA1000C89E9 /* Localizable.strings */; };
 		862F06D12162B00C000C89E9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 862F06CF2162B00C000C89E9 /* LaunchScreen.storyboard */; };
-		865EEAD62438AF3A00F4BEC3 /* RxLocalizer in Frameworks */ = {isa = PBXBuildFile; productRef = 865EEAD52438AF3A00F4BEC3 /* RxLocalizer */; };
 		86D5FF2121616A4A007DC0DD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86D5FF2021616A4A007DC0DD /* AppDelegate.swift */; };
 		86D5FF2321616A4A007DC0DD /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86D5FF2221616A4A007DC0DD /* ViewController.swift */; };
 		86D5FF2621616A4A007DC0DD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 86D5FF2421616A4A007DC0DD /* Main.storyboard */; };
@@ -38,7 +38,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				865EEAD62438AF3A00F4BEC3 /* RxLocalizer in Frameworks */,
+				7F7EC35F25FA9E4800B1E2F7 /* RxLocalizer in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -94,7 +94,7 @@
 			);
 			name = Example;
 			packageProductDependencies = (
-				865EEAD52438AF3A00F4BEC3 /* RxLocalizer */,
+				7F7EC35E25FA9E4800B1E2F7 /* RxLocalizer */,
 			);
 			productName = Example;
 			productReference = 86D5FF1D21616A4A007DC0DD /* Example.app */;
@@ -107,7 +107,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1000;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1240;
 				ORGANIZATIONNAME = MLSDev;
 				TargetAttributes = {
 					86D5FF1C21616A4A007DC0DD = {
@@ -128,7 +128,7 @@
 			);
 			mainGroup = 86D5FF1421616A4A007DC0DD;
 			packageReferences = (
-				865EEAD42438AF3A00F4BEC3 /* XCRemoteSwiftPackageReference "RxLocalizer" */,
+				7F7EC35D25FA9E4800B1E2F7 /* XCRemoteSwiftPackageReference "RxLocalizer" */,
 			);
 			productRefGroup = 86D5FF1E21616A4A007DC0DD /* Products */;
 			projectDirPath = "";
@@ -224,6 +224,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;
@@ -257,6 +258,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -287,6 +289,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;
@@ -313,6 +316,7 @@
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -324,7 +328,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Example/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -343,7 +347,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Example/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -379,20 +383,20 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		865EEAD42438AF3A00F4BEC3 /* XCRemoteSwiftPackageReference "RxLocalizer" */ = {
+		7F7EC35D25FA9E4800B1E2F7 /* XCRemoteSwiftPackageReference "RxLocalizer" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "file:///Users/vladislav/Developer/RxSwiftCommunity/RxLocalizer";
+			repositoryURL = "file:///Users/vladkhambir/Developer/RxLocalizer";
 			requirement = {
-				branch = master;
-				kind = branch;
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.5.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		865EEAD52438AF3A00F4BEC3 /* RxLocalizer */ = {
+		7F7EC35E25FA9E4800B1E2F7 /* RxLocalizer */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 865EEAD42438AF3A00F4BEC3 /* XCRemoteSwiftPackageReference "RxLocalizer" */;
+			package = 7F7EC35D25FA9E4800B1E2F7 /* XCRemoteSwiftPackageReference "RxLocalizer" */;
 			productName = RxLocalizer;
 		};
 /* End XCSwiftPackageProductDependency section */

diff --git a/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -3,20 +3,20 @@
     "pins": [
       {
         "package": "RxLocalizer",
-        "repositoryURL": "/Users/vladislav/Developer/RxSwiftCommunity/RxLocalizer",
+        "repositoryURL": "/Users/vladkhambir/Developer/RxLocalizer",
         "state": {
-          "branch": "master",
+          "branch": null,
           "revision": "8af586cfd4425598920f04a5b48e27627e8da398",
-          "version": null
+          "version": "1.5.0"
         }
       },
       {
         "package": "RxSwift",
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa",
-          "version": "5.1.1"
+          "revision": "254617dd7fae0c45319ba5fbea435bf4d0e15b5d",
+          "version": "5.1.2"
         }
       }
     ]

diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa",
-          "version": "5.1.1"
+          "revision": "7e01c05f25c025143073eaa3be3532f9375c614b",
+          "version": "6.1.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
     name: "RxLocalizer",
 
     platforms: [
-        .iOS(.v10),
+        .iOS(.v12),
         .tvOS(.v10),
         .macOS(.v10_12),
         .watchOS(.v3)
@@ -22,7 +22,7 @@ let package = Package(
         .library(name: "RxLocalizer", targets: ["RxLocalizer"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.1.1"))
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.1.0"))
     ],
     targets: [
          .target(

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/RxSwiftCommunity/RxLocalizer.svg?branch=master)](https://travis-ci.org/RxSwiftCommunity/RxLocalizer)
-[![Swift](https://img.shields.io/badge/swift-5-orange.svg)](https://github.com/RxSwiftCommunity/RxLocalizer)
-[![RxSwift](https://img.shields.io/badge/RxSwift-5-red.svg)](https://github.com/ReactiveX/RxSwift)
-[![Platform](https://img.shields.io/badge/iOS-10+-blue.svg)](https://github.com/RxSwiftCommunity/RxLocalizer/blob/master/LICENSE)
+[![Swift](https://img.shields.io/badge/swift-5.3-orange.svg)](https://github.com/RxSwiftCommunity/RxLocalizer)
+[![RxSwift](https://img.shields.io/badge/RxSwift-6.1-red.svg)](https://github.com/ReactiveX/RxSwift)
+[![Platform](https://img.shields.io/badge/iOS-12+-blue.svg)](https://github.com/RxSwiftCommunity/RxLocalizer/blob/master/LICENSE)
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/RxSwiftCommunity/RxLocalizer/blob/master/LICENSE)
 
 # 🚀 RxLocalizer
@@ -12,9 +12,9 @@ RxLocalizer is a framework written in swift which allows you to localize your ap
 
 ## 🛠 Requirements
 
-- Xcode 11.4
+- Xcode 12.4
 - Swift 5+
-- iOS 10+
+- iOS 12+
 
 ## ⚙️ Installation
 

diff --git a/RxLocalizer.podspec b/RxLocalizer.podspec
@@ -1,18 +1,18 @@
 Pod::Spec.new do |s|
 
 s.platform = :ios
-s.ios.deployment_target = '10.0'
+s.ios.deployment_target = '12.0'
 s.name = "RxLocalizer"
 s.summary = "RxLocalizer allows you to localize your app with RxSwift."
 s.requires_arc = true
-s.version = "1.5.0"
+s.version = "1.6.0"
 s.license = { :type => "MIT", :file => "LICENSE" }
 s.author = { "Vladislav Khambir" => "[email protected]" }
 s.homepage = "https://github.com/RxSwiftCommunity/RxLocalizer"
 s.source = { :git => "https://github.com/RxSwiftCommunity/RxLocalizer.git", :tag => "#{s.version}" }
-s.dependency 'RxSwift', '~> 5.1.1'
-s.dependency 'RxCocoa', '~> 5.1.1'
+s.dependency 'RxSwift', '~> 6.1.0'
+s.dependency 'RxCocoa', '~> 6.1.0'
 s.source_files = 'Source/*.swift'
-s.swift_version = "5.0.0"
+s.swift_version = "5.3.3"
 
 end
diff --git a/RxLocalizer.xcodeproj/project.pbxproj b/RxLocalizer.xcodeproj/project.pbxproj
@@ -130,7 +130,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1000;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1240;
 				ORGANIZATIONNAME = MLSDev;
 				TargetAttributes = {
 					86A9B7A42160D31400A61981 = {
@@ -209,6 +209,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;
@@ -235,7 +236,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -274,6 +275,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;
@@ -294,7 +296,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -320,13 +322,13 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.vladkhambir.RxLocalizer;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -349,13 +351,13 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.vladkhambir.RxLocalizer;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";