Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@sagishm
sagishm committed Aug 19, 2021
2 parents 0bec7c5 + c2c58e1 commit 95379b5
Show file tree
Hide file tree
Showing 17 changed files with 75 additions and 157 deletions.
4 changes: 2 additions & 2 deletions GigyaNss.podspec
View file
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.3.0'
spec.version = '1.3.1'
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.3.0' }
spec.source = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'nss/v1.3.1' }
spec.module_name = 'GigyaNss'
spec.swift_version = '5.2'

Expand Down
14 changes: 7 additions & 7 deletions GigyaNss/Flutter/Debug/App.xcframework/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_armv7</string>
<string>ios-x86_64-simulator</string>
<key>LibraryPath</key>
<string>App.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>armv7</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-x86_64-simulator</string>
<string>ios-arm64_armv7</string>
<key>LibraryPath</key>
<string>App.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>x86_64</string>
<string>arm64</string>
<string>armv7</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
Binary file modified GigyaNss/Flutter/Debug/App.xcframework/ios-arm64_armv7/App.framework/App
View file
Binary file not shown.
38 changes: 12 additions & 26 deletions ...er/Debug/App.xcframework/ios-arm64_armv7/App.framework/flutter_assets/assets/example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@
16,
0
],
"background": "green"
"cornerRadius": 22,
"borderSize": 1
},
"validations": {
"required": {
Expand Down Expand Up @@ -384,31 +385,16 @@
},
{
"bind": "data.terms",
"type": "container",
"stack": "horizontal",
"alignment": "start",
"children": [
{
"bind": "data.terms",
"type": "checkbox",
"textKey": "register-terms+link",
"style": {
"fontSize": 16,
"fontColor": "grey",
"size": [
240,
80
]
}
},
{
"type": "label",
"textKey": "test test",
"style": {
"fontSize": 16
}
}
]
"type": "checkbox",
"textKey": "register-terms+link",
"style": {
"margin": [
16,
0,
16,
0
]
}
},
{
"type": "label",
Expand Down
8 changes: 3 additions & 5 deletions ...ug/App.xcframework/ios-arm64_armv7/App.framework/flutter_assets/assets/example_tests.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"theme": {
"primaryColor": "blue",
"secondaryColor": "red",
"secondaryColor": "white",
"textColor": "black",
"enabledColor": "blue",
"disabledColor": "grey",
Expand Down Expand Up @@ -528,13 +528,11 @@
},
{
"type": "radio",
"bind": "#data.favGuitar",
"bind": "data.favGuitar",
"style": {
"fontSize": 10,
"borderSize": 5,
"margin": [
16,
0,
30,
16,
0
]
Expand Down
Binary file modified ...lutter/Debug/App.xcframework/ios-arm64_armv7/App.framework/flutter_assets/kernel_blob.bin
View file
Binary file not shown.
38 changes: 12 additions & 26 deletions ...bug/App.xcframework/ios-x86_64-simulator/App.framework/flutter_assets/assets/example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@
16,
0
],
"background": "green"
"cornerRadius": 22,
"borderSize": 1
},
"validations": {
"required": {
Expand Down Expand Up @@ -384,31 +385,16 @@
},
{
"bind": "data.terms",
"type": "container",
"stack": "horizontal",
"alignment": "start",
"children": [
{
"bind": "data.terms",
"type": "checkbox",
"textKey": "register-terms+link",
"style": {
"fontSize": 16,
"fontColor": "grey",
"size": [
240,
80
]
}
},
{
"type": "label",
"textKey": "test test",
"style": {
"fontSize": 16
}
}
]
"type": "checkbox",
"textKey": "register-terms+link",
"style": {
"margin": [
16,
0,
16,
0
]
}
},
{
"type": "label",
Expand Down
8 changes: 3 additions & 5 deletions ...p.xcframework/ios-x86_64-simulator/App.framework/flutter_assets/assets/example_tests.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"theme": {
"primaryColor": "blue",
"secondaryColor": "red",
"secondaryColor": "white",
"textColor": "black",
"enabledColor": "blue",
"disabledColor": "grey",
Expand Down Expand Up @@ -528,13 +528,11 @@
},
{
"type": "radio",
"bind": "#data.favGuitar",
"bind": "data.favGuitar",
"style": {
"fontSize": 10,
"borderSize": 5,
"margin": [
16,
0,
30,
16,
0
]
Expand Down
Binary file modified ...r/Debug/App.xcframework/ios-x86_64-simulator/App.framework/flutter_assets/kernel_blob.bin
View file
Binary file not shown.
Binary file modified GigyaNss/Flutter/Release/App.xcframework/ios-arm64_armv7/App.framework/App
View file
Binary file not shown.
38 changes: 12 additions & 26 deletions .../Release/App.xcframework/ios-arm64_armv7/App.framework/flutter_assets/assets/example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@
16,
0
],
"background": "green"
"cornerRadius": 22,
"borderSize": 1
},
"validations": {
"required": {
Expand Down Expand Up @@ -384,31 +385,16 @@
},
{
"bind": "data.terms",
"type": "container",
"stack": "horizontal",
"alignment": "start",
"children": [
{
"bind": "data.terms",
"type": "checkbox",
"textKey": "register-terms+link",
"style": {
"fontSize": 16,
"fontColor": "grey",
"size": [
240,
80
]
}
},
{
"type": "label",
"textKey": "test test",
"style": {
"fontSize": 16
}
}
]
"type": "checkbox",
"textKey": "register-terms+link",
"style": {
"margin": [
16,
0,
16,
0
]
}
},
{
"type": "label",
Expand Down
8 changes: 3 additions & 5 deletions ...se/App.xcframework/ios-arm64_armv7/App.framework/flutter_assets/assets/example_tests.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"theme": {
"primaryColor": "blue",
"secondaryColor": "red",
"secondaryColor": "white",
"textColor": "black",
"enabledColor": "blue",
"disabledColor": "grey",
Expand Down Expand Up @@ -528,13 +528,11 @@
},
{
"type": "radio",
"bind": "#data.favGuitar",
"bind": "data.favGuitar",
"style": {
"fontSize": 10,
"borderSize": 5,
"margin": [
16,
0,
30,
16,
0
]
Expand Down
38 changes: 12 additions & 26 deletions ...ase/App.xcframework/ios-x86_64-simulator/App.framework/flutter_assets/assets/example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@
16,
0
],
"background": "green"
"cornerRadius": 22,
"borderSize": 1
},
"validations": {
"required": {
Expand Down Expand Up @@ -384,31 +385,16 @@
},
{
"bind": "data.terms",
"type": "container",
"stack": "horizontal",
"alignment": "start",
"children": [
{
"bind": "data.terms",
"type": "checkbox",
"textKey": "register-terms+link",
"style": {
"fontSize": 16,
"fontColor": "grey",
"size": [
240,
80
]
}
},
{
"type": "label",
"textKey": "test test",
"style": {
"fontSize": 16
}
}
]
"type": "checkbox",
"textKey": "register-terms+link",
"style": {
"margin": [
16,
0,
16,
0
]
}
},
{
"type": "label",
Expand Down
8 changes: 3 additions & 5 deletions ...p.xcframework/ios-x86_64-simulator/App.framework/flutter_assets/assets/example_tests.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"theme": {
"primaryColor": "blue",
"secondaryColor": "red",
"secondaryColor": "white",
"textColor": "black",
"enabledColor": "blue",
"disabledColor": "grey",
Expand Down Expand Up @@ -528,13 +528,11 @@
},
{
"type": "radio",
"bind": "#data.favGuitar",
"bind": "data.favGuitar",
"style": {
"fontSize": 10,
"borderSize": 5,
"margin": [
16,
0,
30,
16,
0
]
Expand Down
8 changes: 4 additions & 4 deletions GigyaNss/GigyaNss.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 18;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = T48CNFXFQH;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -734,7 +734,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.3.0;
MARKETING_VERSION = 1.3.1;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = Gigya.GigyaNss;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand All @@ -755,7 +755,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 18;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = T48CNFXFQH;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -775,7 +775,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.3.0;
MARKETING_VERSION = 1.3.1;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = Gigya.GigyaNss;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand Down
Loading

0 comments on commit 95379b5

Please sign in to comment.