Skip to content

Commit

Permalink
chore: release 2.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
ci-macpaw committed Sep 2, 2022
1 parent 651e094 commit 8a7090c
Show file tree
Hide file tree
Showing 47 changed files with 143 additions and 2,026 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,6 @@ fastlane/test_output
# node.js, yarn, electron
node_modules
yarn-error.log
/yarn.lock
yarn.lock
/nodejs/lib/binding
/Samples/electron/dist
/Samples/Electron/dist
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
## [Unreleased]

## [2.0.7] - 2022-09-02

### New
* [macOS] Drag and Drop QR code in QR Code Generator (e.g. to iOS Simulator).

### Fixed
* [iOS] Activation issues for various scenarios.
* [iOS] Subscription update via KVO.


## [2.0.6] - 2022-07-13

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ The Setapp Framework files are located in the `Setapp-framework` folder of the p

Second step is to add the Framework to your project.

Now you have 2 options: Install as package or Install as xcframework. The difference is that package will correctly understand Setapp package type, and with xcframewrok
Now you have 2 options: Install as package or Install as xcframework. The difference is that package will correctly understand Setapp package type, and with xcframework

#### Option 1. Add Setapp framework as package

Expand Down
2 changes: 1 addition & 1 deletion Samples/Electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"electron-notarize": "^1.2.1"
},
"build": {
"buildVersion": "9",
"buildVersion": "12",
"appId": "com.setapp.fmwk.macos.TestApp-setapp",
"productName": "Setapp Electron App Demo",
"copyright": "Copyright 2020-2022 Setapp Limited.",
Expand Down
1,919 changes: 0 additions & 1,919 deletions Samples/Electron/yarn.lock

This file was deleted.

4 changes: 2 additions & 2 deletions Samples/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- Setapp (2.0.3)
- Setapp (2.0.7)

DEPENDENCIES:
- Setapp (from `../`)
Expand All @@ -9,7 +9,7 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
Setapp: 188a7ef17a9aa40ca9f35c7e6bf1bbf41defb15f
Setapp: 60e895eb5c0bdedb1662a240abf4fdc24d79e898

PODFILE CHECKSUM: 5684f4ba13ff8ccff68360bd63e6ca115052c71a

Expand Down
9 changes: 5 additions & 4 deletions Samples/SetappSample-Catalyst/MainViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,11 @@ extension MainViewController {
private
extension MainViewController
{
private func updateSubscriptionStatus(with newSetappSubscription: SetappSubscription) {
subscriptionView.updateSubscriptionState("\(newSetappSubscription.isActive)".capitalized)
subscriptionView.updateExpirationDate(newSetappSubscription.expirationDate)
}
private func updateSubscriptionStatus(with newSetappSubscription: SetappSubscription?) {
let subscriptionState = newSetappSubscription.flatMap { "\($0.isActive)" } ?? "undetermined"
subscriptionView.updateSubscriptionState(subscriptionState)
subscriptionView.updateExpirationDate(newSetappSubscription?.expirationDate)
}
}

// MARK: - Setup UI
Expand Down
6 changes: 6 additions & 0 deletions Samples/SetappSamples.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
68554845282A74B000E53201 /* LogTextViewTextProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = C58484FC281BFE7D0048D467 /* LogTextViewTextProvider.swift */; };
68554846282A74B000E53201 /* LogsSmallView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5848502281C0A000048D467 /* LogsSmallView.swift */; };
68554848282A74C300E53201 /* Setapp in Frameworks */ = {isa = PBXBuildFile; productRef = 68554847282A74C300E53201 /* Setapp */; };
686A1EF228BD269200F57035 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 688C4F66260C8D7B007152F6 /* Main.storyboard */; };
686A1EF328BD26B900F57035 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 688C4F69260C8D7D007152F6 /* Assets.xcassets */; };
686A1EF428BD275D00F57035 /* setappPublicKey.pem in Resources */ = {isa = PBXBuildFile; fileRef = 689CDD3F262A2E4100E5AFA8 /* setappPublicKey.pem */; };
8D12126760A3A8D7366B5077 /* libPods-SetappSample-macOS-ObjectiveC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CF4F7B4B726DB3BA77018F4 /* libPods-SetappSample-macOS-ObjectiveC.a */; };
C524C549282A9721005A35B5 /* setappPublicKey.iOS.pem in Resources */ = {isa = PBXBuildFile; fileRef = C524C548282A9721005A35B5 /* setappPublicKey.iOS.pem */; };
C554D1A42812AA430070CB39 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C554D1A32812AA430070CB39 /* AppDelegate.m */; };
Expand Down Expand Up @@ -341,7 +344,10 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
686A1EF428BD275D00F57035 /* setappPublicKey.pem in Resources */,
C524C549282A9721005A35B5 /* setappPublicKey.iOS.pem in Resources */,
686A1EF328BD26B900F57035 /* Assets.xcassets in Resources */,
686A1EF228BD269200F57035 /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion Setapp.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Setapp'
s.version = '2.0.6'
s.version = '2.0.7'

s.summary = 'Setapp Framework'

Expand Down
10 changes: 5 additions & 5 deletions Setapp.xcframework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,36 @@
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_i386_x86_64-simulator</string>
<string>ios-arm64_x86_64-maccatalyst</string>
<key>LibraryPath</key>
<string>libSetapp.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
<string>maccatalyst</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-maccatalyst</string>
<string>ios-arm64_i386_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libSetapp.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
<string>simulator</string>
</dict>
<dict>
<key>HeadersPath</key>
Expand Down
16 changes: 6 additions & 10 deletions Setapp.xcframework/ios-arm64_armv7/Headers/Setapp-Swift.h
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ SWIFT_CLASS_NAMED("SetappManager")
/// An object that handles Setapp subscription updates.
@property (nonatomic, weak) id <STPManagerDelegate> _Nullable delegate;
/// A current Setapp subscription.
@property (nonatomic, readonly, strong) STPSubscription * _Nonnull subscription;
@property (nonatomic, readonly, strong) STPSubscription * _Nullable subscription;
- (nonnull instancetype)init SWIFT_UNAVAILABLE;
+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@end
Expand Down Expand Up @@ -399,8 +399,8 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSNotificationName _
SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) STPManager * _Nonnull sharedInstance;)
+ (STPManager * _Nonnull)sharedInstance SWIFT_WARN_UNUSED_RESULT;
+ (void)setSharedInstance:(STPManager * _Nonnull)value;
/// A current Setapp configuration. Default value: <code>SetappConfiguration.default</code>.
@property (nonatomic, strong) STPConfiguration * _Nonnull configuration;
/// A current Setapp configuration. Default value: <code>nil</code>.
@property (nonatomic, strong) STPConfiguration * _Nullable configuration;
/// Current log level.
/// Default value: <code>SetappLogLevel.info</code>.
SWIFT_CLASS_PROPERTY(@property (nonatomic, class) enum STPLogLevel logLevel;)
Expand Down Expand Up @@ -447,9 +447,7 @@ SWIFT_PROTOCOL_NAMED("SetappManagerDelegate")
/// An object describing current user’s Setapp subscription state.
SWIFT_CLASS_NAMED("SetappSubscription")
@interface STPSubscription : NSObject
/// A Boolean value that is <code>true</code> if a subscription is active, otherwise <code>false</code>.
@property (nonatomic, readonly) BOOL isActive;
/// Subscription expiration date.
@property (nonatomic, readonly, copy) NSDate * _Nullable expirationDate;
/// Returns a Boolean value that indicates whether the subscription and a given object are
/// equal.
Expand Down Expand Up @@ -771,7 +769,7 @@ SWIFT_CLASS_NAMED("SetappManager")
/// An object that handles Setapp subscription updates.
@property (nonatomic, weak) id <STPManagerDelegate> _Nullable delegate;
/// A current Setapp subscription.
@property (nonatomic, readonly, strong) STPSubscription * _Nonnull subscription;
@property (nonatomic, readonly, strong) STPSubscription * _Nullable subscription;
- (nonnull instancetype)init SWIFT_UNAVAILABLE;
+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@end
Expand Down Expand Up @@ -880,8 +878,8 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSNotificationName _
SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) STPManager * _Nonnull sharedInstance;)
+ (STPManager * _Nonnull)sharedInstance SWIFT_WARN_UNUSED_RESULT;
+ (void)setSharedInstance:(STPManager * _Nonnull)value;
/// A current Setapp configuration. Default value: <code>SetappConfiguration.default</code>.
@property (nonatomic, strong) STPConfiguration * _Nonnull configuration;
/// A current Setapp configuration. Default value: <code>nil</code>.
@property (nonatomic, strong) STPConfiguration * _Nullable configuration;
/// Current log level.
/// Default value: <code>SetappLogLevel.info</code>.
SWIFT_CLASS_PROPERTY(@property (nonatomic, class) enum STPLogLevel logLevel;)
Expand Down Expand Up @@ -928,9 +926,7 @@ SWIFT_PROTOCOL_NAMED("SetappManagerDelegate")
/// An object describing current user’s Setapp subscription state.
SWIFT_CLASS_NAMED("SetappSubscription")
@interface STPSubscription : NSObject
/// A Boolean value that is <code>true</code> if a subscription is active, otherwise <code>false</code>.
@property (nonatomic, readonly) BOOL isActive;
/// Subscription expiration date.
@property (nonatomic, readonly, copy) NSDate * _Nullable expirationDate;
/// Returns a Boolean value that indicates whether the subscription and a given object are
/// equal.
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// swift-interface-format-version: 1.0
// swift-compiler-version: Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)
// swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Setapp
// swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -autolink-force-load -enable-library-evolution -static -swift-version 5 -enforce-exclusivity=checked -O -module-name Setapp
import BackgroundTasks
import CommonCrypto
import Foundation
Expand Down Expand Up @@ -56,8 +56,12 @@ extension Setapp.SetappConfiguration : Swift.Codable {
open func encode(to encoder: Swift.Encoder) throws
}
@_hasMissingDesignatedInitializers @objc(STPSubscription) @objcMembers open class SetappSubscription : ObjectiveC.NSObject {
@objc final public let isActive: Swift.Bool
@objc final public let expirationDate: Foundation.Date?
@objc public var isActive: Swift.Bool {
@objc get
}
@objc public var expirationDate: Foundation.Date? {
@objc get
}
@objc override dynamic open func isEqual(_ object: Any?) -> Swift.Bool
@objc override dynamic open var description: Swift.String {
@objc get
Expand All @@ -79,17 +83,17 @@ extension Setapp.SetappManager {
}
@_hasMissingDesignatedInitializers @objc(STPManager) open class SetappManager : ObjectiveC.NSObject {
@objc weak open var delegate: Setapp.SetappManagerDelegate?
@objc dynamic open var subscription: Setapp.SetappSubscription {
@objc dynamic open var subscription: Setapp.SetappSubscription? {
@objc get
}
@objc deinit
}
extension Setapp.SetappManager {
@objc public static let didChangeSubscriptionNotification: Foundation.NSNotification.Name
@objc(sharedInstance) public static var shared: Setapp.SetappManager
@objc dynamic open var configuration: Setapp.SetappConfiguration {
@objc dynamic open var configuration: Setapp.SetappConfiguration? {
@objc get
@objc @available(*, deprecated, renamed: "start(with:)")
@objc @available(*, unavailable, renamed: "start(with:)")
set
}
@objc(logLevel) dynamic open class var logLevel: Setapp.SetappLogLevel {
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// swift-interface-format-version: 1.0
// swift-compiler-version: Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)
// swift-module-flags: -target armv7-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Setapp
// swift-module-flags: -target armv7-apple-ios10.0 -enable-objc-interop -autolink-force-load -enable-library-evolution -static -swift-version 5 -enforce-exclusivity=checked -O -module-name Setapp
import BackgroundTasks
import CommonCrypto
import Foundation
Expand Down Expand Up @@ -56,8 +56,12 @@ extension Setapp.SetappConfiguration : Swift.Codable {
open func encode(to encoder: Swift.Encoder) throws
}
@_hasMissingDesignatedInitializers @objc(STPSubscription) @objcMembers open class SetappSubscription : ObjectiveC.NSObject {
@objc final public let isActive: Swift.Bool
@objc final public let expirationDate: Foundation.Date?
@objc public var isActive: Swift.Bool {
@objc get
}
@objc public var expirationDate: Foundation.Date? {
@objc get
}
@objc override dynamic open func isEqual(_ object: Any?) -> Swift.Bool
@objc override dynamic open var description: Swift.String {
@objc get
Expand All @@ -79,17 +83,17 @@ extension Setapp.SetappManager {
}
@_hasMissingDesignatedInitializers @objc(STPManager) open class SetappManager : ObjectiveC.NSObject {
@objc weak open var delegate: Setapp.SetappManagerDelegate?
@objc dynamic open var subscription: Setapp.SetappSubscription {
@objc dynamic open var subscription: Setapp.SetappSubscription? {
@objc get
}
@objc deinit
}
extension Setapp.SetappManager {
@objc public static let didChangeSubscriptionNotification: Foundation.NSNotification.Name
@objc(sharedInstance) public static var shared: Setapp.SetappManager
@objc dynamic open var configuration: Setapp.SetappConfiguration {
@objc dynamic open var configuration: Setapp.SetappConfiguration? {
@objc get
@objc @available(*, deprecated, renamed: "start(with:)")
@objc @available(*, unavailable, renamed: "start(with:)")
set
}
@objc(logLevel) dynamic open class var logLevel: Setapp.SetappLogLevel {
Expand Down
Binary file modified Setapp.xcframework/ios-arm64_armv7/libSetapp.a
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ SWIFT_CLASS_NAMED("SetappManager")
/// An object that handles Setapp subscription updates.
@property (nonatomic, weak) id <STPManagerDelegate> _Nullable delegate;
/// A current Setapp subscription.
@property (nonatomic, readonly, strong) STPSubscription * _Nonnull subscription;
@property (nonatomic, readonly, strong) STPSubscription * _Nullable subscription;
- (nonnull instancetype)init SWIFT_UNAVAILABLE;
+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@end
Expand Down Expand Up @@ -399,8 +399,8 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSNotificationName _
SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) STPManager * _Nonnull sharedInstance;)
+ (STPManager * _Nonnull)sharedInstance SWIFT_WARN_UNUSED_RESULT;
+ (void)setSharedInstance:(STPManager * _Nonnull)value;
/// A current Setapp configuration. Default value: <code>SetappConfiguration.default</code>.
@property (nonatomic, strong) STPConfiguration * _Nonnull configuration;
/// A current Setapp configuration. Default value: <code>nil</code>.
@property (nonatomic, strong) STPConfiguration * _Nullable configuration;
/// Current log level.
/// Default value: <code>SetappLogLevel.info</code>.
SWIFT_CLASS_PROPERTY(@property (nonatomic, class) enum STPLogLevel logLevel;)
Expand Down Expand Up @@ -447,9 +447,7 @@ SWIFT_PROTOCOL_NAMED("SetappManagerDelegate")
/// An object describing current user’s Setapp subscription state.
SWIFT_CLASS_NAMED("SetappSubscription")
@interface STPSubscription : NSObject
/// A Boolean value that is <code>true</code> if a subscription is active, otherwise <code>false</code>.
@property (nonatomic, readonly) BOOL isActive;
/// Subscription expiration date.
@property (nonatomic, readonly, copy) NSDate * _Nullable expirationDate;
/// Returns a Boolean value that indicates whether the subscription and a given object are
/// equal.
Expand Down Expand Up @@ -771,7 +769,7 @@ SWIFT_CLASS_NAMED("SetappManager")
/// An object that handles Setapp subscription updates.
@property (nonatomic, weak) id <STPManagerDelegate> _Nullable delegate;
/// A current Setapp subscription.
@property (nonatomic, readonly, strong) STPSubscription * _Nonnull subscription;
@property (nonatomic, readonly, strong) STPSubscription * _Nullable subscription;
- (nonnull instancetype)init SWIFT_UNAVAILABLE;
+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@end
Expand Down Expand Up @@ -880,8 +878,8 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSNotificationName _
SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) STPManager * _Nonnull sharedInstance;)
+ (STPManager * _Nonnull)sharedInstance SWIFT_WARN_UNUSED_RESULT;
+ (void)setSharedInstance:(STPManager * _Nonnull)value;
/// A current Setapp configuration. Default value: <code>SetappConfiguration.default</code>.
@property (nonatomic, strong) STPConfiguration * _Nonnull configuration;
/// A current Setapp configuration. Default value: <code>nil</code>.
@property (nonatomic, strong) STPConfiguration * _Nullable configuration;
/// Current log level.
/// Default value: <code>SetappLogLevel.info</code>.
SWIFT_CLASS_PROPERTY(@property (nonatomic, class) enum STPLogLevel logLevel;)
Expand Down Expand Up @@ -928,9 +926,7 @@ SWIFT_PROTOCOL_NAMED("SetappManagerDelegate")
/// An object describing current user’s Setapp subscription state.
SWIFT_CLASS_NAMED("SetappSubscription")
@interface STPSubscription : NSObject
/// A Boolean value that is <code>true</code> if a subscription is active, otherwise <code>false</code>.
@property (nonatomic, readonly) BOOL isActive;
/// Subscription expiration date.
@property (nonatomic, readonly, copy) NSDate * _Nullable expirationDate;
/// Returns a Boolean value that indicates whether the subscription and a given object are
/// equal.
Expand Down Expand Up @@ -1252,7 +1248,7 @@ SWIFT_CLASS_NAMED("SetappManager")
/// An object that handles Setapp subscription updates.
@property (nonatomic, weak) id <STPManagerDelegate> _Nullable delegate;
/// A current Setapp subscription.
@property (nonatomic, readonly, strong) STPSubscription * _Nonnull subscription;
@property (nonatomic, readonly, strong) STPSubscription * _Nullable subscription;
- (nonnull instancetype)init SWIFT_UNAVAILABLE;
+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@end
Expand Down Expand Up @@ -1361,8 +1357,8 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSNotificationName _
SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) STPManager * _Nonnull sharedInstance;)
+ (STPManager * _Nonnull)sharedInstance SWIFT_WARN_UNUSED_RESULT;
+ (void)setSharedInstance:(STPManager * _Nonnull)value;
/// A current Setapp configuration. Default value: <code>SetappConfiguration.default</code>.
@property (nonatomic, strong) STPConfiguration * _Nonnull configuration;
/// A current Setapp configuration. Default value: <code>nil</code>.
@property (nonatomic, strong) STPConfiguration * _Nullable configuration;
/// Current log level.
/// Default value: <code>SetappLogLevel.info</code>.
SWIFT_CLASS_PROPERTY(@property (nonatomic, class) enum STPLogLevel logLevel;)
Expand Down Expand Up @@ -1409,9 +1405,7 @@ SWIFT_PROTOCOL_NAMED("SetappManagerDelegate")
/// An object describing current user’s Setapp subscription state.
SWIFT_CLASS_NAMED("SetappSubscription")
@interface STPSubscription : NSObject
/// A Boolean value that is <code>true</code> if a subscription is active, otherwise <code>false</code>.
@property (nonatomic, readonly) BOOL isActive;
/// Subscription expiration date.
@property (nonatomic, readonly, copy) NSDate * _Nullable expirationDate;
/// Returns a Boolean value that indicates whether the subscription and a given object are
/// equal.
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 8a7090c

Please sign in to comment.