diff --git a/Gigya.podspec b/Gigya.podspec
index fdcd3e5c..b90409c1 100644
--- a/Gigya.podspec
+++ b/Gigya.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'Gigya'
- spec.version = '1.2.1'
+ spec.version = '1.2.2'
spec.license = 'Apache 2.0'
spec.homepage = 'https://developers.gigya.com/display/GD/Swift+SDK'
spec.author = 'Gigya SAP'
diff --git a/GigyaAuth/GigyaAuth.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist b/GigyaAuth/GigyaAuth.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
index a850d526..87b44c36 100644
--- a/GigyaAuth/GigyaAuth.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/GigyaAuth/GigyaAuth.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,7 +12,7 @@
GigyaAuth.xcscheme_^#shared#^_
orderHint
- 15
+ 14
diff --git a/GigyaE2ETestsApp/GigyaE2ETestsApp.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist b/GigyaE2ETestsApp/GigyaE2ETestsApp.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
index b285b6e8..9ae636f4 100644
--- a/GigyaE2ETestsApp/GigyaE2ETestsApp.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/GigyaE2ETestsApp/GigyaE2ETestsApp.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
GigyaE2ETestsApp.xcscheme_^#shared#^_
orderHint
- 46
+ 44
diff --git a/GigyaNss/GigyaNss.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist b/GigyaNss/GigyaNss.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
index 829d4754..4f2d7812 100644
--- a/GigyaNss/GigyaNss.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/GigyaNss/GigyaNss.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,17 +7,17 @@
GigyaNss-Universal-Debug.xcscheme_^#shared#^_
orderHint
- 11
+ 8
GigyaNss-Universal-Release.xcscheme_^#shared#^_
orderHint
- 13
+ 11
GigyaNss.xcscheme_^#shared#^_
orderHint
- 2
+ 3
SuppressBuildableAutocreation
diff --git a/GigyaNss/GigyaNss/Actions/Action.swift b/GigyaNss/GigyaNss/Actions/Action.swift
index bc370e47..e7c747fe 100644
--- a/GigyaNss/GigyaNss/Actions/Action.swift
+++ b/GigyaNss/GigyaNss/Actions/Action.swift
@@ -9,7 +9,7 @@
import Flutter
import Gigya
-protocol NssActionProtocol: class {
+protocol NssActionProtocol: AnyObject {
var actionId: NssAction? { get set }
var delegate: FlowManagerDelegate? { get set }
diff --git a/GigyaNss/GigyaNss/Cordinator/FlowManagerDelegate.swift b/GigyaNss/GigyaNss/Cordinator/FlowManagerDelegate.swift
index 8507fd83..852243ef 100644
--- a/GigyaNss/GigyaNss/Cordinator/FlowManagerDelegate.swift
+++ b/GigyaNss/GigyaNss/Cordinator/FlowManagerDelegate.swift
@@ -9,7 +9,7 @@
import Gigya
import Flutter
-protocol FlowManagerDelegate: class {
+protocol FlowManagerDelegate: AnyObject {
func getMainLoginClosure(obj: T.Type) -> MainClosure
diff --git a/GigyaNssEngine/GigyaNssEngine.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist b/GigyaNssEngine/GigyaNssEngine.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
index 4e4806df..51446625 100644
--- a/GigyaNssEngine/GigyaNssEngine.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/GigyaNssEngine/GigyaNssEngine.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,17 +7,17 @@
GigyaNssEngine-Universal-Debug.xcscheme_^#shared#^_
orderHint
- 44
+ 45
GigyaNssEngine-Universal-Release.xcscheme_^#shared#^_
orderHint
- 9
+ 6
GigyaNssEngine.xcscheme_^#shared#^_
orderHint
- 7
+ 5
diff --git a/GigyaNssRelease.podspec b/GigyaNssRelease.podspec
index 8432b4dd..43671946 100644
--- a/GigyaNssRelease.podspec
+++ b/GigyaNssRelease.podspec
@@ -25,10 +25,11 @@ Pod::Spec.new do |spec|
ss.dependency 'Gigya', '>= 1.2.0'
ss.framework = 'SystemConfiguration'
ss.library = 'c++', 'z'
-
- ss.dependency 'Flutter', '2.0.0'
+
+ ss.dependency 'Flutter', '2.0.2'
ss.vendored_frameworks = 'GigyaNss/Flutter/Release/App.xcframework'
+
end
spec.subspec 'Auth' do |ss|
@@ -37,6 +38,7 @@ Pod::Spec.new do |spec|
end
+
spec.pod_target_xcconfig = {
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
}
diff --git a/GigyaSwift.xcodeproj/project.pbxproj b/GigyaSwift.xcodeproj/project.pbxproj
index be5be689..f500a633 100644
--- a/GigyaSwift.xcodeproj/project.pbxproj
+++ b/GigyaSwift.xcodeproj/project.pbxproj
@@ -6,6 +6,20 @@
objectVersion = 52;
objects = {
+/* Begin PBXAggregateTarget section */
+ E7F5C8ED26B6B67D00C63D60 /* GigyaXC */ = {
+ isa = PBXAggregateTarget;
+ buildConfigurationList = E7F5C8EE26B6B67E00C63D60 /* Build configuration list for PBXAggregateTarget "GigyaXC" */;
+ buildPhases = (
+ E7F5C8F126B6B68200C63D60 /* ShellScript */,
+ );
+ dependencies = (
+ );
+ name = GigyaXC;
+ productName = GigyaXC;
+ };
+/* End PBXAggregateTarget section */
+
/* Begin PBXBuildFile section */
D52F88EA22795F39007DE20F /* PluginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D52F88E922795F39007DE20F /* PluginViewController.swift */; };
D584D342228D6089004CA28F /* UIFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D584D341228D6089004CA28F /* UIFactory.swift */; };
@@ -1555,6 +1569,9 @@
};
};
};
+ E7F5C8ED26B6B67D00C63D60 = {
+ CreatedOnToolsVersion = 12.5;
+ };
};
};
buildConfigurationList = E7BE366D2224219200A108D9 /* Build configuration list for PBXProject "GigyaSwift" */;
@@ -1577,6 +1594,7 @@
E7A71CB1232F9FDC00993A61 /* TestAppUITests */,
E76F2E712345E72500056D19 /* GigyaUITestsApp */,
E76F2E862345E72700056D19 /* GigyaUITestsAppUITests */,
+ E7F5C8ED26B6B67D00C63D60 /* GigyaXC */,
);
};
/* End PBXProject section */
@@ -1724,7 +1742,25 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if which swiftlint1 >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+ shellScript = "
+";
+ };
+ E7F5C8F126B6B68200C63D60 /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ );
+ inputPaths = (
+ );
+ outputFileListPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "# set framework folder name\nFRAMEWORK_FOLDER_NAME=\"${PROJECT_NAME}_XCFramework\"\n# set framework name or read it from project by this variable\nFRAMEWORK_NAME=\"GigyaSwift.xcworkspace\"\nFRAMEWORK_SCHEMA=\"Gigya\"\n\n#xcframework path\nFRAMEWORK_PATH=\"${PROJECT_DIR}/XC/${FRAMEWORK_FOLDER_NAME}/${FRAMEWORK_SCHEMA}.xcframework\"\n# set path for iOS simulator archive\nSIMULATOR_ARCHIVE_PATH=\"${PROJECT_DIR}/${FRAMEWORK_FOLDER_NAME}/simulator.xcarchive\"\n# set path for iOS device archive\nIOS_DEVICE_ARCHIVE_PATH=\"${PROJECT_DIR}/${FRAMEWORK_FOLDER_NAME}/iOS.xcarchive\"\nrm -rf \"${PROJECT_DIR}/XC/${FRAMEWORK_FOLDER_NAME}/${FRAMEWORK_SCHEMA}\"\necho \"Deleted ${FRAMEWORK_FOLDER_NAME}\"\nmkdir \"${FRAMEWORK_FOLDER_NAME}\"\necho \"Created ${FRAMEWORK_FOLDER_NAME}\"\necho \"Archiving ${FRAMEWORK_NAME}\"\n\nxcodebuild archive -workspace \"${FRAMEWORK_NAME}\" -scheme ${FRAMEWORK_SCHEMA} -destination=\"iOS Simulator\" -archivePath \"${SIMULATOR_ARCHIVE_PATH}\" -sdk iphonesimulator SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES\n\nxcodebuild archive -workspace \"${FRAMEWORK_NAME}\" -scheme ${FRAMEWORK_SCHEMA} -destination=\"iOS\" -archivePath \"${IOS_DEVICE_ARCHIVE_PATH}\" -sdk iphoneos SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES\n#Creating XCFramework\nxcodebuild -create-xcframework -framework ${SIMULATOR_ARCHIVE_PATH}/Products/Library/Frameworks/${FRAMEWORK_SCHEMA}.framework -framework ${IOS_DEVICE_ARCHIVE_PATH}/Products/Library/Frameworks/${FRAMEWORK_SCHEMA}.framework -output \"${FRAMEWORK_PATH}\"\nrm -rf \"${SIMULATOR_ARCHIVE_PATH}\"\nrm -rf \"${IOS_DEVICE_ARCHIVE_PATH}\"\nopen \"${PROJECT_DIR}/XC/${FRAMEWORK_FOLDER_NAME}\"\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -2311,7 +2347,7 @@
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 103;
+ CURRENT_PROJECT_VERSION = 120;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 52P2295V75;
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2331,7 +2367,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- MARKETING_VERSION = 1.2.1;
+ MARKETING_VERSION = 1.2.2;
MODULEMAP_FILE = "";
MODULEMAP_PRIVATE_FILE = "";
ONLY_ACTIVE_ARCH = NO;
@@ -2350,6 +2386,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
+ VALIDATE_WORKSPACE = YES;
VALID_ARCHS = "arm64 arm64e armv7 armv7s x86_64";
};
name = Debug;
@@ -2368,7 +2405,7 @@
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 103;
+ CURRENT_PROJECT_VERSION = 120;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 52P2295V75;
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2388,9 +2425,10 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- MARKETING_VERSION = 1.2.1;
+ MARKETING_VERSION = 1.2.2;
MODULEMAP_FILE = "";
MODULEMAP_PRIVATE_FILE = "";
+ ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
"-ObjC",
@@ -2406,6 +2444,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
+ VALIDATE_WORKSPACE = YES;
VALID_ARCHS = "arm64 arm64e armv7 armv7s x86_64";
};
name = Release;
@@ -2504,6 +2543,24 @@
};
name = Release;
};
+ E7F5C8EF26B6B67E00C63D60 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CODE_SIGN_STYLE = Automatic;
+ DEVELOPMENT_TEAM = 52P2295V75;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Debug;
+ };
+ E7F5C8F026B6B67E00C63D60 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CODE_SIGN_STYLE = Automatic;
+ DEVELOPMENT_TEAM = 52P2295V75;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Release;
+ };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -2570,6 +2627,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
+ E7F5C8EE26B6B67E00C63D60 /* Build configuration list for PBXAggregateTarget "GigyaXC" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ E7F5C8EF26B6B67E00C63D60 /* Debug */,
+ E7F5C8F026B6B67E00C63D60 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
/* End XCConfigurationList section */
};
rootObject = E7BE366A2224219200A108D9 /* Project object */;
diff --git a/GigyaSwift.xcodeproj/xcshareddata/xcschemes/Gigya.xcscheme b/GigyaSwift.xcodeproj/xcshareddata/xcschemes/Gigya.xcscheme
index 06c85773..b528a053 100644
--- a/GigyaSwift.xcodeproj/xcshareddata/xcschemes/Gigya.xcscheme
+++ b/GigyaSwift.xcodeproj/xcshareddata/xcschemes/Gigya.xcscheme
@@ -114,7 +114,7 @@
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+ scriptText = "#exec > /tmp/${PROJECT_NAME}_archive.log 2>&1
#
#UNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/${CONFIGURATION}-universal
#
#if [ "true" == ${ALREADYINVOKED:-false} ]
#then
#echo "RECURSION: Detected, stopping"
#else
#export ALREADYINVOKED="true"
#
## make sure the output directory exists
#mkdir -p "${UNIVERSAL_OUTPUTFOLDER}"
##mkdir -p "${UNIVERSAL_OUTPUTFOLDER}/${TARGET_NAME}.framework"
#
#echo "Building for iPhoneSimulator"
#echo "${CONFIGURATION} "
#xcodebuild -workspace "${WORKSPACE_PATH}" -scheme "${TARGET_NAME}" -configuration ${CONFIGURATION} -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO ARCHS='i386 x86_64' BUILD_DIR="${BUILD_DIR}" BUILD_ROOT="${BUILD_ROOT}" ENABLE_BITCODE=YES OTHER_CFLAGS="-fembed-bitcode" BITCODE_GENERATION_MODE=bitcode clean build
#
## Step 1. Copy the framework structure (from iphoneos build) to the universal folder
#echo "Copying to output folder"
#cp -R "${ARCHIVE_PRODUCTS_PATH}${INSTALL_PATH}/" "${UNIVERSAL_OUTPUTFOLDER}"
">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GigyaSwift.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme b/GigyaSwift.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme
index 3efce303..23869255 100644
--- a/GigyaSwift.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme
+++ b/GigyaSwift.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme
@@ -89,7 +89,7 @@
GigyaUITestsApp.xcscheme_^#shared#^_
orderHint
- 2
+ 46
+
+ GigyaXC.xcscheme_^#shared#^_
+
+ orderHint
+ 47
TestApp.xcscheme_^#shared#^_
orderHint
- 1
+ 2
+
+
+ SuppressBuildableAutocreation
+
+ E7F5C8ED26B6B67D00C63D60
+
+ primary
+
diff --git a/GigyaSwift/Gigya/GigyaCore.swift b/GigyaSwift/Gigya/GigyaCore.swift
index a0013d21..611a171f 100644
--- a/GigyaSwift/Gigya/GigyaCore.swift
+++ b/GigyaSwift/Gigya/GigyaCore.swift
@@ -70,7 +70,7 @@ public final class GigyaCore: GigyaInstanceProtocol {
initFor(apiKey: apiKey, apiDomain: plistConfig?.apiDomain)
}
- if let ccountConfig = plistConfig?.account {
+ if let ccountConfig: GigyaAccountConfig = plistConfig?.account {
config.accountConfig = ccountConfig
}
diff --git a/GigyaSwift/Global/Account/AccountServiceProtocol.swift b/GigyaSwift/Global/Account/AccountServiceProtocol.swift
index a31f8c53..cf6f97c2 100644
--- a/GigyaSwift/Global/Account/AccountServiceProtocol.swift
+++ b/GigyaSwift/Global/Account/AccountServiceProtocol.swift
@@ -8,7 +8,7 @@
import Foundation
-public protocol AccountServiceProtocol: class {
+public protocol AccountServiceProtocol: AnyObject {
var account: Any? { get set }
func getAccount() -> T
diff --git a/GigyaSwift/Global/Api/BusinessApiDelegate.swift b/GigyaSwift/Global/Api/BusinessApiDelegate.swift
index a39e9b9b..b1eda325 100644
--- a/GigyaSwift/Global/Api/BusinessApiDelegate.swift
+++ b/GigyaSwift/Global/Api/BusinessApiDelegate.swift
@@ -9,7 +9,7 @@
import Foundation
import UIKit
-public protocol BusinessApiDelegate: class {
+public protocol BusinessApiDelegate: AnyObject {
func sendApi(api: String, params: [String: Any], completion: @escaping (GigyaApiResult) -> Void )
diff --git a/GigyaSwift/Global/Providers/Provider.swift b/GigyaSwift/Global/Providers/Provider.swift
index 842f8561..af2f2d51 100644
--- a/GigyaSwift/Global/Providers/Provider.swift
+++ b/GigyaSwift/Global/Providers/Provider.swift
@@ -8,7 +8,7 @@
import UIKit
-protocol Provider: class {
+protocol Provider: AnyObject {
var delegate: BusinessApiDelegate? { get set }
diff --git a/GigyaSwift/Models/Config/InternalConfig.swift b/GigyaSwift/Models/Config/InternalConfig.swift
index b1c4b80a..2a540ac9 100644
--- a/GigyaSwift/Models/Config/InternalConfig.swift
+++ b/GigyaSwift/Models/Config/InternalConfig.swift
@@ -10,7 +10,7 @@ import Foundation
struct InternalConfig {
struct General {
- internal static let version = "\(GigyaDefinitions.versionPrefix ?? "")ios_swift_1.2.1"
+ internal static let version = "\(GigyaDefinitions.versionPrefix ?? "")ios_swift_1.2.2"
internal static let sdkDomain = "com.gigya.GigyaSDK"
internal static let defaultLang = "en"
}
diff --git a/GigyaTfa/GigyaTfa.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist b/GigyaTfa/GigyaTfa.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
index c87035f4..cdb93039 100644
--- a/GigyaTfa/GigyaTfa.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/GigyaTfa/GigyaTfa.xcodeproj/xcuserdata/i507698.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
GigyaTfa-Universal.xcscheme_^#shared#^_
orderHint
- 5
+ 4
GigyaTfa.xcscheme_^#shared#^_