Skip to content

Commit

Permalink
Merge pull request #89 from button/release/1.4.2
Browse files Browse the repository at this point in the history
Release 1.4.2
  • Loading branch information
paultopher committed Nov 12, 2020
2 parents 93fa8fb + 4044b70 commit 454588c
Show file tree
Hide file tree
Showing 59 changed files with 9,118 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ButtonMerchant.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'ButtonMerchant'
s.version = '1.4.1'
s.version = '1.4.2'
s.summary = 'An open source client library for Button merchants.'
s.description = <<-DESC
The Button Merchant library is a light-weight, open-source method
Expand Down
4 changes: 2 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- ButtonMerchant (1.4.1)
- ButtonMerchant (1.4.2)
- SwiftLint (0.25.0)

DEPENDENCIES:
Expand All @@ -15,7 +15,7 @@ EXTERNAL SOURCES:
:path: "./"

SPEC CHECKSUMS:
ButtonMerchant: a6492f65acf6b8392964cb18bf1cbba5dd45c3c4
ButtonMerchant: c832b01c2bad925d7e5adab89b655ae5d81c523e
SwiftLint: e14651157288e9e01d6e1a71db7014fb5744a8ea

PODFILE CHECKSUM: e6864df46b69637ee2822533e793512d9403dc79
Expand Down
2 changes: 1 addition & 1 deletion Source/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.4.1</string>
<string>1.4.2</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Source/Version/Version.generated.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ public struct Version {
/**
Library version string.
*/
static let stringValue = "1.4.1"
static let stringValue = "1.4.2"
}
4 changes: 2 additions & 2 deletions Tests/UnitTests/Version/VersionTests.generated.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ import XCTest
class VersionTests: XCTestCase {

func testLibraryVersion() {
XCTAssertEqual(Version.stringValue, "1.4.1")
XCTAssertEqual(Version.stringValue, "1.4.2")
}

func testPlistVersion() {
let libraryBundle = Bundle(for: ButtonMerchant.self)
XCTAssertEqual(libraryBundle.infoDictionary!["CFBundleShortVersionString"] as? String, "1.4.1")
XCTAssertEqual(libraryBundle.infoDictionary!["CFBundleShortVersionString"] as? String, "1.4.2")
}
}
200 changes: 200 additions & 0 deletions docs/history/1.4.2/Classes.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Classes Reference</title>
<link rel="stylesheet" type="text/css" href="css/jazzy.css" />
<link rel="stylesheet" type="text/css" href="css/highlight.css" />
<meta charset='utf-8'>
<script src="js/jquery.min.js" defer></script>
<script src="js/jazzy.js" defer></script>

</head>
<body>
<a name="//apple_ref/swift/Section/Classes" class="dashAnchor"></a>
<a title="Classes Reference"></a>
<header>
<div class="content-wrapper">
<p><a href="index.html">ButtonMerchant Docs</a> (95% documented)</p>
</div>
</header>
<div class="content-wrapper">
<p id="breadcrumbs">
<a href="index.html">ButtonMerchant Reference</a>
<img id="carat" src="img/carat.png" />
Classes Reference
</p>
</div>
<div class="content-wrapper">
<nav class="sidebar">
<ul class="nav-groups">
<li class="nav-group-name">
<a href="Classes.html">Classes</a>
<ul class="nav-group-tasks">
<li class="nav-group-task">
<a href="Classes/ButtonMerchant.html">ButtonMerchant</a>
</li>
<li class="nav-group-task">
<a href="Classes/ButtonProduct.html">ButtonProduct</a>
</li>
<li class="nav-group-task">
<a href="Classes/Order.html">Order</a>
</li>
<li class="nav-group-task">
<a href="Classes/Order/Customer.html">– Customer</a>
</li>
<li class="nav-group-task">
<a href="Classes/Order/LineItem.html">– LineItem</a>
</li>
</ul>
</li>
<li class="nav-group-name">
<a href="Enums.html">Enumerations</a>
<ul class="nav-group-tasks">
<li class="nav-group-task">
<a href="Enums/ButtonMerchantError.html">ButtonMerchantError</a>
</li>
<li class="nav-group-task">
<a href="Enums/ConfigurationError.html">ConfigurationError</a>
</li>
<li class="nav-group-task">
<a href="Enums/NetworkError.html">NetworkError</a>
</li>
</ul>
</li>
<li class="nav-group-name">
<a href="Protocols.html">Protocols</a>
<ul class="nav-group-tasks">
<li class="nav-group-task">
<a href="Protocols/Activity.html">Activity</a>
</li>
<li class="nav-group-task">
<a href="Protocols/ButtonProductCompatible.html">ButtonProductCompatible</a>
</li>
<li class="nav-group-task">
<a href="Protocols/Configurable.html">Configurable</a>
</li>
</ul>
</li>
<li class="nav-group-name">
<a href="Structs.html">Structures</a>
<ul class="nav-group-tasks">
<li class="nav-group-task">
<a href="Structs.html#/s:14ButtonMerchant7VersionV">Version</a>
</li>
</ul>
</li>
</ul>
</nav>
<article class="main-content">
<section>
<section class="section">
<h1>Classes</h1>
<p>The following classes are available globally.</p>

</section>
<section class="section task-group-section">
<div class="task-group">
<ul>
<li class="item">
<div>
<code>
<a name="/c:@M@ButtonMerchant@objc(cs)ButtonMerchant"></a>
<a name="//apple_ref/swift/Class/ButtonMerchant" class="dashAnchor"></a>
<a class="token" href="#/c:@M@ButtonMerchant@objc(cs)ButtonMerchant">ButtonMerchant</a>
</code>
</div>
<div class="height-container">
<div class="pointer-container"></div>
<section class="section">
<div class="pointer"></div>
<div class="abstract">
<p><code>ButtonMerchant</code> is the main entry point to the library.</p>

<p>To get started with your integration,
get your application Id from from the <a href="https://app.usebutton.com">Button Dashboard</a>.
and follow our simple <a href="https://developer.usebutton.com/docs/ios-add-merchant-library">integration guide</a></p>

<a href="Classes/ButtonMerchant.html" class="slightly-smaller">See more</a>
</div>
<div class="declaration">
<h4>Declaration</h4>
<div class="language">
<p class="aside-title">Swift</p>
<pre class="highlight swift"><code><span class="kd">@objcMembers</span>
<span class="kd">final</span> <span class="kd">public</span> <span class="kd">class</span> <span class="kt">ButtonMerchant</span> <span class="p">:</span> <span class="kt">NSObject</span></code></pre>

</div>
</div>
</section>
</div>
</li>
<li class="item">
<div>
<code>
<a name="/c:@M@ButtonMerchant@objc(cs)ButtonProduct"></a>
<a name="//apple_ref/swift/Class/ButtonProduct" class="dashAnchor"></a>
<a class="token" href="#/c:@M@ButtonMerchant@objc(cs)ButtonProduct">ButtonProduct</a>
</code>
</div>
<div class="height-container">
<div class="pointer-container"></div>
<section class="section">
<div class="pointer"></div>
<div class="abstract">
<p>A concrete implementation of the ButtonProductCompatible protocol.</p>

<a href="Classes/ButtonProduct.html" class="slightly-smaller">See more</a>
</div>
<div class="declaration">
<h4>Declaration</h4>
<div class="language">
<p class="aside-title">Swift</p>
<pre class="highlight swift"><code><span class="kd">final</span> <span class="kd">public</span> <span class="kd">class</span> <span class="kt">ButtonProduct</span> <span class="p">:</span> <span class="kt">NSObject</span><span class="p">,</span> <span class="kt"><a href="Protocols/ButtonProductCompatible.html">ButtonProductCompatible</a></span></code></pre>

</div>
</div>
</section>
</div>
</li>
<li class="item">
<div>
<code>
<a name="/c:@M@ButtonMerchant@objc(cs)Order"></a>
<a name="//apple_ref/swift/Class/Order" class="dashAnchor"></a>
<a class="token" href="#/c:@M@ButtonMerchant@objc(cs)Order">Order</a>
</code>
</div>
<div class="height-container">
<div class="pointer-container"></div>
<section class="section">
<div class="pointer"></div>
<div class="abstract">
<p>Represents an order placed by the user to be reported using <code>ButtonMerchant.reportOrder(order)</code>.</p>

<a href="Classes/Order.html" class="slightly-smaller">See more</a>
</div>
<div class="declaration">
<h4>Declaration</h4>
<div class="language">
<p class="aside-title">Swift</p>
<pre class="highlight swift"><code><span class="kd">@objcMembers</span>
<span class="kd">final</span> <span class="kd">public</span> <span class="kd">class</span> <span class="kt">Order</span> <span class="p">:</span> <span class="kt">NSObject</span><span class="p">,</span> <span class="kt">Codable</span></code></pre>

</div>
</div>
</section>
</div>
</li>
</ul>
</div>
</section>
</section>
<section id="footer">
<p>Copyright © 2018 Button, Inc. All rights reserved. (<a href="https://usebutton.com">https://usebutton.com</a>) under <a class="link" href="https://github.com/button/button-merchant-ios-private/blob/master/LICENSE" target="_blank" rel="external">MIT License</a>.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.2</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
</section>
</article>
</div>
</body>
</div>
</html>
Loading

0 comments on commit 454588c

Please sign in to comment.