Skip to content

Commit c698aa0

Browse files
artemshvydkyi-oktaartemshvydkyi-okta
authored
OktaLogger: Update Firebase dependency v.11 (#104)
Update Firebase to version 11 in OktaLogger
1 parent 4d05c50 commit c698aa0

File tree

6 files changed

+205
-99
lines changed

6 files changed

+205
-99
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ parameters:
1111
executors:
1212
apple-ci-arm-medium:
1313
macos:
14-
xcode: 14.3.1
14+
xcode: 15.2.0
1515
resource_class: macos.m1.medium.gen1
1616

1717
commands:
@@ -35,10 +35,10 @@ commands:
3535
steps:
3636
- run:
3737
name: OktaSQLiteStorage unit tests"
38-
command: set -o pipefail && xcodebuild -workspace "OktaLogger.xcworkspace" -scheme "OktaSQLiteStorageTests" -destination "platform=iOS Simulator,OS=latest,name=iPhone 14 Pro Max" test
38+
command: set -o pipefail && xcodebuild -workspace "OktaLogger.xcworkspace" -scheme "OktaSQLiteStorageTests" -destination "platform=iOS Simulator,OS=latest,name=iPhone 15 Pro Max" test
3939
- run:
4040
name: OktaLogger unit tests"
41-
command: set -o pipefail && xcodebuild -workspace "OktaLogger.xcworkspace" -scheme "OktaLoggerTests" -destination "platform=iOS Simulator,OS=latest,name=iPhone 14 Pro Max" test
41+
command: set -o pipefail && xcodebuild -workspace "OktaLogger.xcworkspace" -scheme "OktaLoggerTests" -destination "platform=iOS Simulator,OS=latest,name=iPhone 15 Pro Max" test
4242
# - run:
4343
# name: OktaAnalytics unit tests"
4444
# command: set -o pipefail && xcodebuild -workspace "OktaLogger.xcworkspace" -scheme "OktaAnalyticsTests" -destination "platform=iOS Simulator,OS=latest,name=iPhone 14" test

‎OktaLogger.podspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Pod::Spec.new do |s|
22
s.name = "OktaLogger"
3-
s.version = "1.3.19"
3+
s.version = "1.3.20"
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"
77
s.license = { :type => 'APACHE2', :file => 'LICENSE' }
88
s.author = { "Okta Developers" => "developer@okta.com" }
99
s.source = { :git => "https://github.com/okta/okta-logger-swift.git", :tag => "OktaLogger-"+s.version.to_s }
10-
s.ios.deployment_target = '11.0'
11-
s.osx.deployment_target = '10.14'
12-
s.watchos.deployment_target = '6.0'
10+
s.ios.deployment_target = '12.0'
11+
s.osx.deployment_target = '10.15'
12+
s.watchos.deployment_target = '7.0'
1313
s.swift_version = '5.0'
1414
s.default_subspec = "Complete"
1515

@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
3232
crashlytics.source_files = [
3333
'Sources/OktaLogger/FirebaseCrashlyticsLogger/OktaLoggerFirebaseCrashlyticsLogger.swift'
3434
]
35-
crashlytics.dependency 'Firebase/Crashlytics', '~> 9'
35+
crashlytics.dependency 'Firebase/Crashlytics', '~> 11'
3636
crashlytics.dependency 'OktaLogger/Core'
3737
end
3838

‎OktaLogger.xcodeproj/project.pbxproj‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,7 @@
588588
D5C824D22469DBF1005CF747 /* Resources */,
589589
80DDE78E24B962C900D0E2F3 /* Embed Frameworks */,
590590
7B0C4EE7276D1DAC0033BDC6 /* SwiftLint */,
591+
74D61838C0B5CF075047C1B4 /* [CP] Copy Pods Resources */,
591592
);
592593
buildRules = (
593594
);
@@ -607,6 +608,7 @@
607608
D5C824DA2469DBF1005CF747 /* Frameworks */,
608609
D5C824DB2469DBF1005CF747 /* Resources */,
609610
8A04A3992610D1FAF3446F06 /* [CP] Embed Pods Frameworks */,
611+
3DC8220AD478472683310979 /* [CP] Copy Pods Resources */,
610612
);
611613
buildRules = (
612614
);
@@ -628,6 +630,7 @@
628630
E251E7F9248AD1B400EF466D /* Resources */,
629631
DEC5276724DBFE6C0022B698 /* ShellScript */,
630632
B6A235592A5E2CBBF90E51EE /* [CP] Embed Pods Frameworks */,
633+
0B381B23C8AFF19DC939F232 /* [CP] Copy Pods Resources */,
631634
);
632635
buildRules = (
633636
);
@@ -648,6 +651,7 @@
648651
F3575F282A0AD1840008A965 /* Sources */,
649652
F3575F292A0AD1840008A965 /* Frameworks */,
650653
F3575F2A2A0AD1840008A965 /* Resources */,
654+
B0C0072AF7A19504676FD526 /* [CP] Copy Pods Resources */,
651655
);
652656
buildRules = (
653657
);
@@ -666,6 +670,7 @@
666670
F3D5EA122A283E5E00530838 /* Sources */,
667671
F3D5EA132A283E5E00530838 /* Frameworks */,
668672
F3D5EA142A283E5E00530838 /* Resources */,
673+
E838532ECED9A96DCCFBAEFD /* [CP] Copy Pods Resources */,
669674
);
670675
buildRules = (
671676
);
@@ -794,6 +799,23 @@
794799
/* End PBXResourcesBuildPhase section */
795800

796801
/* Begin PBXShellScriptBuildPhase section */
802+
0B381B23C8AFF19DC939F232 /* [CP] Copy Pods Resources */ = {
803+
isa = PBXShellScriptBuildPhase;
804+
buildActionMask = 2147483647;
805+
files = (
806+
);
807+
inputFileListPaths = (
808+
"${PODS_ROOT}/Target Support Files/Pods-OktaLoggerDemoApp/Pods-OktaLoggerDemoApp-resources-${CONFIGURATION}-input-files.xcfilelist",
809+
);
810+
name = "[CP] Copy Pods Resources";
811+
outputFileListPaths = (
812+
"${PODS_ROOT}/Target Support Files/Pods-OktaLoggerDemoApp/Pods-OktaLoggerDemoApp-resources-${CONFIGURATION}-output-files.xcfilelist",
813+
);
814+
runOnlyForDeploymentPostprocessing = 0;
815+
shellPath = /bin/sh;
816+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OktaLoggerDemoApp/Pods-OktaLoggerDemoApp-resources.sh\"\n";
817+
showEnvVarsInLog = 0;
818+
};
797819
0F2298F77B72900393068192 /* [CP] Check Pods Manifest.lock */ = {
798820
isa = PBXShellScriptBuildPhase;
799821
buildActionMask = 2147483647;
@@ -860,6 +882,23 @@
860882
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
861883
showEnvVarsInLog = 0;
862884
};
885+
3DC8220AD478472683310979 /* [CP] Copy Pods Resources */ = {
886+
isa = PBXShellScriptBuildPhase;
887+
buildActionMask = 2147483647;
888+
files = (
889+
);
890+
inputFileListPaths = (
891+
"${PODS_ROOT}/Target Support Files/Pods-OktaLoggerTests/Pods-OktaLoggerTests-resources-${CONFIGURATION}-input-files.xcfilelist",
892+
);
893+
name = "[CP] Copy Pods Resources";
894+
outputFileListPaths = (
895+
"${PODS_ROOT}/Target Support Files/Pods-OktaLoggerTests/Pods-OktaLoggerTests-resources-${CONFIGURATION}-output-files.xcfilelist",
896+
);
897+
runOnlyForDeploymentPostprocessing = 0;
898+
shellPath = /bin/sh;
899+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OktaLoggerTests/Pods-OktaLoggerTests-resources.sh\"\n";
900+
showEnvVarsInLog = 0;
901+
};
863902
58278EF008B42FA45AF4BBBA /* [CP] Check Pods Manifest.lock */ = {
864903
isa = PBXShellScriptBuildPhase;
865904
buildActionMask = 2147483647;
@@ -882,6 +921,23 @@
882921
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
883922
showEnvVarsInLog = 0;
884923
};
924+
74D61838C0B5CF075047C1B4 /* [CP] Copy Pods Resources */ = {
925+
isa = PBXShellScriptBuildPhase;
926+
buildActionMask = 2147483647;
927+
files = (
928+
);
929+
inputFileListPaths = (
930+
"${PODS_ROOT}/Target Support Files/Pods-OktaLogger/Pods-OktaLogger-resources-${CONFIGURATION}-input-files.xcfilelist",
931+
);
932+
name = "[CP] Copy Pods Resources";
933+
outputFileListPaths = (
934+
"${PODS_ROOT}/Target Support Files/Pods-OktaLogger/Pods-OktaLogger-resources-${CONFIGURATION}-output-files.xcfilelist",
935+
);
936+
runOnlyForDeploymentPostprocessing = 0;
937+
shellPath = /bin/sh;
938+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OktaLogger/Pods-OktaLogger-resources.sh\"\n";
939+
showEnvVarsInLog = 0;
940+
};
885941
7906DFF612F22A1930DEE58D /* [CP] Check Pods Manifest.lock */ = {
886942
isa = PBXShellScriptBuildPhase;
887943
buildActionMask = 2147483647;
@@ -939,6 +995,23 @@
939995
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OktaLoggerTests/Pods-OktaLoggerTests-frameworks.sh\"\n";
940996
showEnvVarsInLog = 0;
941997
};
998+
B0C0072AF7A19504676FD526 /* [CP] Copy Pods Resources */ = {
999+
isa = PBXShellScriptBuildPhase;
1000+
buildActionMask = 2147483647;
1001+
files = (
1002+
);
1003+
inputFileListPaths = (
1004+
"${PODS_ROOT}/Target Support Files/Pods-OktaAnalytics/Pods-OktaAnalytics-resources-${CONFIGURATION}-input-files.xcfilelist",
1005+
);
1006+
name = "[CP] Copy Pods Resources";
1007+
outputFileListPaths = (
1008+
"${PODS_ROOT}/Target Support Files/Pods-OktaAnalytics/Pods-OktaAnalytics-resources-${CONFIGURATION}-output-files.xcfilelist",
1009+
);
1010+
runOnlyForDeploymentPostprocessing = 0;
1011+
shellPath = /bin/sh;
1012+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OktaAnalytics/Pods-OktaAnalytics-resources.sh\"\n";
1013+
showEnvVarsInLog = 0;
1014+
};
9421015
B6A235592A5E2CBBF90E51EE /* [CP] Embed Pods Frameworks */ = {
9431016
isa = PBXShellScriptBuildPhase;
9441017
buildActionMask = 2147483647;
@@ -996,6 +1069,23 @@
9961069
shellPath = /bin/sh;
9971070
shellScript = "\"${PODS_ROOT}/FirebaseCrashlytics/run\"\n";
9981071
};
1072+
E838532ECED9A96DCCFBAEFD /* [CP] Copy Pods Resources */ = {
1073+
isa = PBXShellScriptBuildPhase;
1074+
buildActionMask = 2147483647;
1075+
files = (
1076+
);
1077+
inputFileListPaths = (
1078+
"${PODS_ROOT}/Target Support Files/Pods-OktaAnalyticsTests/Pods-OktaAnalyticsTests-resources-${CONFIGURATION}-input-files.xcfilelist",
1079+
);
1080+
name = "[CP] Copy Pods Resources";
1081+
outputFileListPaths = (
1082+
"${PODS_ROOT}/Target Support Files/Pods-OktaAnalyticsTests/Pods-OktaAnalyticsTests-resources-${CONFIGURATION}-output-files.xcfilelist",
1083+
);
1084+
runOnlyForDeploymentPostprocessing = 0;
1085+
shellPath = /bin/sh;
1086+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OktaAnalyticsTests/Pods-OktaAnalyticsTests-resources.sh\"\n";
1087+
showEnvVarsInLog = 0;
1088+
};
9991089
F26A1DAF665C501039D40073 /* [CP] Check Pods Manifest.lock */ = {
10001090
isa = PBXShellScriptBuildPhase;
10011091
buildActionMask = 2147483647;

‎Podfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ platform :ios, '13.0'
22
use_modular_headers!
33

44
target 'OktaLogger' do
5-
pod 'Firebase/Crashlytics', '~>9.4.0'
5+
pod 'Firebase/AnalyticsWithoutAdIdSupport'
6+
pod 'Firebase/Crashlytics', '~>11.3.0'
67
pod 'CocoaLumberjack/Swift', '~>3.6.0'
78
pod 'Instabug', '13.3.0'
89
pod 'SwiftLint', '0.51'
@@ -25,7 +26,7 @@ end
2526
target 'OktaLoggerDemoApp' do
2627
pod 'OktaLogger', :path => '.'
2728
pod 'OktaAnalytics', :path => '.'
28-
pod 'Firebase/Crashlytics', '~>9.4.0'
29+
pod 'Firebase/Crashlytics', '~>11.3.0'
2930

3031
target 'OktaLoggerTests' do
3132
inherit! :search_paths

0 commit comments

Comments
 (0)