Skip to content

Commit 2bd1791

Browse files
author
chantu
committed
solve conflicts
2 parents ad55264 + 5697052 commit 2bd1791

25 files changed

+463
-119
lines changed

‎.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
5.0

‎.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
language: objective-c
2-
osx_image: xcode10
2+
osx_image: xcode10.2
33

44
env:
55
global:
66
- IOS_FRAMEWORK_SCHEME="HandyJSON iOS"
77
- OSX_FRAMEWORK_SCHEME="HandyJSON Mac"
88
- TVOS_FRAMEWORK_SCHEME="HandyJSON tvOS"
99
- WATCHOS_FRAMEWORK_SCHEME="HandyJSON watchOS"
10-
- IOS_SDK=iphonesimulator12.0
11-
- OSX_SDK=macosx10.12
10+
- IOS_SDK=iphonesimulator12.2
11+
- OSX_SDK=macosx10.14
1212

1313
before_install:
14-
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
14+
- gem install xcpretty --no-document --quiet
1515

1616
script:
1717
- set -o pipefail
1818
- xcodebuild -version
1919
- xcodebuild -showsdks
20+
- echo "Applying fix for rdar://49326587 see https://developer.apple.com/documentation/xcode_release_notes/xcode_10_2_1_release_notes?language=objc"
21+
- sudo mkdir '/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 9.3.simruntime/Contents/Resources/RuntimeRoot/usr/lib/swift'
2022

2123
- xcodebuild -scheme "$IOS_FRAMEWORK_SCHEME" -sdk "$IOS_SDK" -destination "platform=iOS Simulator,OS=12.0,name=iPhone XS Max" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c
2224

‎HandyJSON.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
33
s.author = {'xuyecan' => '[email protected]'}
44
s.license = 'Apache License 2.0'
55
s.requires_arc = true
6-
s.version = '5.0.0'
6+
s.version = '5.0.1'
77
s.homepage = "https://github.com/alibaba/handyjson"
88
s.name = "HandyJSON"
99

‎HandyJSON.xcodeproj/project.pbxproj

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,12 @@
197197
7D460F672203511D0027428E /* FieldDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D460F652203511D0027428E /* FieldDescriptor.swift */; };
198198
7D460F682203511D0027428E /* FieldDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D460F652203511D0027428E /* FieldDescriptor.swift */; };
199199
7D460F692203511D0027428E /* FieldDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D460F652203511D0027428E /* FieldDescriptor.swift */; };
200+
7D9EFA7F224BA3E3002496B7 /* GenericTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D9EFA7E224BA3E3002496B7 /* GenericTypes.swift */; };
201+
7D9EFA80224BA3E3002496B7 /* GenericTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D9EFA7E224BA3E3002496B7 /* GenericTypes.swift */; };
202+
7D9EFA81224BA3E3002496B7 /* GenericTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D9EFA7E224BA3E3002496B7 /* GenericTypes.swift */; };
203+
7D9EFA83224BA40D002496B7 /* GenericTypesTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D9EFA82224BA40D002496B7 /* GenericTypesTest.swift */; };
204+
7D9EFA84224BA40D002496B7 /* GenericTypesTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D9EFA82224BA40D002496B7 /* GenericTypesTest.swift */; };
205+
7D9EFA85224BA40D002496B7 /* GenericTypesTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D9EFA82224BA40D002496B7 /* GenericTypesTest.swift */; };
200206
7DCD448220FB593600370EF4 /* CBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DCD448120FB593600370EF4 /* CBridge.swift */; };
201207
7DCD448320FB593600370EF4 /* CBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DCD448120FB593600370EF4 /* CBridge.swift */; };
202208
7DCD448420FB593600370EF4 /* CBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DCD448120FB593600370EF4 /* CBridge.swift */; };
@@ -328,6 +334,8 @@
328334
393E100A1DA24A0600B3BC12 /* Info-macOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-macOS.plist"; sourceTree = "<group>"; };
329335
7D2813E622058D060044E052 /* MangledName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MangledName.swift; sourceTree = "<group>"; };
330336
7D460F652203511D0027428E /* FieldDescriptor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FieldDescriptor.swift; sourceTree = "<group>"; };
337+
7D9EFA7E224BA3E3002496B7 /* GenericTypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenericTypes.swift; sourceTree = "<group>"; };
338+
7D9EFA82224BA40D002496B7 /* GenericTypesTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenericTypesTest.swift; sourceTree = "<group>"; };
331339
7DCD448120FB593600370EF4 /* CBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CBridge.swift; sourceTree = "<group>"; };
332340
/* End PBXFileReference section */
333341

@@ -491,6 +499,8 @@
491499
21F252B31D599DE200B214BB /* InvalidStateHandlingTest.swift */,
492500
214329251DFBDC1400CA386A /* TestUtils.swift */,
493501
392628001DA3E8E100B0C28D /* Supporting Files */,
502+
7D9EFA7E224BA3E3002496B7 /* GenericTypes.swift */,
503+
7D9EFA82224BA40D002496B7 /* GenericTypesTest.swift */,
494504
);
495505
name = HandyJSONTests;
496506
path = Tests/HandyJSONTests;
@@ -734,22 +744,23 @@
734744
isa = PBXProject;
735745
attributes = {
736746
LastSwiftUpdateCheck = 0800;
737-
LastUpgradeCheck = 0930;
747+
LastUpgradeCheck = 1020;
738748
ORGANIZATIONNAME = aliyun;
739749
TargetAttributes = {
740750
21520C431D3341B200F53111 = {
741751
CreatedOnToolsVersion = 7.3.1;
742-
LastSwiftMigration = 0800;
752+
LastSwiftMigration = 1020;
743753
ProvisioningStyle = Automatic;
744754
};
745755
21520C5A1D3344A900F53111 = {
746756
CreatedOnToolsVersion = 7.3.1;
747757
DevelopmentTeam = QBMN2BBW3K;
758+
LastSwiftMigration = 1020;
748759
ProvisioningStyle = Automatic;
749760
};
750761
217B046C1D571B9F0035A8E2 = {
751762
CreatedOnToolsVersion = 7.3.1;
752-
LastSwiftMigration = 1000;
763+
LastSwiftMigration = 1020;
753764
};
754765
393E0F9A1DA1650E00B3BC12 = {
755766
CreatedOnToolsVersion = 8.0;
@@ -783,6 +794,7 @@
783794
developmentRegion = English;
784795
hasScannedForEncodings = 0;
785796
knownRegions = (
797+
English,
786798
en,
787799
Base,
788800
);
@@ -924,8 +936,10 @@
924936
isa = PBXSourcesBuildPhase;
925937
buildActionMask = 2147483647;
926938
files = (
939+
7D9EFA7F224BA3E3002496B7 /* GenericTypes.swift in Sources */,
927940
217801F91F5E80A200EDEB38 /* CustomTransfromTypes.swift in Sources */,
928941
217801F51F5E7CFD00EDEB38 /* BasicTypesInStructTestsFromJSON.swift in Sources */,
942+
7D9EFA83224BA40D002496B7 /* GenericTypesTest.swift in Sources */,
929943
21A191F41E21E62500CD7609 /* BasicTypesInClassTestsFromJSON.swift in Sources */,
930944
215F13481E217B9C00B0FFEC /* BasicTypesInClass.swift in Sources */,
931945
215F13491E217B9C00B0FFEC /* BasicTypesInClassTestsToJSON.swift in Sources */,
@@ -1029,8 +1043,10 @@
10291043
isa = PBXSourcesBuildPhase;
10301044
buildActionMask = 2147483647;
10311045
files = (
1046+
7D9EFA80224BA3E3002496B7 /* GenericTypes.swift in Sources */,
10321047
217801FA1F5E80A200EDEB38 /* CustomTransfromTypes.swift in Sources */,
10331048
217801F61F5E7CFD00EDEB38 /* BasicTypesInStructTestsFromJSON.swift in Sources */,
1049+
7D9EFA84224BA40D002496B7 /* GenericTypesTest.swift in Sources */,
10341050
21A192081E223F9000CD7609 /* BasicTypesInClass.swift in Sources */,
10351051
21A192091E223F9000CD7609 /* BasicTypesInClassTestsToJSON.swift in Sources */,
10361052
21A191F51E21E62E00CD7609 /* BasicTypesInClassTestsFromJSON.swift in Sources */,
@@ -1092,8 +1108,10 @@
10921108
isa = PBXSourcesBuildPhase;
10931109
buildActionMask = 2147483647;
10941110
files = (
1111+
7D9EFA81224BA3E3002496B7 /* GenericTypes.swift in Sources */,
10951112
217801FB1F5E80A200EDEB38 /* CustomTransfromTypes.swift in Sources */,
10961113
217801F71F5E7CFD00EDEB38 /* BasicTypesInStructTestsFromJSON.swift in Sources */,
1114+
7D9EFA85224BA40D002496B7 /* GenericTypesTest.swift in Sources */,
10971115
21A192061E223F8900CD7609 /* BasicTypesInClass.swift in Sources */,
10981116
21A192071E223F8900CD7609 /* BasicTypesInClassTestsToJSON.swift in Sources */,
10991117
21A191F61E21E63100CD7609 /* BasicTypesInClassTestsFromJSON.swift in Sources */,
@@ -1144,6 +1162,7 @@
11441162
isa = XCBuildConfiguration;
11451163
buildSettings = {
11461164
ALWAYS_SEARCH_USER_PATHS = NO;
1165+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
11471166
CLANG_ANALYZER_NONNULL = YES;
11481167
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
11491168
CLANG_CXX_LIBRARY = "libc++";
@@ -1193,7 +1212,7 @@
11931212
ONLY_ACTIVE_ARCH = YES;
11941213
SDKROOT = iphoneos;
11951214
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1196-
SWIFT_VERSION = 4.0;
1215+
SWIFT_VERSION = 5.0;
11971216
TARGETED_DEVICE_FAMILY = "1,2";
11981217
VERSIONING_SYSTEM = "apple-generic";
11991218
VERSION_INFO_PREFIX = "";
@@ -1204,6 +1223,7 @@
12041223
isa = XCBuildConfiguration;
12051224
buildSettings = {
12061225
ALWAYS_SEARCH_USER_PATHS = NO;
1226+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
12071227
CLANG_ANALYZER_NONNULL = YES;
12081228
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
12091229
CLANG_CXX_LIBRARY = "libc++";
@@ -1246,7 +1266,7 @@
12461266
MTL_ENABLE_DEBUG_INFO = NO;
12471267
SDKROOT = iphoneos;
12481268
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1249-
SWIFT_VERSION = 4.0;
1269+
SWIFT_VERSION = 5.0;
12501270
TARGETED_DEVICE_FAMILY = "1,2";
12511271
VALIDATE_PRODUCT = YES;
12521272
VERSIONING_SYSTEM = "apple-generic";
@@ -1274,7 +1294,7 @@
12741294
PRODUCT_NAME = "$(PROJECT_NAME)";
12751295
SKIP_INSTALL = YES;
12761296
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1277-
SWIFT_VERSION = 4.2;
1297+
SWIFT_VERSION = 5.0;
12781298
};
12791299
name = Debug;
12801300
};
@@ -1297,7 +1317,7 @@
12971317
PRODUCT_BUNDLE_IDENTIFIER = com.aliyun.app.HandyJSON;
12981318
PRODUCT_NAME = "$(PROJECT_NAME)";
12991319
SKIP_INSTALL = YES;
1300-
SWIFT_VERSION = 4.2;
1320+
SWIFT_VERSION = 5.0;
13011321
};
13021322
name = Release;
13031323
};
@@ -1317,7 +1337,7 @@
13171337
PRODUCT_NAME = "$(TARGET_NAME)";
13181338
PROVISIONING_PROFILE = "";
13191339
PROVISIONING_PROFILE_SPECIFIER = "";
1320-
SWIFT_VERSION = 4.2;
1340+
SWIFT_VERSION = 5.0;
13211341
};
13221342
name = Debug;
13231343
};
@@ -1337,7 +1357,7 @@
13371357
PRODUCT_NAME = "$(TARGET_NAME)";
13381358
PROVISIONING_PROFILE = "";
13391359
PROVISIONING_PROFILE_SPECIFIER = "";
1340-
SWIFT_VERSION = 4.2;
1360+
SWIFT_VERSION = 5.0;
13411361
};
13421362
name = Release;
13431363
};
@@ -1350,7 +1370,7 @@
13501370
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13511371
PRODUCT_BUNDLE_IDENTIFIER = com.aliyun.app.HandyJSONTests;
13521372
PRODUCT_NAME = "$(TARGET_NAME)";
1353-
SWIFT_VERSION = 4.2;
1373+
SWIFT_VERSION = 5.0;
13541374
};
13551375
name = Debug;
13561376
};
@@ -1363,7 +1383,7 @@
13631383
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13641384
PRODUCT_BUNDLE_IDENTIFIER = com.aliyun.app.HandyJSONTests;
13651385
PRODUCT_NAME = "$(TARGET_NAME)";
1366-
SWIFT_VERSION = 4.2;
1386+
SWIFT_VERSION = 5.0;
13671387
};
13681388
name = Release;
13691389
};
@@ -1386,7 +1406,7 @@
13861406
SDKROOT = watchos;
13871407
SKIP_INSTALL = YES;
13881408
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1389-
SWIFT_VERSION = 4.2;
1409+
SWIFT_VERSION = 5.0;
13901410
TARGETED_DEVICE_FAMILY = 4;
13911411
WATCHOS_DEPLOYMENT_TARGET = 2.0;
13921412
};
@@ -1410,7 +1430,7 @@
14101430
PRODUCT_NAME = "$(PROJECT_NAME)";
14111431
SDKROOT = watchos;
14121432
SKIP_INSTALL = YES;
1413-
SWIFT_VERSION = 4.2;
1433+
SWIFT_VERSION = 5.0;
14141434
TARGETED_DEVICE_FAMILY = 4;
14151435
WATCHOS_DEPLOYMENT_TARGET = 2.0;
14161436
};
@@ -1434,7 +1454,7 @@
14341454
SDKROOT = appletvos;
14351455
SKIP_INSTALL = YES;
14361456
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1437-
SWIFT_VERSION = 4.2;
1457+
SWIFT_VERSION = 5.0;
14381458
TARGETED_DEVICE_FAMILY = 3;
14391459
TVOS_DEPLOYMENT_TARGET = 9.0;
14401460
};
@@ -1457,7 +1477,7 @@
14571477
PRODUCT_NAME = "$(PROJECT_NAME)";
14581478
SDKROOT = appletvos;
14591479
SKIP_INSTALL = YES;
1460-
SWIFT_VERSION = 4.2;
1480+
SWIFT_VERSION = 5.0;
14611481
TARGETED_DEVICE_FAMILY = 3;
14621482
TVOS_DEPLOYMENT_TARGET = 9.0;
14631483
};
@@ -1475,7 +1495,7 @@
14751495
PRODUCT_NAME = "$(TARGET_NAME)";
14761496
SDKROOT = appletvos;
14771497
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1478-
SWIFT_VERSION = 4.2;
1498+
SWIFT_VERSION = 5.0;
14791499
TVOS_DEPLOYMENT_TARGET = 10.0;
14801500
};
14811501
name = Debug;
@@ -1491,7 +1511,7 @@
14911511
PRODUCT_BUNDLE_IDENTIFIER = "alibaba.HandyJSON-tvOSTests";
14921512
PRODUCT_NAME = "$(TARGET_NAME)";
14931513
SDKROOT = appletvos;
1494-
SWIFT_VERSION = 4.2;
1514+
SWIFT_VERSION = 5.0;
14951515
TVOS_DEPLOYMENT_TARGET = 10.0;
14961516
};
14971517
name = Release;
@@ -1517,7 +1537,7 @@
15171537
SDKROOT = macosx;
15181538
SKIP_INSTALL = YES;
15191539
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1520-
SWIFT_VERSION = 4.2;
1540+
SWIFT_VERSION = 5.0;
15211541
};
15221542
name = Debug;
15231543
};
@@ -1542,7 +1562,7 @@
15421562
PRODUCT_NAME = "$(PROJECT_NAME)";
15431563
SDKROOT = macosx;
15441564
SKIP_INSTALL = YES;
1545-
SWIFT_VERSION = 4.2;
1565+
SWIFT_VERSION = 5.0;
15461566
};
15471567
name = Release;
15481568
};
@@ -1561,7 +1581,7 @@
15611581
PRODUCT_NAME = "$(TARGET_NAME)";
15621582
SDKROOT = macosx;
15631583
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1564-
SWIFT_VERSION = 4.2;
1584+
SWIFT_VERSION = 5.0;
15651585
};
15661586
name = Debug;
15671587
};
@@ -1579,7 +1599,7 @@
15791599
PRODUCT_BUNDLE_IDENTIFIER = "alibaba.HandyJSON-macOSTests";
15801600
PRODUCT_NAME = "$(TARGET_NAME)";
15811601
SDKROOT = macosx;
1582-
SWIFT_VERSION = 4.2;
1602+
SWIFT_VERSION = 5.0;
15831603
};
15841604
name = Release;
15851605
};

‎HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON iOS Tests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON macOS Tests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON macOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON tvOS Tests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON tvOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSON watchOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎HandyJSON.xcodeproj/xcshareddata/xcschemes/HandyJSONDemo.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎HandyJSONDemo/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939
"idiom" : "iphone",
4040
"size" : "60x60",
4141
"scale" : "3x"
42+
},
43+
{
44+
"idiom" : "ios-marketing",
45+
"size" : "1024x1024",
46+
"scale" : "1x"
4247
}
4348
],
4449
"info" : {

0 commit comments

Comments
 (0)