⬆️ :: Run pod install to resolve merge conflicts correctly

2026-06-16 12:24:31 +00:00 · 2022-03-16 17:45:31 +01:00
parent 555b5309a9
commit 91fdbbfeb6
13 changed files with 392 additions and 541 deletions
@@ -1,15 +1,15 @@
 PODS:
  - GradientLoadingBar (2.2.4):
    - LightweightObservable (~> 2.1)
-  - LightweightObservable (2.1.2)
+  - LightweightObservable (2.2.0)
  - SnapshotTesting (1.9.0)
  - SwiftConfigurationFiles (0.0.1)
-  - SwiftFormat/CLI (0.49.1)
-  - SwiftLint (0.45.1)
+  - SwiftFormat/CLI (0.49.5)
+  - SwiftLint (0.46.5)

 DEPENDENCIES:
  - GradientLoadingBar (from `../`)
-  - SnapshotTesting (~> 1.7)
+  - SnapshotTesting (~> 1.9)
  - SwiftConfigurationFiles (from `https://github.com/fxm90/SwiftConfigurationFiles.git`)
  - SwiftFormat/CLI (~> 0.41)
  - SwiftLint (~> 0.42)
@@ -33,13 +33,13 @@ CHECKOUT OPTIONS:
    :git: https://github.com/fxm90/SwiftConfigurationFiles.git

 SPEC CHECKSUMS:
-  GradientLoadingBar: 8972571e271c2da98f84a97de08f143c66df1894
-  LightweightObservable: c5ac85423a5edbed9a920b4d5c7b8f94ab3688c4
+  GradientLoadingBar: c649ea46db8bb18c4164ac3faae1ef960b983fa0
+  LightweightObservable: a4fce3323002aa57234f3cf5524eecb144cc781f
  SnapshotTesting: 6141c48b6aa76ead61431ca665c14ab9a066c53b
  SwiftConfigurationFiles: 1cf2228a911ebed9f42f8dec077bb634f04ca6c8
-  SwiftFormat: 16b41f3229f5e7edb130ac4cd631cceed7af7d5e
-  SwiftLint: 06ac37e4d38c7068e0935bb30cda95f093bec761
+  SwiftFormat: 803e5a44e083cf414b3072381db0e9e65f4c0d0d
+  SwiftLint: 2c16e8fa99dac2e440dc0c70ea74d2532048f6cf

-PODFILE CHECKSUM: 36b90780cb508f9eaca4f0ac59660e3e748de601
+PODFILE CHECKSUM: 236416c4c4856713b28b6bf3da014054e9b319f2

 COCOAPODS: 1.11.3
@@ -1,15 +1,15 @@
 PODS:
  - GradientLoadingBar (2.2.4):
    - LightweightObservable (~> 2.1)
-  - LightweightObservable (2.1.2)
+  - LightweightObservable (2.2.0)
  - SnapshotTesting (1.9.0)
  - SwiftConfigurationFiles (0.0.1)
-  - SwiftFormat/CLI (0.49.1)
-  - SwiftLint (0.45.1)
+  - SwiftFormat/CLI (0.49.5)
+  - SwiftLint (0.46.5)

 DEPENDENCIES:
  - GradientLoadingBar (from `../`)
-  - SnapshotTesting (~> 1.7)
+  - SnapshotTesting (~> 1.9)
  - SwiftConfigurationFiles (from `https://github.com/fxm90/SwiftConfigurationFiles.git`)
  - SwiftFormat/CLI (~> 0.41)
  - SwiftLint (~> 0.42)
@@ -33,13 +33,13 @@ CHECKOUT OPTIONS:
    :git: https://github.com/fxm90/SwiftConfigurationFiles.git

 SPEC CHECKSUMS:
-  GradientLoadingBar: 8972571e271c2da98f84a97de08f143c66df1894
-  LightweightObservable: c5ac85423a5edbed9a920b4d5c7b8f94ab3688c4
+  GradientLoadingBar: c649ea46db8bb18c4164ac3faae1ef960b983fa0
+  LightweightObservable: a4fce3323002aa57234f3cf5524eecb144cc781f
  SnapshotTesting: 6141c48b6aa76ead61431ca665c14ab9a066c53b
  SwiftConfigurationFiles: 1cf2228a911ebed9f42f8dec077bb634f04ca6c8
-  SwiftFormat: 16b41f3229f5e7edb130ac4cd631cceed7af7d5e
-  SwiftLint: 06ac37e4d38c7068e0935bb30cda95f093bec761
+  SwiftFormat: 803e5a44e083cf414b3072381db0e9e65f4c0d0d
+  SwiftLint: 2c16e8fa99dac2e440dc0c70ea74d2532048f6cf

-PODFILE CHECKSUM: 36b90780cb508f9eaca4f0ac59660e3e748de601
+PODFILE CHECKSUM: 236416c4c4856713b28b6bf3da014054e9b319f2

 COCOAPODS: 1.11.3
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1020"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A29550F398D14038E3DD88D91573885C"
-               BuildableName = "GradientLoadingBar.framework"
-               BlueprintName = "GradientLoadingBar"
-               ReferencedContainer = "container:Pods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A29550F398D14038E3DD88D91573885C"
-            BuildableName = "GradientLoadingBar.framework"
-            BlueprintName = "GradientLoadingBar"
-            ReferencedContainer = "container:Pods.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
@@ -1,11 +0,0 @@
-CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/GradientLoadingBar
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/LightweightObservable"
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
-PODS_BUILD_DIR = ${BUILD_DIR}
-PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
-PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
-PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
-SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>${EXECUTABLE_NAME}</string>
-  <key>CFBundleIdentifier</key>
-  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>${PRODUCT_NAME}</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.1.15</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>${CURRENT_PROJECT_VERSION}</string>
-  <key>NSPrincipalClass</key>
-  <string></string>
-</dict>
-</plist>
@@ -1,10 +0,0 @@
-CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/LightweightObservable
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
-PODS_BUILD_DIR = ${BUILD_DIR}
-PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
-PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/LightweightObservable
-PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
-SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES
@@ -1,9 +0,0 @@
-CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/SwiftFormat
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-PODS_BUILD_DIR = ${BUILD_DIR}
-PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
-PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/SwiftFormat
-PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
-SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES
@@ -1,9 +0,0 @@
-CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/SwiftLint
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-PODS_BUILD_DIR = ${BUILD_DIR}
-PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
-PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/SwiftLint
-PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
-SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES
@@ -66,7 +66,7 @@ open class NotchGradientLoadingBarController: GradientLoadingBarController {
        // As we currently only support portrait mode (and no device rotation), we can safely use `bounds.size.width` here.
        let screenWidth = superview.bounds.size.width

-        let notchBezierPath = self.notchBezierPath(for: screenWidth, notchConfig: viewModel.safeAreaDevice.notchConfig)
+        let notchBezierPath = notchBezierPath(for: screenWidth, notchConfig: viewModel.safeAreaDevice.notchConfig)

        // Setting the `lineWidth` draws a line, where the actual path is exactly in the middle of the drawn line.
        // To get the correct height (including the path) we have to add the `height` here to the given bounds (half height for top, half for bottom).