Skip to content

Commit 472c348

Browse files
authored
Merge pull request #901 from Adamant-im/trello.com/c/d05y5jUb
[Trello.com/c/d05y5j] Hotfix: `count` field type (Release v3.10.1)
2 parents 16f4c26 + 72bc6b5 commit 472c348

File tree

14 files changed

+491
-445
lines changed

14 files changed

+491
-445
lines changed

.swiftlint.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
excluded:
2+
- .build
3+
- "**/.build/**"
4+
- Pods
5+
- Carthage
6+
- "**/DerivedData/**"
7+
18
disabled_rules:
29
- colon
310
- comma

Adamant.xcodeproj/project.pbxproj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
41CA598C29A0D84F002BFDE4 /* TaskManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41CA598B29A0D84F002BFDE4 /* TaskManager.swift */; };
188188
41CE153A297FF98200CC9254 /* Web3Swift+Adamant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41CE1539297FF98200CC9254 /* Web3Swift+Adamant.swift */; };
189189
41E3C9CC2A0E20F500AF0985 /* AdamantCoinTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E3C9CB2A0E20F500AF0985 /* AdamantCoinTools.swift */; };
190+
48B0285D2E70790200191086 /* EthBlockResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48B0285C2E70790200191086 /* EthBlockResponse.swift */; };
190191
4E9EE86F28CE793D008359F7 /* SafeDecimalRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E9EE86E28CE793D008359F7 /* SafeDecimalRow.swift */; };
191192
551F66E628959A5300DE5D69 /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 551F66E528959A5200DE5D69 /* LoadingView.swift */; };
192193
551F66E82895B3DA00DE5D69 /* AdamantHealthCheckServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 551F66E72895B3DA00DE5D69 /* AdamantHealthCheckServiceTests.swift */; };
@@ -866,6 +867,7 @@
866867
41CA598B29A0D84F002BFDE4 /* TaskManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskManager.swift; sourceTree = "<group>"; };
867868
41CE1539297FF98200CC9254 /* Web3Swift+Adamant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3Swift+Adamant.swift"; sourceTree = "<group>"; };
868869
41E3C9CB2A0E20F500AF0985 /* AdamantCoinTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantCoinTools.swift; sourceTree = "<group>"; };
870+
48B0285C2E70790200191086 /* EthBlockResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthBlockResponse.swift; sourceTree = "<group>"; };
869871
4A4D67BD3DC89C07D1351248 /* Pods-AdmCore.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AdmCore.release.xcconfig"; path = "Target Support Files/Pods-AdmCore/Pods-AdmCore.release.xcconfig"; sourceTree = "<group>"; };
870872
4E9EE86E28CE793D008359F7 /* SafeDecimalRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafeDecimalRow.swift; sourceTree = "<group>"; };
871873
551F66E528959A5200DE5D69 /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
@@ -2376,6 +2378,7 @@
23762378
3A7BD0112AA9BD5A0045AAB0 /* AdamantVibroType.swift */,
23772379
3A33F9F92A7A53DA002B8003 /* EmojiUpdateType.swift */,
23782380
3A53BD452C6B7AF100BB1EE6 /* DownloadPolicy.swift */,
2381+
48B0285C2E70790200191086 /* EthBlockResponse.swift */,
23792382
);
23802383
path = Models;
23812384
sourceTree = "<group>";
@@ -2862,8 +2865,8 @@
28622865
isa = PBXNativeTarget;
28632866
buildConfigurationList = E913C9001FFFA51E001A83F7 /* Build configuration list for PBXNativeTarget "Adamant" */;
28642867
buildPhases = (
2865-
9372E0412C9BC178006DF0B3 /* Run Script - Git Data */,
28662868
47866E9AB7D201F2CED0064C /* [CP] Check Pods Manifest.lock */,
2869+
9372E0412C9BC178006DF0B3 /* Run Script - Git Data */,
28672870
E913C8EA1FFFA51D001A83F7 /* Sources */,
28682871
E913C8EB1FFFA51D001A83F7 /* Frameworks */,
28692872
E913C8EC1FFFA51D001A83F7 /* Resources */,
@@ -3321,6 +3324,7 @@
33213324
6414C18E217DF43100373FA6 /* String+adamant.swift in Sources */,
33223325
93A118532993241D00E144CC /* ChatMessagesListFactory.swift in Sources */,
33233326
E908472A2196FEA80095825D /* RichMessageTransaction+CoreDataClass.swift in Sources */,
3327+
48B0285D2E70790200191086 /* EthBlockResponse.swift in Sources */,
33243328
4E9EE86F28CE793D008359F7 /* SafeDecimalRow.swift in Sources */,
33253329
93ADE0732ACA66AF008ED641 /* VibrationSelectionFactory.swift in Sources */,
33263330
3AFE7E522B1F6B3400718739 /* WalletServiceProtocol.swift in Sources */,
@@ -4111,7 +4115,7 @@
41114115
"$(inherited)",
41124116
"@executable_path/Frameworks",
41134117
);
4114-
MARKETING_VERSION = 3.10.0;
4118+
MARKETING_VERSION = 3.10.1;
41154119
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev";
41164120
PRODUCT_NAME = "$(TARGET_NAME)";
41174121
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4142,7 +4146,7 @@
41424146
"$(inherited)",
41434147
"@executable_path/Frameworks",
41444148
);
4145-
MARKETING_VERSION = 3.10.0;
4149+
MARKETING_VERSION = 3.10.1;
41464150
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger";
41474151
PRODUCT_NAME = "$(TARGET_NAME)";
41484152
PROVISIONING_PROFILE_SPECIFIER = "";

0 commit comments

Comments
 (0)