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

chore: Merge master into develop #109

Merged
merged 7 commits into from
Jun 21, 2023
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: 'bug'
assignees: ''

---

<!--- Provide a general summary of the issue in the Title above -->

## Expected Behavior
<!--- Tell us what should happen -->

## Current Behavior
<!--- Tell us what happens instead of the expected behavior -->

## Possible Solution
<!--- Not obligatory, but suggest a fix/reason for the bug -->

## Steps to Reproduce (for bugs)
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->
1.
2.
3.
4.

## Context
<!--- How has this issue affected you? What are you trying to accomplish? -->
<!--- Providing context helps us come up with a solution that is most useful in the real world -->

## Your Environment
<!--- Include as many relevant details about the environment you experienced the bug in -->
* Version used:
* Environment name and version (device, simalator):
* Operating System and version (iOS, osx):
* Link to your project:
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: 'enhancement'
assignees: ''

---

<!--- Provide a general summary of the feature request in the Title above -->

## Expected Behavior
<!--- A clear and concise description of what you want to happen -->

## Current Behavior
<!--- Explain the difference from current behavior -->

## Possible Solution
<!--- Suggest ideas of how to implement the addition or change -->

## Alternatives Considered
<!--- A clear and concise description of any alternative solutions or features you've considered -->

## Additional Context
<!--- Add any other context or screenshots about the feature request here. -->
30 changes: 30 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!--- Provide a general summary of your changes in the Title above -->
<!--- Pull request titles must use the [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) format -->

## Issue being fixed or feature implemented
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->


## What was done?
<!--- Describe your changes in detail -->


## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->


## Breaking Changes
<!--- Please describe any breaking changes your code introduces and verify that -->
<!--- the title includes "!" following the conventional commit type (e.g. "feat!: ..."-->


## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have added or updated relevant unit/integration/functional/e2e tests
- [ ] I have made corresponding changes to the documentation

1 change: 1 addition & 0 deletions Sources/Extras.swift
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ public extension InAppReceipt
static func cancelRefreshSession()
{
refreshSession?.cancel()
destroyRefreshSession()
}

@available(watchOSApplicationExtension 6.2, *)
Expand Down
11 changes: 8 additions & 3 deletions Sources/Validation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,12 @@ func getMacAddress() -> Data?

func ioService(named name: String, wantBuiltIn: Bool) -> io_service_t?
{
let master_port = kIOMasterPortDefault
let main_port: mach_port_t
if #available(macOS 12.0, macCatalyst 15.0, *) {
main_port = kIOMainPortDefault
} else {
main_port = 0 // the kIOMasterPortDefault symbol is unavailable on xcode 14 and later.
}
var iterator = io_iterator_t()

defer
Expand All @@ -334,8 +339,8 @@ func ioService(named name: String, wantBuiltIn: Bool) -> io_service_t?
}
}

guard let matchingDict = IOBSDNameMatching(master_port, 0, name),
IOServiceGetMatchingServices(master_port, matchingDict as CFDictionary, &iterator) == KERN_SUCCESS,
guard let matchingDict = IOBSDNameMatching(main_port, 0, name),
IOServiceGetMatchingServices(main_port, matchingDict as CFDictionary, &iterator) == KERN_SUCCESS,
iterator != IO_OBJECT_NULL
else
{
Expand Down
2 changes: 1 addition & 1 deletion TPInAppReceipt.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "TPInAppReceipt"
s.version = "3.3.2"
s.version = "3.3.4"
s.summary = "Reading and Validating In App Purchase Receipt Locally"
s.description = "A lightweight iOS/OSX library for reading and validating Apple In App Purchase Receipt locally. Pure swift, No OpenSSL!"

Expand Down