Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare 1.1.0 release #113

Merged
merged 8 commits into from Jan 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .bundle/config
@@ -0,0 +1,2 @@
---
BUNDLE_PATH: "vendor/bundle"
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -16,6 +16,7 @@ DerivedData/
*.perspectivev3
!default.perspectivev3
xcuserdata/
vendor/

## Other
*.moved-aside
Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
Expand Up @@ -13,11 +13,11 @@ install:
if [ "$TEST_TYPE" = Lint ]; then
brew install swiftlint || brew upgrade swiftlint
elif [ "$TEST_TYPE" = CocoaPods ] || [ "$TEST_TYPE" = iOS ]; then
pod repo update --silent
bundle install --path vendor/bundle
bundle exec pod repo update --silent
fi
if [ "$TEST_TYPE" = iOS ]; then
bundle install
pod install
bundle exec pod install
fi
script:
- |
Expand All @@ -27,5 +27,5 @@ script:
elif [ "$TEST_TYPE" = Lint ]; then
swiftlint lint --config .swiftlint.yml
elif [ "$TEST_TYPE" = CocoaPods ]; then
pod lib lint --verbose
bundle exec pod lib lint --verbose
fi
18 changes: 17 additions & 1 deletion CHANGELOG.md
Expand Up @@ -2,7 +2,22 @@

## [Unreleased](https://github.com/omisego/ios-sdk/tree/HEAD)

[Full Changelog](https://github.com/omisego/ios-sdk/compare/1.1.0-beta1...HEAD)
[Full Changelog](https://github.com/omisego/ios-sdk/compare/1.1.0-beta2...HEAD)

**Closed issues:**

- Use \[weak self\] in closures [\#111](https://github.com/omisego/ios-sdk/issues/111)
- Fix package security issue [\#109](https://github.com/omisego/ios-sdk/issues/109)
- Implement new filter system [\#107](https://github.com/omisego/ios-sdk/issues/107)
- Beta 2 [\#105](https://github.com/omisego/ios-sdk/issues/105)

**Merged pull requests:**

- Add \[weak self\] where missing from closures [\#112](https://github.com/omisego/ios-sdk/pull/112) ([mederic-p](https://github.com/mederic-p))
- Add advanced filter [\#108](https://github.com/omisego/ios-sdk/pull/108) ([mederic-p](https://github.com/mederic-p))

## [1.1.0-beta2](https://github.com/omisego/ios-sdk/tree/1.1.0-beta2) (2018-10-24)
[Full Changelog](https://github.com/omisego/ios-sdk/compare/1.1.0-beta1...1.1.0-beta2)

**Closed issues:**

Expand All @@ -21,6 +36,7 @@

**Merged pull requests:**

- Change podspec to beta2 [\#106](https://github.com/omisego/ios-sdk/pull/106) ([mederic-p](https://github.com/mederic-p))
- Swift 4.2 [\#104](https://github.com/omisego/ios-sdk/pull/104) ([mederic-p](https://github.com/mederic-p))
- Add transaction request support for admin API [\#102](https://github.com/omisego/ios-sdk/pull/102) ([mederic-p](https://github.com/mederic-p))
- Get account API [\#100](https://github.com/omisego/ios-sdk/pull/100) ([mederic-p](https://github.com/mederic-p))
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

gem 'rake'
gem 'jazzy'
gem 'cocoapods'
gem 'jazzy', "0.9.5"
gem 'cocoapods', "~> 1.5.3"
gem 'xcpretty'
gem 'github_changelog_generator'
36 changes: 18 additions & 18 deletions Gemfile.lock
Expand Up @@ -2,7 +2,7 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
activesupport (4.2.10)
activesupport (4.2.11)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
Expand Down Expand Up @@ -39,19 +39,19 @@ GEM
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.4)
escape (0.0.4)
faraday (0.15.3)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
faraday-http-cache (2.0.0)
faraday (~> 0.8)
ffi (1.9.25)
ffi (1.10.0)
fourflusher (2.0.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
Expand All @@ -65,21 +65,21 @@ GEM
retriable (~> 2.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jazzy (0.9.3)
cocoapods (~> 1.0)
mustache (~> 0.99)
jazzy (0.9.5)
cocoapods (~> 1.5.3)
mustache (~> 1.1.0)
open4
redcarpet (~> 3.2)
redcarpet (~> 3.4.0)
rouge (>= 2.0.6, < 4.0)
sass (~> 3.4)
sqlite3 (~> 1.3)
sass (~> 3.6.0)
sqlite3 (~> 1.3.13)
xcinvoke (~> 0.3.0)
liferaft (0.0.6)
minitest (5.11.3)
molinillo (0.6.6)
multi_json (1.13.1)
multipart-post (2.0.0)
mustache (0.99.8)
mustache (1.1.0)
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
Expand All @@ -88,10 +88,10 @@ GEM
open4 (1.3.4)
public_suffix (3.0.3)
rainbow (3.0.0)
rake (12.3.1)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-inotify (0.10.0)
ffi (~> 1.0)
redcarpet (3.4.0)
retriable (2.1.0)
rouge (2.0.7)
Expand All @@ -110,7 +110,7 @@ GEM
thread_safe (~> 0.1)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.7.0)
xcodeproj (1.8.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -123,9 +123,9 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods
cocoapods (~> 1.5.3)
github_changelog_generator
jazzy
jazzy (= 0.9.5)
rake
xcpretty

Expand Down
2 changes: 1 addition & 1 deletion OmiseGO.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'OmiseGO'
s.version = '1.1.0-beta2'
s.version = '1.1.0'
s.license = 'Apache'
s.summary = 'The OmiseGO iOS SDK allows developers to easily interact with a node of the OmiseGO eWallet.'
s.homepage = 'https://github.com/omisego/ios-sdk'
Expand Down
2 changes: 1 addition & 1 deletion Podfile
@@ -1,5 +1,5 @@
# Uncomment the next line to define a global platform for your project
platform :ios, '9.0'
platform :ios, '10.0'

def shared_pods
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
Expand Down
6 changes: 3 additions & 3 deletions Podfile.lock
Expand Up @@ -2,7 +2,7 @@ PODS:
- BigInt (3.1.0):
- SipHash (~> 1.2)
- SipHash (1.2.2)
- Starscream (3.0.5)
- Starscream (3.0.6)

DEPENDENCIES:
- BigInt (~> 3.1)
Expand All @@ -17,8 +17,8 @@ SPEC REPOS:
SPEC CHECKSUMS:
BigInt: 76b5dfdfa3e2e478d4ffdf161aeede5502e2742f
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
Starscream: faf918b2f2eff7d5dd21180646bf015a669673bd
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5

PODFILE CHECKSUM: 1116f3c1c126457a5525ccfbe4837926858e9df8
PODFILE CHECKSUM: de86b509d6be5a0f236452ea05b50b8633136c66

COCOAPODS: 1.5.3
4 changes: 3 additions & 1 deletion README.md
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/omisego/ios-sdk.svg?branch=master)](https://travis-ci.org/omisego/ios-sdk)
[![Build Status](https://travis-ci.com/omisego/ios-sdk.svg?branch=master)](https://travis-ci.com/omisego/ios-sdk)
[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/OmiseGO.svg)](https://cocoapods.org/pods/OmiseGO)
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![Platform](https://img.shields.io/cocoapods/p/OmiseGO.svg?style=flat)](https://github.com/omisego/ios-sdk)
Expand Down Expand Up @@ -38,6 +38,8 @@ The Client and Admin modules contain specific logic to respectively access the c
- Xcode 10+
- Swift 4.2

This version of the SDK is compatible with the version `1.1.0` of the [eWallet](https://github.com/omisego/ewallet/tree/v1.1).

---

# Installation
Expand Down
3 changes: 3 additions & 0 deletions Tests/Core/SocketsTests/FixtureSocketClient.swift
Expand Up @@ -9,7 +9,10 @@
import Starscream

class FixtureWebsocketClient: WebSocketClient {
var sslClientCertificate: SSLClientCertificate?

var delegate: WebSocketDelegate?
var pongDelegate: WebSocketPongDelegate?
var disableSSLCertValidation: Bool = true
var overrideTrustHostname: Bool = false
var desiredTrustHostname: String?
Expand Down