Skip to content

Commit 15f6e74

Browse files
michaelavoyanmichaelavoyan
authored
Merge pull request #359 from velocitycareerlabs/VL-7807-PR-refactor
chore: refactor v2.7.3
2 parents e53ebfb + 0a82c63 commit 15f6e74

File tree

10 files changed

+416
-497
lines changed

10 files changed

+416
-497
lines changed

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ dependencies {
9292
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
9393

9494
//--------- Must: be added:
95-
implementation "io.velocitycareerlabs:vcl:2.7.2"
95+
implementation "io.velocitycareerlabs:vcl:2.7.3"
9696
implementation 'com.nimbusds:nimbus-jose-jwt:10.0.1'
9797
implementation "androidx.security:security-crypto:1.1.0-alpha07"
9898
//-------------------------

‎android/src/main/java/io/velocitycareerlabs/reactnative/utlis/Converter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ object Converter {
699699
refreshToken = mapToToken(authTokenDescriptorMap.getMapOpt("refreshToken")),
700700
walletDid = authTokenDescriptorMap.getStringOpt("walletDid"),
701701
relyingPartyDid = authTokenDescriptorMap.getStringOpt("relyingPartyDid"),
702-
vendorOriginContext = authTokenDescriptorMap.getStringOpt("vendorOriginContext")
702+
authorizationCode = authTokenDescriptorMap.getStringOpt("authorizationCode")
703703
)
704704
}
705705

‎example/ios/Podfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,12 +1054,12 @@ PODS:
10541054
- React-logger (= 0.73.6)
10551055
- React-perflogger (= 0.73.6)
10561056
- SocketRocket (0.6.1)
1057-
- VCL (2.7.2)
1058-
- velocitycareerlabs-vcl-react-native (2.7.2):
1057+
- VCL (2.7.3)
1058+
- velocitycareerlabs-vcl-react-native (2.7.3):
10591059
- glog
10601060
- RCT-Folly (= 2022.05.16.00)
10611061
- React-Core
1062-
- VCL (= 2.7.2)
1062+
- VCL (= 2.7.3)
10631063
- Yoga (1.14.0)
10641064

10651065
DEPENDENCIES:
@@ -1276,8 +1276,8 @@ SPEC CHECKSUMS:
12761276
React-utils: 288c9cb9a73bb150c273c84df7c2f8546f28e23f
12771277
ReactCommon: 2e5492a3e3a8e72d635c266405e49d12627e5bf0
12781278
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
1279-
VCL: 4f0ecc3b624e34ec0395f9738aabd93d7369240b
1280-
velocitycareerlabs-vcl-react-native: a4f3df0dece79f9c6a0fcf2d8e376871e9dc5590
1279+
VCL: e98d7108c62081906d3e408e4125085a0fedd039
1280+
velocitycareerlabs-vcl-react-native: 23fa2cfd5d493bbb63a7b7cca3f53fede89ab68f
12811281
Yoga: 805bf71192903b20fc14babe48080582fee65a80
12821282

12831283
PODFILE CHECKSUM: dda665d1488c2a02df92eccd852bd6de0cd38761

‎example/ios/VclReactNativeExample.xcodeproj/project.pbxproj‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1313
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1414
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
15-
E9C52268577A1959E422B658 /* libPods-VclReactNativeExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F04357A90D4136DBDA4F3C17 /* libPods-VclReactNativeExample.a */; };
15+
8B6C7EC5A3BBEBEB41ADD157 /* libPods-VclReactNativeExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8473B9FBD11FDE30ABAE7C1C /* libPods-VclReactNativeExample.a */; };
1616
/* End PBXBuildFile section */
1717

1818
/* Begin PBXContainerItemProxy section */
@@ -35,11 +35,11 @@
3535
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = VclReactNativeExample/Images.xcassets; sourceTree = "<group>"; };
3636
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = VclReactNativeExample/Info.plist; sourceTree = "<group>"; };
3737
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = VclReactNativeExample/main.m; sourceTree = "<group>"; };
38-
1572ECB6642567DEB010917C /* Pods-VclReactNativeExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VclReactNativeExample.debug.xcconfig"; path = "Target Support Files/Pods-VclReactNativeExample/Pods-VclReactNativeExample.debug.xcconfig"; sourceTree = "<group>"; };
38+
7637D2DADF74BD580836E457 /* Pods-VclReactNativeExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VclReactNativeExample.release.xcconfig"; path = "Target Support Files/Pods-VclReactNativeExample/Pods-VclReactNativeExample.release.xcconfig"; sourceTree = "<group>"; };
3939
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = VclReactNativeExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
40-
8779D90D30D4421DF56A4EC6 /* Pods-VclReactNativeExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VclReactNativeExample.release.xcconfig"; path = "Target Support Files/Pods-VclReactNativeExample/Pods-VclReactNativeExample.release.xcconfig"; sourceTree = "<group>"; };
40+
8473B9FBD11FDE30ABAE7C1C /* libPods-VclReactNativeExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VclReactNativeExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
41+
AABAA513DBD92735D6C69D51 /* Pods-VclReactNativeExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VclReactNativeExample.debug.xcconfig"; path = "Target Support Files/Pods-VclReactNativeExample/Pods-VclReactNativeExample.debug.xcconfig"; sourceTree = "<group>"; };
4142
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
42-
F04357A90D4136DBDA4F3C17 /* libPods-VclReactNativeExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VclReactNativeExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4343
/* End PBXFileReference section */
4444

4545
/* Begin PBXFrameworksBuildPhase section */
@@ -54,7 +54,7 @@
5454
isa = PBXFrameworksBuildPhase;
5555
buildActionMask = 2147483647;
5656
files = (
57-
E9C52268577A1959E422B658 /* libPods-VclReactNativeExample.a in Frameworks */,
57+
8B6C7EC5A3BBEBEB41ADD157 /* libPods-VclReactNativeExample.a in Frameworks */,
5858
);
5959
runOnlyForDeploymentPostprocessing = 0;
6060
};
@@ -95,7 +95,7 @@
9595
isa = PBXGroup;
9696
children = (
9797
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
98-
F04357A90D4136DBDA4F3C17 /* libPods-VclReactNativeExample.a */,
98+
8473B9FBD11FDE30ABAE7C1C /* libPods-VclReactNativeExample.a */,
9999
);
100100
name = Frameworks;
101101
sourceTree = "<group>";
@@ -134,8 +134,8 @@
134134
BBD78D7AC51CEA395F1C20DB /* Pods */ = {
135135
isa = PBXGroup;
136136
children = (
137-
1572ECB6642567DEB010917C /* Pods-VclReactNativeExample.debug.xcconfig */,
138-
8779D90D30D4421DF56A4EC6 /* Pods-VclReactNativeExample.release.xcconfig */,
137+
AABAA513DBD92735D6C69D51 /* Pods-VclReactNativeExample.debug.xcconfig */,
138+
7637D2DADF74BD580836E457 /* Pods-VclReactNativeExample.release.xcconfig */,
139139
);
140140
path = Pods;
141141
sourceTree = "<group>";
@@ -165,13 +165,13 @@
165165
isa = PBXNativeTarget;
166166
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "VclReactNativeExample" */;
167167
buildPhases = (
168-
D0303B273FA3CA6BB831AEEB /* [CP] Check Pods Manifest.lock */,
168+
D214C0FF4E647C1D020B9A5A /* [CP] Check Pods Manifest.lock */,
169169
13B07F871A680F5B00A75B9A /* Sources */,
170170
13B07F8C1A680F5B00A75B9A /* Frameworks */,
171171
13B07F8E1A680F5B00A75B9A /* Resources */,
172172
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
173-
EC2B3106FF50AFAE26274B62 /* [CP] Embed Pods Frameworks */,
174-
15063439FA741FCC3C11ADF4 /* [CP] Copy Pods Resources */,
173+
8159E9E0666C61353BAD71BA /* [CP] Embed Pods Frameworks */,
174+
170F998D9C1EA9FD4FF7BB59 /* [CP] Copy Pods Resources */,
175175
);
176176
buildRules = (
177177
);
@@ -254,7 +254,7 @@
254254
shellPath = /bin/sh;
255255
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
256256
};
257-
15063439FA741FCC3C11ADF4 /* [CP] Copy Pods Resources */ = {
257+
170F998D9C1EA9FD4FF7BB59 /* [CP] Copy Pods Resources */ = {
258258
isa = PBXShellScriptBuildPhase;
259259
buildActionMask = 2147483647;
260260
files = (
@@ -271,43 +271,43 @@
271271
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-VclReactNativeExample/Pods-VclReactNativeExample-resources.sh\"\n";
272272
showEnvVarsInLog = 0;
273273
};
274-
D0303B273FA3CA6BB831AEEB /* [CP] Check Pods Manifest.lock */ = {
274+
8159E9E0666C61353BAD71BA /* [CP] Embed Pods Frameworks */ = {
275275
isa = PBXShellScriptBuildPhase;
276276
buildActionMask = 2147483647;
277277
files = (
278278
);
279279
inputFileListPaths = (
280+
"${PODS_ROOT}/Target Support Files/Pods-VclReactNativeExample/Pods-VclReactNativeExample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
280281
);
281-
inputPaths = (
282-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
283-
"${PODS_ROOT}/Manifest.lock",
284-
);
285-
name = "[CP] Check Pods Manifest.lock";
282+
name = "[CP] Embed Pods Frameworks";
286283
outputFileListPaths = (
287-
);
288-
outputPaths = (
289-
"$(DERIVED_FILE_DIR)/Pods-VclReactNativeExample-checkManifestLockResult.txt",
284+
"${PODS_ROOT}/Target Support Files/Pods-VclReactNativeExample/Pods-VclReactNativeExample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
290285
);
291286
runOnlyForDeploymentPostprocessing = 0;
292287
shellPath = /bin/sh;
293-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
288+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-VclReactNativeExample/Pods-VclReactNativeExample-frameworks.sh\"\n";
294289
showEnvVarsInLog = 0;
295290
};
296-
EC2B3106FF50AFAE26274B62 /* [CP] Embed Pods Frameworks */ = {
291+
D214C0FF4E647C1D020B9A5A /* [CP] Check Pods Manifest.lock */ = {
297292
isa = PBXShellScriptBuildPhase;
298293
buildActionMask = 2147483647;
299294
files = (
300295
);
301296
inputFileListPaths = (
302-
"${PODS_ROOT}/Target Support Files/Pods-VclReactNativeExample/Pods-VclReactNativeExample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
303297
);
304-
name = "[CP] Embed Pods Frameworks";
298+
inputPaths = (
299+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
300+
"${PODS_ROOT}/Manifest.lock",
301+
);
302+
name = "[CP] Check Pods Manifest.lock";
305303
outputFileListPaths = (
306-
"${PODS_ROOT}/Target Support Files/Pods-VclReactNativeExample/Pods-VclReactNativeExample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
304+
);
305+
outputPaths = (
306+
"$(DERIVED_FILE_DIR)/Pods-VclReactNativeExample-checkManifestLockResult.txt",
307307
);
308308
runOnlyForDeploymentPostprocessing = 0;
309309
shellPath = /bin/sh;
310-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-VclReactNativeExample/Pods-VclReactNativeExample-frameworks.sh\"\n";
310+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
311311
showEnvVarsInLog = 0;
312312
};
313313
/* End PBXShellScriptBuildPhase section */
@@ -392,7 +392,7 @@
392392
};
393393
13B07F941A680F5B00A75B9A /* Debug */ = {
394394
isa = XCBuildConfiguration;
395-
baseConfigurationReference = 1572ECB6642567DEB010917C /* Pods-VclReactNativeExample.debug.xcconfig */;
395+
baseConfigurationReference = AABAA513DBD92735D6C69D51 /* Pods-VclReactNativeExample.debug.xcconfig */;
396396
buildSettings = {
397397
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
398398
CLANG_ENABLE_MODULES = YES;
@@ -420,7 +420,7 @@
420420
};
421421
13B07F951A680F5B00A75B9A /* Release */ = {
422422
isa = XCBuildConfiguration;
423-
baseConfigurationReference = 8779D90D30D4421DF56A4EC6 /* Pods-VclReactNativeExample.release.xcconfig */;
423+
baseConfigurationReference = 7637D2DADF74BD580836E457 /* Pods-VclReactNativeExample.release.xcconfig */;
424424
buildSettings = {
425425
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
426426
CLANG_ENABLE_MODULES = YES;

0 commit comments

Comments
 (0)