Skip to content

Commit 1b3c8c7

Browse files
Modifying podspec and folder structure to create macOS specific subspec
OKTA-350983 <<<Jenkins Check-In of Tested SHA: 76a7a96 for eng_productivity_ci_bot_okta@okta.com>>> Artifact: okta-ios-logger
1 parent d8add28 commit 1b3c8c7

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

Example/Example-iOS/AppDelegate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2121
return true
2222
}
2323

24-
func initializeFirebaseCrashlyticsLogger() -> OktaLoggerCrashlyticsLogger {
24+
func initializeFirebaseCrashlyticsLogger() -> OktaLoggerFirebaseCrashlyticsLogger {
2525
FirebaseApp.configure()
2626
let crashlytics = Crashlytics.crashlytics()
2727
crashlytics.setUserID("test123")
2828

29-
return OktaLoggerCrashlyticsLogger(
29+
return OktaLoggerFirebaseCrashlyticsLogger(
3030
crashlytics: crashlytics,
3131
identifier: "com.okta.OktaLoggerDemoApp.crashlyticsLogger",
3232
level: .all

OktaLogger.podspec

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "OktaLogger"
3-
s.version = "1.0.8"
3+
s.version = "1.0.9"
44
s.summary = "Logging proxy for standardized logging interface across products"
55
s.description = "Standard interface for all logging in Okta apps + SDK. Supports file, console, firebase logging destinations."
66
s.homepage = "https://github.com/okta/okta-logger-swift"
@@ -19,6 +19,10 @@ Pod::Spec.new do |s|
1919
complete.dependency 'OktaLogger/FileLogger'
2020
complete.dependency 'OktaLogger/FirebaseCrashlytics'
2121
end
22+
23+
s.subspec "MacOS" do |macos|
24+
macos.dependency 'OktaLogger/FileLogger'
25+
end
2226

2327
s.subspec 'FileLogger' do |fileLogger|
2428
fileLogger.source_files = [
@@ -30,7 +34,7 @@ Pod::Spec.new do |s|
3034

3135
s.subspec 'FirebaseCrashlytics' do |crashlytics|
3236
crashlytics.source_files = [
33-
'OktaLogger/CrashlyticsLogger/OktaLoggerCrashlyticsLogger.swift'
37+
'OktaLogger/FirebaseCrashlyticsLogger/OktaLoggerFirebaseCrashlyticsLogger.swift'
3438
]
3539
crashlytics.dependency 'Firebase/Crashlytics', '~>6.29.0'
3640
crashlytics.dependency 'OktaLogger/Core'
@@ -41,7 +45,7 @@ Pod::Spec.new do |s|
4145
core.exclude_files = [
4246
'OktaLogger/Info.plist',
4347
'OktaLogger/FileLoggers',
44-
'OktaLogger/CrashlyticsLogger'
48+
'OktaLogger/FirebaseCrashlyticsLogger'
4549
]
4650
end
4751

OktaLogger.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
D5C824E52469DBF1005CF747 /* OktaLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = D5C824D72469DBF1005CF747 /* OktaLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
3434
D5D0978E246DE00800C1362F /* OktaLoggerConsoleLoggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5D0978D246DE00800C1362F /* OktaLoggerConsoleLoggerTests.swift */; };
3535
DEC5276624DBF9630022B698 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC5276524DBF9630022B698 /* GoogleService-Info.plist */; };
36-
DEFB59E124EAC76400A1744F /* OktaLoggerCrashlyticsLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEFB59E024EAC76300A1744F /* OktaLoggerCrashlyticsLogger.swift */; };
36+
DEFB59E124EAC76400A1744F /* OktaLoggerFirebaseCrashlyticsLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEFB59E024EAC76300A1744F /* OktaLoggerFirebaseCrashlyticsLogger.swift */; };
3737
E251E7FE248AD1B400EF466D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E251E7FD248AD1B400EF466D /* AppDelegate.swift */; };
3838
E251E800248AD1B400EF466D /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E251E7FF248AD1B400EF466D /* SceneDelegate.swift */; };
3939
E251E802248AD1B400EF466D /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E251E801248AD1B400EF466D /* ViewController.swift */; };
@@ -126,7 +126,7 @@
126126
D5D0978D246DE00800C1362F /* OktaLoggerConsoleLoggerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OktaLoggerConsoleLoggerTests.swift; sourceTree = "<group>"; };
127127
DB510C00105E7489E2C16BA3 /* Pods-OktaLoggerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OktaLoggerTests.debug.xcconfig"; path = "Target Support Files/Pods-OktaLoggerTests/Pods-OktaLoggerTests.debug.xcconfig"; sourceTree = "<group>"; };
128128
DEC5276524DBF9630022B698 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
129-
DEFB59E024EAC76300A1744F /* OktaLoggerCrashlyticsLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OktaLoggerCrashlyticsLogger.swift; sourceTree = "<group>"; };
129+
DEFB59E024EAC76300A1744F /* OktaLoggerFirebaseCrashlyticsLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OktaLoggerFirebaseCrashlyticsLogger.swift; sourceTree = "<group>"; };
130130
DF75E3D21D2B9A971A2CAEC7 /* libPods-OktaLoggerDemoApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OktaLoggerDemoApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
131131
E251E7FB248AD1B400EF466D /* OktaLoggerDemoApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OktaLoggerDemoApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
132132
E251E7FD248AD1B400EF466D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -171,10 +171,10 @@
171171
8004832F24C1F0F0008BFF3A /* FileLoggers */ = {
172172
isa = PBXGroup;
173173
children = (
174+
6582AABCF4A4B6E5E05FC2E4 /* LumberjackLoggerDelegate.swift */,
174175
806FF25D24B95A3300994D4D /* OktaLoggerFileLogger.swift */,
175176
8004832D24C1EFDF008BFF3A /* OktaLoggerFileLoggerConfig.swift */,
176177
6582ABCA2C9C2759535A1B4E /* FileLoggerDelegate.swift */,
177-
6582AABCF4A4B6E5E05FC2E4 /* LumberjackLoggerDelegate.swift */,
178178
);
179179
path = FileLoggers;
180180
sourceTree = "<group>";
@@ -218,7 +218,7 @@
218218
isa = PBXGroup;
219219
children = (
220220
8004832F24C1F0F0008BFF3A /* FileLoggers */,
221-
DEFB59DF24EAC76300A1744F /* CrashlyticsLogger */,
221+
DEFB59DF24EAC76300A1744F /* FirebaseCrashlyticsLogger */,
222222
D5C824D72469DBF1005CF747 /* OktaLogger.h */,
223223
D5C824D82469DBF1005CF747 /* Info.plist */,
224224
D54461C2246A023000C755F1 /* OktaLogger.swift */,
@@ -264,12 +264,12 @@
264264
name = "Recovered References";
265265
sourceTree = "<group>";
266266
};
267-
DEFB59DF24EAC76300A1744F /* CrashlyticsLogger */ = {
267+
DEFB59DF24EAC76300A1744F /* FirebaseCrashlyticsLogger */ = {
268268
isa = PBXGroup;
269269
children = (
270-
DEFB59E024EAC76300A1744F /* OktaLoggerCrashlyticsLogger.swift */,
270+
DEFB59E024EAC76300A1744F /* OktaLoggerFirebaseCrashlyticsLogger.swift */,
271271
);
272-
path = CrashlyticsLogger;
272+
path = FirebaseCrashlyticsLogger;
273273
sourceTree = "<group>";
274274
};
275275
E251E7F5248AD13D00EF466D /* Example */ = {
@@ -554,7 +554,7 @@
554554
files = (
555555
D5B22D06246B602B007ECC2F /* OktaLoggerConsoleLogger.swift in Sources */,
556556
D54461C12469FFBA00C755F1 /* OktaLoggerLogLevel.swift in Sources */,
557-
DEFB59E124EAC76400A1744F /* OktaLoggerCrashlyticsLogger.swift in Sources */,
557+
DEFB59E124EAC76400A1744F /* OktaLoggerFirebaseCrashlyticsLogger.swift in Sources */,
558558
D54461C3246A023000C755F1 /* OktaLogger.swift in Sources */,
559559
D54461CB246B55A600C755F1 /* OktaLoggerDestination.swift in Sources */,
560560
8004832E24C1EFDF008BFF3A /* OktaLoggerFileLoggerConfig.swift in Sources */,

OktaLogger/CrashlyticsLogger/OktaLoggerCrashlyticsLogger.swift renamed to OktaLogger/FirebaseCrashlyticsLogger/OktaLoggerFirebaseCrashlyticsLogger.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import FirebaseCrashlytics
66
Concrete logging class for Firebase Crashlytics.
77
*/
88
@objc
9-
open class OktaLoggerCrashlyticsLogger: OktaLoggerDestinationBase {
9+
open class OktaLoggerFirebaseCrashlyticsLogger: OktaLoggerDestinationBase {
1010

1111
private let crashlytics: Crashlytics
1212

0 commit comments

Comments
 (0)