Skip to content

Commit

Permalink
Merge pull request #286 from matter-labs/refact
Browse files Browse the repository at this point in the history
Examples, Fixed Crashes, Refactoring
  • Loading branch information
skywinder authored Oct 27, 2020
2 parents 84c9250 + 887474b commit a4e4985
Show file tree
Hide file tree
Showing 29 changed files with 2,235 additions and 1,600 deletions.
6 changes: 3 additions & 3 deletions Example/web3swiftBrowser/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PODS:
- PromiseKit/CorePromise
- secp256k1.c (0.1.2)
- Starscream (3.1.1)
- web3swift (2.2.2):
- web3swift (2.3.0):
- BigInt (~> 4.0)
- CryptoSwift (~> 1.0.0)
- PromiseKit (~> 6.8.4)
Expand Down Expand Up @@ -40,8 +40,8 @@ SPEC CHECKSUMS:
PromiseKit: 9616b0afef31eae56ab9ce044c8ec2b8612a15cd
secp256k1.c: db47b726585d80f027423682eb369729e61b3b20
Starscream: 4bb2f9942274833f7b4d296a55504dcfc7edb7b0
web3swift: 209ce2db88e40f35f0809234846171ec38119d9b
web3swift: 0f097eafe1d08f478694b882581b85a01afb6633

PODFILE CHECKSUM: 0fdcb66c1e21400e017387d14550cd6ae5ef8aaa

COCOAPODS: 1.9.1
COCOAPODS: 1.9.3

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Example/web3swiftBrowser/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2,055 changes: 1,022 additions & 1,033 deletions Example/web3swiftBrowser/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

284 changes: 48 additions & 236 deletions Example/web3swiftBrowser/web3swiftBrowser.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1170"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "81E09B1B2002623A005DF51D"
BuildableName = "web3swiftBrowser.app"
BlueprintName = "web3swiftBrowser"
ReferencedContainer = "container:web3swiftBrowser.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "81E09B1B2002623A005DF51D"
BuildableName = "web3swiftBrowser.app"
BlueprintName = "web3swiftBrowser"
ReferencedContainer = "container:web3swiftBrowser.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "81E09B1B2002623A005DF51D"
BuildableName = "web3swiftBrowser.app"
BlueprintName = "web3swiftBrowser"
ReferencedContainer = "container:web3swiftBrowser.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
8 changes: 4 additions & 4 deletions Example/web3swiftBrowser/web3swiftBrowser/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
// func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// // Override point for customization after application launch.
//// return true
// }

func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
Expand Down
Loading

0 comments on commit a4e4985

Please sign in to comment.