Modifying podspec and folder structure to create macOS specific subspec

OKTA-350983 <<<Jenkins Check-In of Tested SHA: 76a7a96 for [email protected]>>> Artifact: okta-ios-logger
okta · Jan 12, 2021 · 1b3c8c7 · 1b3c8c7
1 parent d8add28
commit 1b3c8c7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/Example/Example-iOS/AppDelegate.swift b/Example/Example-iOS/AppDelegate.swift
@@ -21,12 +21,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  return true
  }
 
- func initializeFirebaseCrashlyticsLogger() -> OktaLoggerCrashlyticsLogger {
+ func initializeFirebaseCrashlyticsLogger() -> OktaLoggerFirebaseCrashlyticsLogger {
  FirebaseApp.configure()
  let crashlytics = Crashlytics.crashlytics()
  crashlytics.setUserID("test123")
 
- return OktaLoggerCrashlyticsLogger(
+ return OktaLoggerFirebaseCrashlyticsLogger(
  crashlytics: crashlytics,
  identifier: "com.okta.OktaLoggerDemoApp.crashlyticsLogger",
  level: .all

diff --git a/OktaLogger.podspec b/OktaLogger.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = "OktaLogger"
- s.version = "1.0.8"
+ s.version = "1.0.9"
  s.summary = "Logging proxy for standardized logging interface across products"
  s.description = "Standard interface for all logging in Okta apps + SDK. Supports file, console, firebase logging destinations."
  s.homepage = "https://github.com/okta/okta-logger-swift"
@@ -19,6 +19,10 @@ Pod::Spec.new do |s|
  complete.dependency 'OktaLogger/FileLogger'
  complete.dependency 'OktaLogger/FirebaseCrashlytics'
  end
+
+ s.subspec "MacOS" do |macos|
+ macos.dependency 'OktaLogger/FileLogger'
+ end
 
  s.subspec 'FileLogger' do |fileLogger|
  fileLogger.source_files = [
@@ -30,7 +34,7 @@ Pod::Spec.new do |s|
 
  s.subspec 'FirebaseCrashlytics' do |crashlytics|
  crashlytics.source_files = [
- 'OktaLogger/CrashlyticsLogger/OktaLoggerCrashlyticsLogger.swift'
+ 'OktaLogger/FirebaseCrashlyticsLogger/OktaLoggerFirebaseCrashlyticsLogger.swift'
  ]
  crashlytics.dependency 'Firebase/Crashlytics', '~>6.29.0'
  crashlytics.dependency 'OktaLogger/Core'
@@ -41,7 +45,7 @@ Pod::Spec.new do |s|
  core.exclude_files = [
  'OktaLogger/Info.plist',
  'OktaLogger/FileLoggers',
- 'OktaLogger/CrashlyticsLogger'
+ 'OktaLogger/FirebaseCrashlyticsLogger'
  ]
  end
 

diff --git a/OktaLogger.xcodeproj/project.pbxproj b/OktaLogger.xcodeproj/project.pbxproj
@@ -33,7 +33,7 @@
  D5C824E52469DBF1005CF747 /* OktaLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = D5C824D72469DBF1005CF747 /* OktaLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
  D5D0978E246DE00800C1362F /* OktaLoggerConsoleLoggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5D0978D246DE00800C1362F /* OktaLoggerConsoleLoggerTests.swift */; };
  DEC5276624DBF9630022B698 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC5276524DBF9630022B698 /* GoogleService-Info.plist */; };
- DEFB59E124EAC76400A1744F /* OktaLoggerCrashlyticsLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEFB59E024EAC76300A1744F /* OktaLoggerCrashlyticsLogger.swift */; };
+ DEFB59E124EAC76400A1744F /* OktaLoggerFirebaseCrashlyticsLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEFB59E024EAC76300A1744F /* OktaLoggerFirebaseCrashlyticsLogger.swift */; };
  E251E7FE248AD1B400EF466D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E251E7FD248AD1B400EF466D /* AppDelegate.swift */; };
  E251E800248AD1B400EF466D /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E251E7FF248AD1B400EF466D /* SceneDelegate.swift */; };
  E251E802248AD1B400EF466D /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E251E801248AD1B400EF466D /* ViewController.swift */; };
@@ -126,7 +126,7 @@
  D5D0978D246DE00800C1362F /* OktaLoggerConsoleLoggerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OktaLoggerConsoleLoggerTests.swift; sourceTree = "<group>"; };
  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>"; };
  DEC5276524DBF9630022B698 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
- DEFB59E024EAC76300A1744F /* OktaLoggerCrashlyticsLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OktaLoggerCrashlyticsLogger.swift; sourceTree = "<group>"; };
+ DEFB59E024EAC76300A1744F /* OktaLoggerFirebaseCrashlyticsLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OktaLoggerFirebaseCrashlyticsLogger.swift; sourceTree = "<group>"; };
  DF75E3D21D2B9A971A2CAEC7 /* libPods-OktaLoggerDemoApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OktaLoggerDemoApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
  E251E7FB248AD1B400EF466D /* OktaLoggerDemoApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OktaLoggerDemoApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
  E251E7FD248AD1B400EF466D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -171,10 +171,10 @@
  8004832F24C1F0F0008BFF3A /* FileLoggers */ = {
  isa = PBXGroup;
  children = (
+ 6582AABCF4A4B6E5E05FC2E4 /* LumberjackLoggerDelegate.swift */,
  806FF25D24B95A3300994D4D /* OktaLoggerFileLogger.swift */,
  8004832D24C1EFDF008BFF3A /* OktaLoggerFileLoggerConfig.swift */,
  6582ABCA2C9C2759535A1B4E /* FileLoggerDelegate.swift */,
- 6582AABCF4A4B6E5E05FC2E4 /* LumberjackLoggerDelegate.swift */,
  );
  path = FileLoggers;
  sourceTree = "<group>";
@@ -218,7 +218,7 @@
  isa = PBXGroup;
  children = (
  8004832F24C1F0F0008BFF3A /* FileLoggers */,
- DEFB59DF24EAC76300A1744F /* CrashlyticsLogger */,
+ DEFB59DF24EAC76300A1744F /* FirebaseCrashlyticsLogger */,
  D5C824D72469DBF1005CF747 /* OktaLogger.h */,
  D5C824D82469DBF1005CF747 /* Info.plist */,
  D54461C2246A023000C755F1 /* OktaLogger.swift */,
@@ -264,12 +264,12 @@
  name = "Recovered References";
  sourceTree = "<group>";
  };
- DEFB59DF24EAC76300A1744F /* CrashlyticsLogger */ = {
+ DEFB59DF24EAC76300A1744F /* FirebaseCrashlyticsLogger */ = {
  isa = PBXGroup;
  children = (
- DEFB59E024EAC76300A1744F /* OktaLoggerCrashlyticsLogger.swift */,
+ DEFB59E024EAC76300A1744F /* OktaLoggerFirebaseCrashlyticsLogger.swift */,
  );
- path = CrashlyticsLogger;
+ path = FirebaseCrashlyticsLogger;
  sourceTree = "<group>";
  };
  E251E7F5248AD13D00EF466D /* Example */ = {
@@ -554,7 +554,7 @@
  files = (
  D5B22D06246B602B007ECC2F /* OktaLoggerConsoleLogger.swift in Sources */,
  D54461C12469FFBA00C755F1 /* OktaLoggerLogLevel.swift in Sources */,
- DEFB59E124EAC76400A1744F /* OktaLoggerCrashlyticsLogger.swift in Sources */,
+ DEFB59E124EAC76400A1744F /* OktaLoggerFirebaseCrashlyticsLogger.swift in Sources */,
  D54461C3246A023000C755F1 /* OktaLogger.swift in Sources */,
  D54461CB246B55A600C755F1 /* OktaLoggerDestination.swift in Sources */,
  8004832E24C1EFDF008BFF3A /* OktaLoggerFileLoggerConfig.swift in Sources */,

diff --git a/...sLogger/OktaLoggerCrashlyticsLogger.swift → ...OktaLoggerFirebaseCrashlyticsLogger.swift b/...sLogger/OktaLoggerCrashlyticsLogger.swift → ...OktaLoggerFirebaseCrashlyticsLogger.swift
@@ -6,7 +6,7 @@ import FirebaseCrashlytics
  Concrete logging class for Firebase Crashlytics.
  */
 @objc
-open class OktaLoggerCrashlyticsLogger: OktaLoggerDestinationBase {
+open class OktaLoggerFirebaseCrashlyticsLogger: OktaLoggerDestinationBase {
 
  private let crashlytics: Crashlytics