Skip to content

Commit a57b42a

Browse files
phillipthelenphillipthelen
committed
fix compilation errors
1 parent 46375e5 commit a57b42a

40 files changed

+108
-481
lines changed

‎HabitRPG/AppDelegate.swift

-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import UIKit
1010
import PopupDialog
11-
import Shared
1211
import Keys
1312
import Amplitude_iOS
1413
import Habitica_API_Client
@@ -20,7 +19,6 @@ import SwiftyStoreKit
2019
import StoreKit
2120
import UserNotifications
2221
import FirebaseMessaging
23-
import Shared
2422

2523
//This will eventually replace the old ObjC AppDelegate once that code is ported to swift.
2624
//Reason for adding this class now is mostly, to configure PopupDialogs dim color.

‎HabitRPG/Habitica-Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@
573573
</dict>
574574
</array>
575575
<key>CFBundleVersion</key>
576-
<string>517</string>
576+
<string>518</string>
577577
<key>CustomDomain</key>
578578
<string>${CUSTOM_DOMAIN}</string>
579579
<key>DisableSSL</key>

‎HabitRPG/Repositories/ConfigRepository.swift

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import Foundation
99
import Habitica_API_Client
1010
import FirebaseRemoteConfig
11-
import Shared
11+
import Habitica_Models
1212

1313
@objc
1414
enum ConfigVariable: Int {
@@ -35,7 +35,6 @@ enum ConfigVariable: Int {
3535
case customMenu
3636
case maintenanceData
3737

38-
3938
//A/B Tests
4039
case enableAdventureGuide
4140
case enableUsernameAutocomplete
@@ -161,7 +160,7 @@ class ConfigRepository: NSObject {
161160
@objc
162161
func fetchremoteConfig() {
163162
ConfigRepository.remoteConfig.fetch(withExpirationDuration: HabiticaAppDelegate.isRunningLive() ? 3600 : 0) { (_, _) in
164-
ConfigRepository.remoteConfig.activate(completionHandler: nil)
163+
ConfigRepository.remoteConfig.activate(completion: nil)
165164
}
166165
var defaults = [String: NSObject]()
167166
for variable in ConfigVariable.allVariables() {

‎HabitRPG/Repositories/Implementations/UserRepository.swift

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import Habitica_Models
1111
import Habitica_Database
1212
import Habitica_API_Client
1313
import ReactiveSwift
14-
import Shared
1514

1615
import WidgetKit
1716

‎HabitRPG/TableViewController/Modals/HRPGBuyItemModalViewController.swift

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import UIKit
1010
import Habitica_Models
1111
import ReactiveSwift
1212
import Habitica_Database
13-
import Shared
1413

1514
// swiftlint:disable:next type_body_length
1615
class HRPGBuyItemModalViewController: UIViewController, Themeable {

‎HabitRPG/TableViewDataSources/ShopCollectionViewDataSource.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import UIKit
1010
import Habitica_Models
1111
import ReactiveSwift
12-
import Shared
1312

1413
@objc
1514
protocol ShopCollectionViewDataSourceProtocol: UICollectionViewDelegateFlowLayout {

‎HabitRPG/TableViewDataSources/TaskTableViewDataSource.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import UIKit
1010
import Habitica_Models
1111
import ReactiveSwift
12-
import Shared
1312
import Habitica_Database
1413

1514
@objc

‎HabitRPG/UI/General/MainMenuViewController.swift

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import UIKit
1010
import Habitica_Models
1111
import Eureka
1212
import ReactiveSwift
13-
import Shared
1413

1514
class MenuItem {
1615
enum Key: String {

‎HabitRPG/UI/Inventory/AvatarDetailViewController.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import Foundation
1010
import Habitica_Models
11-
import Shared
1211

1312
class AvatarDetailViewController: BaseCollectionViewController, UICollectionViewDelegateFlowLayout {
1413

‎HabitRPG/UI/Inventory/ItemsViewController.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import UIKit
1010
import Habitica_Models
11-
import Shared
1211

1312
class ItemsViewController: BaseTableViewController {
1413

‎HabitRPG/UI/Inventory/Stable/FeedViewController.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import Foundation
1010
import Habitica_Models
11-
import Shared
1211

1312
class FeedViewController: BaseTableViewController {
1413
private let dataSource = FeedViewDataSource()

‎HabitRPG/UI/Social/GroupChatViewController.swift

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import SlackTextViewController
1111
import Down
1212
import Habitica_Models
1313
import ReactiveSwift
14-
import Shared
1514

1615
class GroupChatViewController: SLKTextViewController, Themeable {
1716

‎HabitRPG/UI/Social/GroupDetailViewController.swift

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import Foundation
1010
import Habitica_Models
1111
import ReactiveSwift
1212
import Down
13-
import Shared
1413

1514
class GroupDetailViewController: BaseUIViewController {
1615
var groupID: String?

‎HabitRPG/UI/Social/Party/PartyDetailViewController.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import Foundation
1010
import Habitica_Models
1111
import ReactiveSwift
12-
import Shared
1312

1413
class PartyDetailViewController: GroupDetailViewController {
1514

‎HabitRPG/UI/Social/Party/PartyViewController.swift

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88

99
import UIKit
10-
import Shared
1110
import ReactiveSwift
1211

1312
class PartyViewController: SplitSocialViewController {

‎HabitRPG/UI/Social/SplitSocialViewController.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import UIKit
1010
import Habitica_Models
1111
import ReactiveSwift
12-
import Shared
1312

1413
class SplitSocialViewController: HabiticaSplitViewController {
1514

‎HabitRPG/Utilities/AuthenticationManager.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import Foundation
1010
import ReactiveSwift
1111
import KeychainAccess
12-
import Shared
1312
import Habitica_API_Client
1413

1514
class AuthenticationManager: NSObject {

‎HabitRPG/Utilities/HabiticaAnalytics.swift

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
//
2+
// HabiticaAnalytics.swift
3+
// Shared
4+
//
5+
// Created by Phillip Thelen on 25.09.20.
6+
// Copyright © 2020 HabitRPG Inc. All rights reserved.
7+
//
8+
9+
import Foundation
10+
import Amplitude_iOS
11+
12+
public class HabiticaAnalytics {
13+
public static let shared = HabiticaAnalytics()
14+
15+
public func setUserID(_ userID: String?) {
16+
Amplitude.instance().setUserId(userID)
17+
}
18+
19+
public func logNavigationEvent(_ pageName: String) {
20+
let properties = [
21+
"eventAction": "navigate",
22+
"eventCategory": "navigation",
23+
"hitType": "pageview",
24+
"page": pageName,
25+
]
26+
Amplitude.instance()?.logEvent("navigate", withEventProperties: properties)
27+
}
28+
29+
public func log(_ eventName: String, withEventProperties properties: [AnyHashable: Any]) {
30+
Amplitude.instance()?.logEvent(eventName, withEventProperties: properties)
31+
}
32+
}

‎HabitRPG/Utilities/ObjcRemoteLogger.swift

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88

99
import Foundation
10-
import Shared
1110

1211
@objc
1312
class ObjcHabiticaAnalytics: NSObject {

‎HabitRPG/Utilities/PurchaseHandler.swift

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import Foundation
1010
import SwiftyStoreKit
1111
import StoreKit
1212
import Keys
13-
import Shared
1413

1514
class PurchaseHandler: NSObject, SKPaymentTransactionObserver {
1615
@objc static let shared = PurchaseHandler()

‎HabitRPG/Utilities/RemoteLogger.swift

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
//
2+
// RemoteLogger.swift
3+
// Shared
4+
//
5+
// Created by Phillip Thelen on 25.09.20.
6+
// Copyright © 2020 HabitRPG Inc. All rights reserved.
7+
//
8+
9+
import Foundation
10+
import FirebaseCrashlytics
11+
12+
@objc
13+
public class RemoteLogger: NSObject {
14+
public static let shared = RemoteLogger()
15+
16+
public func record(error: Error) {
17+
Crashlytics.crashlytics().record(error: error)
18+
}
19+
20+
public func record(name: String, reason: String) {
21+
let exm = ExceptionModel(name: name, reason: reason)
22+
Crashlytics.crashlytics().record(exceptionModel: exm)
23+
}
24+
25+
public func log(format: String, arguments: CVaListPointer) {
26+
Crashlytics.crashlytics().log(format: format, arguments: arguments)
27+
}
28+
29+
public func setUserID(_ userID: String?) {
30+
Crashlytics.crashlytics().setUserID(userID ?? "")
31+
}
32+
}

‎HabitRPG/Utilities/UserManager.swift

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import Habitica_Models
1111
import ReactiveSwift
1212
import Habitica_Database
1313
import PopupDialog
14-
import Shared
1514

1615
@objc
1716
class UserManager: NSObject {

‎Habitica API Client/Habitica API Client.xcodeproj/project.pbxproj

-2
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@
237237
29EBDA85232A8BE0006611E3 /* AppleLoginCall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29EBDA84232A8BE0006611E3 /* AppleLoginCall.swift */; };
238238
9A268BF127E13DFBBE1D6DAF /* Pods_Habitica_API_ClientTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B265032E3FD15918939BFD0F /* Pods_Habitica_API_ClientTests.framework */; };
239239
AE4ADE8B2AF941F3FCBB5DD9 /* Pods_Habitica_API_Client.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D41C03127A377E7796EFB1E8 /* Pods_Habitica_API_Client.framework */; };
240-
C83802F7251DE9C200AE90ED /* Shared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C83802F6251DE9C200AE90ED /* Shared.framework */; };
241240
DC2C4A0476068E29973DB0CD /* RetrieveGroupMembersCall.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC2C420658EE5D517E37D97D /* RetrieveGroupMembersCall.swift */; };
242241
/* End PBXBuildFile section */
243242

@@ -499,7 +498,6 @@
499498
buildActionMask = 2147483647;
500499
files = (
501500
292DEE44204D9D8D0086D5F7 /* Habitica_Models.framework in Frameworks */,
502-
C83802F7251DE9C200AE90ED /* Shared.framework in Frameworks */,
503501
AE4ADE8B2AF941F3FCBB5DD9 /* Pods_Habitica_API_Client.framework in Frameworks */,
504502
);
505503
runOnlyForDeploymentPostprocessing = 0;

‎Habitica API Client/Habitica API Client/DateDecodingStrategy-Extension.swift

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88

99
import Foundation
10-
import Shared
1110

1211
extension JSONDecoder {
1312

@@ -72,7 +71,7 @@ extension JSONDecoder {
7271
return date
7372
}
7473

75-
RemoteLogger.shared.record(name: "DateParserException", reason: "Date \(dateStr) could not be parsed")
74+
//RemoteLogger.shared.record(name: "DateParserException", reason: "Date \(dateStr) could not be parsed")
7675

7776
return Date(timeIntervalSince1970: 0)
7877
})

‎Habitica API Client/Habitica API Client/HabiticaServerConfig.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
//
88

99
import UIKit
10-
import Shared
10+
import Habitica_Models
11+
1112
public class HabiticaServerConfig {
1213
public static let production = ServerConfiguration(scheme: "https", host: Constants.defaultProdHost, apiRoute: "api/\(Constants.defaultApiVersion)")
1314
public static let staging = ServerConfiguration(scheme: "https", host: "habitrpg-staging.herokuapp.com", apiRoute: "api/\(Constants.defaultApiVersion)")

‎Habitica API Client/Habitica API Client/Models/Content/APIShop.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import Foundation
1010
import Habitica_Models
11-
import Shared
1211

1312
public class APIShop: ShopProtocol, Decodable {
1413
public var identifier: String?

‎Habitica API Client/Habitica API Client/Shops/RetrieveShopInventoryCall.swift

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import Foundation
1010
import Habitica_Models
1111
import ReactiveSwift
12-
import Shared
1312

1413
public class RetrieveShopInventoryCall: ResponseObjectCall<ShopProtocol, APIShop> {
1514
public init(identifier: String, language: String? = nil, stubHolder: StubHolderProtocol? = StubHolder(responseCode: 200, stubFileName: "user.json")) {

‎Habitica Database/Habitica Database.xcodeproj/project.pbxproj

-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
29DBFEFB20CADB4100DF9CF2 /* RealmSpecialItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29DBFEFA20CADB4100DF9CF2 /* RealmSpecialItem.swift */; };
101101
29DBFF0D20D15B0500DF9CF2 /* RealmUserNewMessages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29DBFF0C20D15B0500DF9CF2 /* RealmUserNewMessages.swift */; };
102102
29EBDA7C23290E7A006611E3 /* RealmInboxConversation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29EBDA7B23290E7A006611E3 /* RealmInboxConversation.swift */; };
103-
C83802F3251DE9A800AE90ED /* Shared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C83802F2251DE9A800AE90ED /* Shared.framework */; };
104103
EFA96FFA3536BF094D7B36B3 /* Pods_Habitica_DatabaseTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 930CE9895A927708C0C96A90 /* Pods_Habitica_DatabaseTests.framework */; };
105104
/* End PBXBuildFile section */
106105

@@ -227,7 +226,6 @@
227226
292DEE41204D9D860086D5F7 /* Habitica_Models.framework in Frameworks */,
228227
292DEE3F204D9D810086D5F7 /* Habitica_API_Client.framework in Frameworks */,
229228
175E06DDF89F66BE894D1E3E /* Pods_Habitica_Database.framework in Frameworks */,
230-
C83802F3251DE9A800AE90ED /* Shared.framework in Frameworks */,
231229
);
232230
runOnlyForDeploymentPostprocessing = 0;
233231
};

‎Habitica Intents/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>517</string>
22+
<string>518</string>
2323
<key>NSExtension</key>
2424
<dict>
2525
<key>NSExtensionAttributes</key>

‎Habitica IntentsUI/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>517</string>
22+
<string>518</string>
2323
<key>NSExtension</key>
2424
<dict>
2525
<key>NSExtensionAttributes</key>

‎Habitica Models/Habitica Models.xcodeproj/project.pbxproj

+4
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
29A06E1323EB3340003BADE9 /* EmailNotificationsProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A06E1223EB3340003BADE9 /* EmailNotificationsProtocol.swift */; };
113113
29A62B03216CC66F00D4BD90 /* VerifyUsernameResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A62B02216CC66F00D4BD90 /* VerifyUsernameResponse.swift */; };
114114
29A6B86A20690D470086B2A6 /* WeekRepeatProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A6B86920690D470086B2A6 /* WeekRepeatProtocol.swift */; };
115+
29A984CD2547293E00F04665 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A984CC2547293E00F04665 /* Constants.swift */; };
115116
29B478BF20C5304F00B6123F /* BuyResponseProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B478BE20C5304F00B6123F /* BuyResponseProtocol.swift */; };
116117
29B478C120C531B000B6123F /* ArmoireResponseProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B478C020C531B000B6123F /* ArmoireResponseProtocol.swift */; };
117118
29C38C7F24A2321400F219A1 /* UserAchievementsProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29C38C7E24A2321400F219A1 /* UserAchievementsProtocol.swift */; };
@@ -244,6 +245,7 @@
244245
29A06E1223EB3340003BADE9 /* EmailNotificationsProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailNotificationsProtocol.swift; sourceTree = "<group>"; };
245246
29A62B02216CC66F00D4BD90 /* VerifyUsernameResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerifyUsernameResponse.swift; sourceTree = "<group>"; };
246247
29A6B86920690D470086B2A6 /* WeekRepeatProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeekRepeatProtocol.swift; sourceTree = "<group>"; };
248+
29A984CC2547293E00F04665 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
247249
29B478BE20C5304F00B6123F /* BuyResponseProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuyResponseProtocol.swift; sourceTree = "<group>"; };
248250
29B478C020C531B000B6123F /* ArmoireResponseProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArmoireResponseProtocol.swift; sourceTree = "<group>"; };
249251
29C38C7E24A2321400F219A1 /* UserAchievementsProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAchievementsProtocol.swift; sourceTree = "<group>"; };
@@ -463,6 +465,7 @@
463465
29A62B02216CC66F00D4BD90 /* VerifyUsernameResponse.swift */,
464466
29DBFF0820D1336000DF9CF2 /* EquatableStringEnumProtocol.swift */,
465467
2981849F20F8AC3E00F06D3D /* BaseModelProtocol.swift */,
468+
29A984CC2547293E00F04665 /* Constants.swift */,
466469
);
467470
path = "Habitica Models";
468471
sourceTree = "<group>";
@@ -768,6 +771,7 @@
768771
2956110B2056E14300D9711A /* QuestCollectProtocol.swift in Sources */,
769772
295E9DE820B3263E00D58D45 /* ShopCategoryProtocol.swift in Sources */,
770773
29DBFF0B20D15A4A00DF9CF2 /* UserNewMessagesProtocol.swift in Sources */,
774+
29A984CD2547293E00F04665 /* Constants.swift in Sources */,
771775
);
772776
runOnlyForDeploymentPostprocessing = 0;
773777
};

‎Shared/Shared/Constants.swift renamed to ‎Habitica Models/Habitica Models/Constants.swift

File renamed without changes.

‎Habitica Snapshots/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<key>CFBundleShortVersionString</key>
1818
<string>1.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>517</string>
20+
<string>518</string>
2121
</dict>
2222
</plist>

‎Habitica Widgets/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>517</string>
22+
<string>518</string>
2323
<key>NSExtension</key>
2424
<dict>
2525
<key>NSExtensionPointIdentifier</key>

0 commit comments

Comments
 (0)