Skip to content

Commit

Permalink
Revert "Merge pull request #288 from escfrya/support-watchos"
Browse files Browse the repository at this point in the history
This reverts commit 472e8f5, reversing
changes made to ec9f3af.
  • Loading branch information
3lvis committed Mar 26, 2024
1 parent 70b8d60 commit 81fc4e5
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 238 deletions.
2 changes: 0 additions & 2 deletions Cache.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '11.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '11.0'
s.watchos.deployment_target = '5.0'

s.requires_arc = true
s.ios.source_files = 'Source/{iOS,Shared}/**/*'
s.osx.source_files = 'Source/{Mac,Shared}/**/*'
s.tvos.source_files = 'Source/{iOS,Shared}/**/*'
s.watchos.source_files = 'Source/{iOS,Shared}/**/*'
s.resources = 'Source/PrivacyInfo.xcprivacy'

s.frameworks = 'Foundation'
Expand Down
208 changes: 0 additions & 208 deletions Cache.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Source/Shared/Configuration/DiskConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public struct DiskConfig {
public let maxSize: UInt
/// A folder to store the disk cache contents. Defaults to a prefixed directory in Caches if nil
public let directory: URL?
#if os(iOS) || os(tvOS) || os(watchOS)
#if os(iOS) || os(tvOS)
/// Data protection is used to store files in an encrypted format on disk and to decrypt them on demand.
/// Support only on iOS and tvOS.
public let protectionType: FileProtectionType?
Expand Down
2 changes: 1 addition & 1 deletion Source/Shared/Library/ImageWrapper.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation

#if os(iOS) || os(tvOS) || os(macOS) || os(watchOS)
#if os(iOS) || os(tvOS) || os(macOS)
public struct ImageWrapper: Codable {
public let image: Image

Expand Down
2 changes: 1 addition & 1 deletion Source/Shared/Library/TransformerFactory.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class TransformerFactory {
return Transformer<Data>(toData: toData, fromData: fromData)
}

#if os(iOS) || os(tvOS) || os(macOS) || os(watchOS) || os(visionOS)
#if os(iOS) || os(tvOS) || os(macOS) || os(visionOS)
public static func forImage() -> Transformer<Image> {
let toData: (Image) throws -> Data = { image in
return try image.cache_toData().unwrapOrThrow(error: StorageError.transformerFail)
Expand Down
2 changes: 1 addition & 1 deletion Source/Shared/Library/Types.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
#if os(iOS) || os(tvOS) || os(visionOS)
import UIKit
public typealias Image = UIImage
#elseif os(watchOS)
Expand Down
2 changes: 1 addition & 1 deletion Source/Shared/Storage/DiskStorage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ final public class DiskStorage<Key: Hashable, Value> {
try createDirectory()

// protection
#if os(iOS) || os(tvOS) || os(watchOS)
#if os(iOS) || os(tvOS)
if let protectionType = config.protectionType {
try setDirectoryAttributes([
FileAttributeKey.protectionKey: protectionType
Expand Down
2 changes: 1 addition & 1 deletion Source/Shared/Storage/Storage+Transform.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public extension Storage {
}


#if os(iOS) || os(tvOS) || os(macOS) || os(watchOS)
#if os(iOS) || os(tvOS) || os(macOS)
func transformImage() -> Storage<Key, Image> {
let storage = transform(transformer: TransformerFactory.forImage())
return storage
Expand Down
22 changes: 0 additions & 22 deletions SupportFiles/watchOS/Info.plist

This file was deleted.

0 comments on commit 81fc4e5

Please sign in to comment.