Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
hanawat committed Oct 8, 2023
2 parents 463d923 + 2db04eb commit 9a94b64
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 47 deletions.
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"repositoryURL": "https://github.com/freshOS/Stevia",
"state": {
"branch": null,
"revision": "87dd17a86240f16788239a78dd8be11c4b013150",
"version": "4.8.0"
"revision": "cfb1a1d2159277bb553c3dc46f3f742c0275566d",
"version": "5.1.2"
}
}
]
Expand Down
42 changes: 0 additions & 42 deletions Source/Configuration/YPImagePickerConfiguration.swift
Original file line number Diff line number Diff line change
Expand Up @@ -138,48 +138,6 @@ public struct YPImagePickerConfiguration {
YPFilter(name: "Sepia", coreImageFilterName: "CISepiaTone"),
YPFilter(name: "XRay", coreImageFilterName: "CIXRay")
]

/// Migration

@available(iOS, obsoleted: 3.0.0, renamed: "video.compression")
public var videoCompression: String = AVAssetExportPresetHighestQuality

@available(iOS, obsoleted: 3.0.0, renamed: "video.fileType")
public var videoExtension: AVFileType = .mov

@available(iOS, obsoleted: 3.0.0, renamed: "video.recordingTimeLimit")
public var videoRecordingTimeLimit: TimeInterval = 60.0

@available(iOS, obsoleted: 3.0.0, renamed: "video.libraryTimeLimit")
public var videoFromLibraryTimeLimit: TimeInterval = 60.0

@available(iOS, obsoleted: 3.0.0, renamed: "video.minimumTimeLimit")
public var videoMinimumTimeLimit: TimeInterval = 3.0

@available(iOS, obsoleted: 3.0.0, renamed: "video.trimmerMaxDuration")
public var trimmerMaxDuration: Double = 60.0

@available(iOS, obsoleted: 3.0.0, renamed: "video.trimmerMinDuration")
public var trimmerMinDuration: Double = 3.0

@available(iOS, obsoleted: 3.0.0, renamed: "library.onlySquare")
public var onlySquareImagesFromLibrary = false

@available(iOS, obsoleted: 3.0.0, renamed: "library.onlySquare")
public var onlySquareFromLibrary = false

@available(iOS, obsoleted: 3.0.0, renamed: "targetImageSize")
public var libraryTargetImageSize = YPImageSize.original

@available(iOS, obsoleted: 3.0.0, renamed: "library.mediaType")
public var showsVideoInLibrary = false

@available(iOS, obsoleted: 3.0.0, renamed: "library.mediaType")
public var libraryMediaType = YPlibraryMediaType.photo

@available(iOS, obsoleted: 3.0.0, renamed: "library.maxNumberOfItems")
public var maxNumberOfItems = 1

}

/// Encapsulates library specific settings.
Expand Down
2 changes: 1 addition & 1 deletion YPImagePicker.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'YPImagePicker'
s.version = "5.2.1"
s.version = "5.2.2"
s.summary = "Instagram-like image picker & filters for iOS"
s.homepage = "https://github.com/Yummypets/YPImagePicker"
s.license = { :type => "MIT", :file => "LICENSE" }
Expand Down
4 changes: 2 additions & 2 deletions YPImagePicker.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.1;
MARKETING_VERSION = 5.2.2;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.yummypets.YPImagePicker;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -1278,7 +1278,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 5.2.1;
MARKETING_VERSION = 5.2.2;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.yummypets.YPImagePicker;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down

0 comments on commit 9a94b64

Please sign in to comment.