Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
sagishm committed Jun 25, 2023
2 parents 4f5544e + 2c2b032 commit dee2961
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Gigya.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'Gigya'
spec.version = '1.5.2'
spec.version = '1.5.3'
spec.license = 'Apache 2.0'
spec.homepage = 'https://developers.gigya.com/display/GD/Swift+SDK'
spec.author = 'Gigya SAP'
Expand All @@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
your Swift application
DESC

spec.source = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'core/v1.5.2' }
spec.source = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'core/v1.5.3' }
spec.module_name = 'Gigya'
spec.swift_version = '5.3'

Expand Down
4 changes: 2 additions & 2 deletions GigyaNss.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'GigyaNss'
spec.version = '1.7.1'
spec.version = '1.7.2'
spec.license = 'Apache 2.0'
spec.homepage = 'https://developers.gigya.com/display/GD/Native+Screen-Sets'
spec.author = 'Gigya SAP'
Expand All @@ -9,7 +9,7 @@ Pod::Spec.new do |spec|
authentication methods from the standard login flow
DESC

spec.source = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'nss/v1.7.1' }
spec.source = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'nss/v1.7.2' }
spec.module_name = 'GigyaNss'
spec.swift_version = '5.2'

Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
</data>
<key>flutter_assets/kernel_blob.bin</key>
<data>
tYGT/2cExaV3sQODyIOaTSt8168=
ASNHFxn2rXUcfreDQHAkSvKRtQc=
</data>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data>
Expand Down Expand Up @@ -380,7 +380,7 @@
<dict>
<key>hash2</key>
<data>
Y/mMp0EnhISmpdNctnCdl/zXgDEKvhEnsmF1mWscalE=
b8Kg6BjlNEJcbIGLiBhDyVSxN2I8JP4DSBLMobUIeak=
</data>
</dict>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
Expand Down
Binary file not shown.
Binary file removed GigyaNss/Flutter/Release/.DS_Store
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions GigyaNssRelease.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'GigyaNssRelease'
spec.version = '1.7.1'
spec.version = '1.7.2'
spec.license = 'Apache 2.0'
spec.homepage = 'https://developers.gigya.com/display/GD/Native+Screen-Sets'
spec.author = 'Gigya SAP'
Expand All @@ -9,7 +9,7 @@ Pod::Spec.new do |spec|
authentication methods from the standard login flow
DESC

spec.source = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'nss/v1.7.1' }
spec.source = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'nss/v1.7.2' }
spec.module_name = 'GigyaNss'
spec.swift_version = '5.2'

Expand Down
4 changes: 2 additions & 2 deletions GigyaSwift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2590,7 +2590,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.5.2;
MARKETING_VERSION = 1.5.3;
MODULEMAP_FILE = "";
MODULEMAP_PRIVATE_FILE = "";
ONLY_ACTIVE_ARCH = NO;
Expand Down Expand Up @@ -2651,7 +2651,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.5.2;
MARKETING_VERSION = 1.5.3;
MODULEMAP_FILE = "";
MODULEMAP_PRIVATE_FILE = "";
ONLY_ACTIVE_ARCH = NO;
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -726,8 +726,8 @@
filePath = "TestApp/UI/ViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "663"
endingLineNumber = "663"
startingLineNumber = "665"
endingLineNumber = "665"
landmarkName = "loginWithProviders(_:)"
landmarkType = "7">
<Locations>
Expand Down Expand Up @@ -776,6 +776,21 @@
endingLineNumber = "664"
offsetFromSymbolStart = "972">
</Location>
<Location
uuid = "EC9506FD-6088-4265-97E0-8B7AB9182B1B - 122a239a8012011d"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "TestApp.ViewController.loginWithProviders(Any) -&gt; ()"
moduleName = "TestApp"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/i507698/Documents/gigya-swift-sdk/TestApp/UI/ViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "666"
endingLineNumber = "666"
offsetFromSymbolStart = "916">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
Expand Down Expand Up @@ -1023,7 +1038,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "14E8A73A-1003-437E-B0D6-5E73BF121FCE"
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "GigyaSwift/Global/Plugins/PluginViewController.swift"
Expand Down Expand Up @@ -1055,7 +1070,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "4DBBA2CA-EAA8-4F36-A22D-85F984A03D26"
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "GigyaSwift/Global/Plugins/GigyaWebBridge.swift"
Expand Down
2 changes: 1 addition & 1 deletion GigyaSwift/Models/Config/InternalConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation

struct InternalConfig {
struct General {
internal static let version = "\(GigyaDefinitions.versionPrefix ?? "")ios_swift_1.5.2"
internal static let version = "\(GigyaDefinitions.versionPrefix ?? "")ios_swift_1.5.3"
internal static let sdkDomain = "com.gigya.GigyaSDK"
internal static let defaultLang = "en"
}
Expand Down

0 comments on commit dee2961

Please sign in to comment.