Skip to content

Commit ee18ffd

Browse files
committed
made universal build and also added support for macOS 10.10
1 parent 632dfad commit ee18ffd

27 files changed

Lines changed: 183 additions & 138 deletions

native/Podfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ source 'https://github.com/AudioKit/Specs.git'
22
source 'https://github.com/CocoaPods/Specs.git'
33

44
# Uncomment the next line to define a global platform for your project
5-
platform :osx, '10.12'
5+
platform :osx, '10.10'
66
workspace 'eqMac.xcworkspace'
77
use_frameworks!
88

99
post_install do |installer|
1010
installer.pods_project.targets.each do |target|
1111
target.build_configurations.each do |config|
12-
config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.12'
12+
config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.10'
1313
end
1414
end
1515
end
@@ -27,14 +27,14 @@ project 'driver-installer/eqMac Driver Installer.xcodeproj'
2727
target 'eqMac' do
2828
project 'app/eqMac.xcodeproj'
2929

30-
pod 'Alamofire', '~> 5.1'
30+
pod 'SwiftHTTP', '~> 3.0'
3131
pod 'AMCoreAudio', :git => 'https://github.com/bitgapp/AMCoreAudio.git', :commit => 'f02015b7dfbaeb9b5f70b658e860afe94f85df9c'
3232
pod 'WebViewJavascriptBridge', '~> 6.0'
3333
pod 'ReachabilitySwift'
3434
pod 'ReSwift'
3535
pod 'SwiftLint'
36-
pod 'Sparkle'
37-
pod 'Sentry', '~> 4.1'
36+
pod 'Sparkle', '~> 1.24'
37+
pod 'Sentry', '~> 6.0'
3838
pod 'EmitterKit', '~> 5.2.2'
3939
pod 'SwiftyJSON', '~> 4.2'
4040
pod 'SwiftyUserDefaults', '4.0'

native/Podfile.lock

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
11
PODS:
2-
- Alamofire (5.2.1)
32
- AMCoreAudio (3.5)
43
- EmitterKit (5.2.2)
54
- KeychainSwift (13.0.0)
65
- ReachabilitySwift (5.0.0)
76
- ReSwift (5.0.0)
8-
- Sentry (4.5.0):
9-
- Sentry/Core (= 4.5.0)
10-
- Sentry/Core (4.5.0)
11-
- Sparkle (1.23.0)
7+
- Sentry (6.0.9):
8+
- Sentry/Core (= 6.0.9)
9+
- Sentry/Core (6.0.9)
10+
- Sparkle (1.24.0)
1211
- STPrivilegedTask (1.0.7)
12+
- SwiftHash (2.0.2)
13+
- SwiftHTTP (3.0.1)
1314
- SwiftLint (0.39.2)
1415
- SwiftyJSON (4.3.0)
1516
- SwiftyUserDefaults (4.0.0)
1617
- WebViewJavascriptBridge (6.0.3)
1718
- Zip (1.1.0)
1819

1920
DEPENDENCIES:
20-
- Alamofire (~> 5.1)
2121
- AMCoreAudio (from `https://github.com/bitgapp/AMCoreAudio.git`, commit `f02015b7dfbaeb9b5f70b658e860afe94f85df9c`)
2222
- EmitterKit (~> 5.2.2)
2323
- KeychainSwift (~> 13.0)
2424
- ReachabilitySwift
2525
- ReSwift
26-
- Sentry (~> 4.1)
27-
- Sparkle
26+
- Sentry (~> 6.0)
27+
- Sparkle (~> 1.24)
2828
- STPrivilegedTask (from `https://github.com/sveinbjornt/STPrivilegedTask.git`, commit `fdca677c77adb166a2be4c5ea9c7580a738c49c9`)
29+
- SwiftHash
30+
- SwiftHTTP (~> 3.0)
2931
- SwiftLint
3032
- SwiftyJSON (~> 4.2)
3133
- SwiftyUserDefaults (= 4.0)
@@ -34,13 +36,14 @@ DEPENDENCIES:
3436

3537
SPEC REPOS:
3638
https://github.com/CocoaPods/Specs.git:
37-
- Alamofire
3839
- EmitterKit
3940
- KeychainSwift
4041
- ReachabilitySwift
4142
- ReSwift
4243
- Sentry
4344
- Sparkle
45+
- SwiftHash
46+
- SwiftHTTP
4447
- SwiftLint
4548
- SwiftyJSON
4649
- SwiftyUserDefaults
@@ -64,21 +67,22 @@ CHECKOUT OPTIONS:
6467
:git: https://github.com/sveinbjornt/STPrivilegedTask.git
6568

6669
SPEC CHECKSUMS:
67-
Alamofire: e911732990610fe89af59ac0077f923d72dc3dfd
6870
AMCoreAudio: d7fc6672b56df2ade8e77d08f3247d18d59697e3
6971
EmitterKit: e7a27b37118823d8ad413b8396f75e40d59f8cba
7072
KeychainSwift: 23d6c16cbc33f20fafa30c3d783241b4b87d998c
7173
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
7274
ReSwift: 628f1a9b3ee52e3b3ca2a644435472fd77afafe1
73-
Sentry: ab6c209f23700d1460691dbc90e19ed0a05d496b
74-
Sparkle: 55b1a87ba69d56913375a281546b7c82dec95bb0
75+
Sentry: 388c9dc093b2fd3a264466a5c5b21e25959610a9
76+
Sparkle: 270cd27377bf04e9c128af06e3a22d0f572d6ee3
7577
STPrivilegedTask: 56c3397238a1ec07720fb877a044898373cd2c68
78+
SwiftHash: 6d312abe61c8359bdef8d0093642f3a70b1c17ba
79+
SwiftHTTP: e94f1aa8cde58637dcc0100f6349de31a3337fde
7680
SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447
7781
SwiftyJSON: 6faa0040f8b59dead0ee07436cbf76b73c08fd08
7882
SwiftyUserDefaults: 6a1951df1daa19337862b677dd9a4b9bd4c288cd
7983
WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29
8084
Zip: 8877eede3dda76bcac281225c20e71c25270774c
8185

82-
PODFILE CHECKSUM: a3ec692017854f820d74ee97fb5741617978a947
86+
PODFILE CHECKSUM: 5871be69946cef309e01543dc90a72d487dfd5a8
8387

8488
COCOAPODS: 1.9.3

native/app/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ eqMacAudio.xcworkspace/xcuserdata/
66
eqMacAudio.xcodeproj/xcuserdata
77
eqMacAudioDriver.xcodeproj/xcuserdata
88
eqMacAudio.xcworkspace/xcuserdata
9-
Carthage/
109

1110
OpenSSL/*
1211
!OpenSSL/.gitkeep

native/app/Cartfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

native/app/Cartfile.resolved

Lines changed: 0 additions & 1 deletion
This file was deleted.

native/app/Embedded/eqMac.driver/Contents/Info.plist

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@
4545
<key>DTCompiler</key>
4646
<string>com.apple.compilers.llvm.clang.1_0</string>
4747
<key>DTPlatformBuild</key>
48-
<string>12A7403</string>
48+
<string>12B45b</string>
4949
<key>DTPlatformName</key>
5050
<string>macosx</string>
5151
<key>DTPlatformVersion</key>
52-
<string>10.15.6</string>
52+
<string>11.0</string>
5353
<key>DTSDKBuild</key>
54-
<string>19G68</string>
54+
<string>20A2408</string>
5555
<key>DTSDKName</key>
56-
<string>macosx10.15</string>
56+
<string>macosx11.0</string>
5757
<key>DTXcode</key>
58-
<string>1210</string>
58+
<string>1220</string>
5959
<key>DTXcodeBuild</key>
60-
<string>12A7403</string>
60+
<string>12B45b</string>
6161
<key>LSMinimumSystemVersion</key>
6262
<string>10.9</string>
6363
<key>NSHumanReadableCopyright</key>
343 KB
Binary file not shown.

native/app/Embedded/ui.zip

156 Bytes
Binary file not shown.

native/app/Source/AppDelegate.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, SUUpdaterDelegate {
1717
var updater = SUUpdater(for: Bundle.main)!
1818
var updateProcessed = EmitterKit.Event<Void>()
1919
var willBeDownloadingUpdate = false
20+
2021
func applicationDidFinishLaunching(_ aNotification: Notification) {
2122
NSApplication.shared.windows.first?.close()
2223
updater.delegate = self

native/app/Source/Application.swift

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,9 @@ class Application {
9999

100100
private static func setupCrashReporting () {
101101
// Create a Sentry client and start crash handler
102-
do {
103-
Client.shared = try Client(dsn: Constants.SENTRY_ENDPOINT)
104-
Client.shared?.sampleRate = 0.1
105-
try Client.shared?.startCrashHandler()
106-
} catch let error {
107-
Console.log("\(error)")
108-
// Wrong DSN or KSCrash not installed
102+
SentrySDK.start { options in
103+
options.dsn = Constants.SENTRY_ENDPOINT
104+
options.sampleRate = 0.1
109105
}
110106
}
111107

0 commit comments

Comments
 (0)