Skip to content
This repository has been archived by the owner on Aug 30, 2022. It is now read-only.

Commit

Permalink
Merge pull request #179 from EOSIO/develop
Browse files Browse the repository at this point in the history
Merge into Master
  • Loading branch information
Brandon Fancher authored May 10, 2019
2 parents 7f8f7e7 + 79af059 commit 73d74bb
Show file tree
Hide file tree
Showing 293 changed files with 8,719 additions and 499 deletions.
4 changes: 2 additions & 2 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
copyright: Copyright (c) 2017-2019 block.one all rights reserved.
copyright: Copyright (c) 2017-2019 block.one and its contributors. All rights reserved.
theme: fullwidth
github_url: https://github.com/EOSIO/eosio-swift
github_file_prefix: https://github.com/EOSIO/eosio-swift/tree/master
hide_documentation_coverage: true
undocumented_text: ""
output: docs/code
output: docs
clean: true
8 changes: 8 additions & 0 deletions EosioSwift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

/* Begin PBXBuildFile section */
1F9DCB7A22569A2600853105 /* EosioRpcProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F9DCB7922569A2600853105 /* EosioRpcProviderTests.swift */; };
1FDD00402279F62000E59784 /* Queue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FDD003E2279F62000E59784 /* Queue.swift */; };
1FDD00412279F62000E59784 /* LinkedList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FDD003F2279F62000E59784 /* LinkedList.swift */; };
1FE626EE2261290B00FC720F /* RpcTestConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FE626ED2261290B00FC720F /* RpcTestConstants.swift */; };
1FE626F22264BC3900FC720F /* RpcProviderExtensionEndpointTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FE626F12264BC3900FC720F /* RpcProviderExtensionEndpointTests.swift */; };
284C5E682224558800795392 /* EosioAbiProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 284C5E672224558800795392 /* EosioAbiProviderTests.swift */; };
Expand Down Expand Up @@ -76,6 +78,8 @@

/* Begin PBXFileReference section */
1F9DCB7922569A2600853105 /* EosioRpcProviderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EosioRpcProviderTests.swift; sourceTree = "<group>"; };
1FDD003E2279F62000E59784 /* Queue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Queue.swift; sourceTree = "<group>"; };
1FDD003F2279F62000E59784 /* LinkedList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LinkedList.swift; sourceTree = "<group>"; };
1FE626ED2261290B00FC720F /* RpcTestConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RpcTestConstants.swift; sourceTree = "<group>"; };
1FE626F12264BC3900FC720F /* RpcProviderExtensionEndpointTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RpcProviderExtensionEndpointTests.swift; sourceTree = "<group>"; };
284C5E672224558800795392 /* EosioAbiProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EosioAbiProviderTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -299,6 +303,8 @@
8F6B04B122287A5300215CD0 /* EosioSwiftFoundation.h */,
8F6B04B422287A5300215CD0 /* ZAssert.swift */,
B4178066226E472E00084A6E /* DynamicKey.swift */,
1FDD003F2279F62000E59784 /* LinkedList.swift */,
1FDD003E2279F62000E59784 /* Queue.swift */,
);
path = Foundation;
sourceTree = "<group>";
Expand Down Expand Up @@ -599,10 +605,12 @@
BB6F2CFE22653012002C4150 /* EosioTransactionFactory.swift in Sources */,
8FD1C4C82257EADE005AE506 /* AllResponseProtocols.swift in Sources */,
B4892C6D221E0CAA0050FA72 /* RequestModels.swift in Sources */,
1FDD00412279F62000E59784 /* LinkedList.swift in Sources */,
28FE039A2209D4C100CCC977 /* EosioTransactionAction.swift in Sources */,
B42C0EFB2268F86200E7A28F /* ResolverExtensions.swift in Sources */,
B49EE519221CCA0900018D29 /* EosioRpcProviderProtocol.swift in Sources */,
8F6B04C522287A9E00215CD0 /* DictionaryExtensions.swift in Sources */,
1FDD00402279F62000E59784 /* Queue.swift in Sources */,
28A7A3BA22236890002386D3 /* EosioAbiProvider.swift in Sources */,
B4B69EBF2204B65E009260A5 /* EosioSignatureProviderProtocol.swift in Sources */,
);
Expand Down
15 changes: 15 additions & 0 deletions EosioSwift.xcodeproj/xcshareddata/IDETemplateMacros.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>FILEHEADER</key>
<string>
// ___FILENAME___
// ___PACKAGENAME___
// Created by ___FULLUSERNAME___ on ___DATE___
// Copyright (c) 2017-___YEAR___ block.one and its contributors. All rights reserved.
//
</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion EosioSwift/EosioAbiProviderProtocol/EosioAbiProvider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// EosioSwift
//
// Created by Todd Bowden on 2/24/19.
// Copyright © 2018-2019 block.one.
// Copyright (c) 2017-2019 block.one and its contributors. All rights reserved.
//

import Foundation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// EosioSwift
//
// Created by Todd Bowden on 2/24/19.
// Copyright © 2018-2019 block.one.
// Copyright (c) 2017-2019 block.one and its contributors. All rights reserved.
//

import Foundation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// EosioSwift
//
// Created by Brandon Fancher on 4/22/19.
// Copyright © 2019 block.one. All rights reserved.
// Copyright (c) 2017-2019 block.one and its contributors. All rights reserved.
//

import Foundation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// EosioSwift
//
// Created by Brandon Fancher on 4/22/19.
// Copyright © 2019 block.one. All rights reserved.
// Copyright (c) 2017-2019 block.one and its contributors. All rights reserved.
//

import Foundation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// EosioSwift
//
// Created by Brandon Fancher on 4/18/19.
// Copyright © 2019 block.one. All rights reserved.
// Copyright (c) 2017-2019 block.one and its contributors. All rights reserved.
//

import Foundation
Expand Down
Loading

0 comments on commit 73d74bb

Please sign in to comment.