Skip to content

Commit

Permalink
RxKingfisher 1.0.0: Swift 5
Browse files Browse the repository at this point in the history
  • Loading branch information
freak4pc committed Aug 7, 2019
1 parent 54b1fd2 commit eb5f8fd
Show file tree
Hide file tree
Showing 7 changed files with 145 additions and 13 deletions.
18 changes: 9 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
XCODE_TEST_REPORTS: /tmp/xcode-test-results
LANG: en_US.UTF-8
macos:
xcode: '10.1.0'
xcode: '10.3.0'
steps:
- checkout
- run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS $XCODE_TEST_REPORTS
Expand All @@ -25,14 +25,14 @@ jobs:
paths:
- Carthage
- run:
name: macOS, Swift 4.2
command: set -o pipefail && xcodebuild build SWIFT_VERSION=4.2 -scheme RxKingfisher-macOS -project RxKingfisher.xcodeproj -sdk macosx -destination "arch=x86_64" | xcpretty
name: macOS, Swift 5.0
command: set -o pipefail && xcodebuild build SWIFT_VERSION=5.0 -scheme RxKingfisher-macOS -project RxKingfisher.xcodeproj -sdk macosx -destination "arch=x86_64" | xcpretty
- run:
name: iOS, Swift 4.2
command: set -o pipefail && xcodebuild build SWIFT_VERSION=4.2 -scheme RxKingfisher-iOS -project RxKingfisher.xcodeproj -sdk iphonesimulator -destination "name=iPhone X" | xcpretty
name: iOS, Swift 5.0
command: set -o pipefail && xcodebuild build SWIFT_VERSION=5.0 -scheme RxKingfisher-iOS -project RxKingfisher.xcodeproj -sdk iphonesimulator -destination "name=iPhone X" | xcpretty
- run:
name: Build tvOS, Swift 4.2
command: set -o pipefail && xcodebuild build SWIFT_VERSION=4.2 -scheme RxKingfisher-tvOS -project RxKingfisher.xcodeproj -sdk appletvsimulator -destination "name=Apple TV 4K (at 1080p)" | xcpretty
name: Build tvOS, Swift 5.0
command: set -o pipefail && xcodebuild build SWIFT_VERSION=5.0 -scheme RxKingfisher-tvOS -project RxKingfisher.xcodeproj -sdk appletvsimulator -destination "name=Apple TV 4K (at 1080p)" | xcpretty
- store_artifacts:
path: $XCODE_TEST_REPORTS
"RxKingfisher Release":
Expand All @@ -42,7 +42,7 @@ jobs:
environment:
LANG: en_US.UTF-8
macos:
xcode: '10.1.0'
xcode: '10.3.0'
steps:
- checkout
- run:
Expand All @@ -53,7 +53,7 @@ jobs:
command: rm ~/.cocoapods/config.yaml # This hack is needed since CircleCI forces --verbose
- run:
name: Push Podspec to Trunk
command: pod trunk push --swift-version=4.2 --skip-tests --allow-warnings
command: pod trunk push --swift-version=5ץ0 --skip-tests --allow-warnings
workflows:
version: 2
build:
Expand Down
14 changes: 12 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Removed

### Changed
- Support for retrieving Source

## [1.0.0] - 2019-08-07

### Changed

- Minimum Swift Version is 5.
- Support RxSwift 5.
- Requires RxSwift 5.

## [0.6.0] - 2019-08-07

### Added

- Support for retrieving Source

## [0.5.0] - 2019-03-01

Expand Down
62 changes: 62 additions & 0 deletions Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,28 @@
78B8883F209E0BCB0023F90B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 78B8883D209E0BCB0023F90B /* Main.storyboard */; };
78B88841209E0BCC0023F90B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 78B88840209E0BCC0023F90B /* Assets.xcassets */; };
78B88844209E0BCC0023F90B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 78B88842209E0BCC0023F90B /* LaunchScreen.storyboard */; };
BBFB8C7BF7564FB86E5570EB /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0072DB56C74927D616BA0CDF /* Pods_Example.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0072DB56C74927D616BA0CDF /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
78B88836209E0BCB0023F90B /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
78B88839209E0BCB0023F90B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
78B8883B209E0BCB0023F90B /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
78B8883E209E0BCB0023F90B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
78B88840209E0BCC0023F90B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
78B88843209E0BCC0023F90B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
78B88845209E0BCC0023F90B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
CB2DAF75842D531199F69CEB /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
D4C80BC259AF761125CD8346 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
78B88833209E0BCB0023F90B /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
BBFB8C7BF7564FB86E5570EB /* Pods_Example.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -38,6 +43,8 @@
305E9882AE591C27EB021201 /* Pods */ = {
isa = PBXGroup;
children = (
D4C80BC259AF761125CD8346 /* Pods-Example.debug.xcconfig */,
CB2DAF75842D531199F69CEB /* Pods-Example.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
Expand All @@ -48,6 +55,7 @@
78B88838209E0BCB0023F90B /* Example */,
78B88837209E0BCB0023F90B /* Products */,
305E9882AE591C27EB021201 /* Pods */,
9F7B61552060B4BBDBF74993 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -72,16 +80,26 @@
path = Example;
sourceTree = "<group>";
};
9F7B61552060B4BBDBF74993 /* Frameworks */ = {
isa = PBXGroup;
children = (
0072DB56C74927D616BA0CDF /* Pods_Example.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
78B88835209E0BCB0023F90B /* Example */ = {
isa = PBXNativeTarget;
buildConfigurationList = 78B88848209E0BCC0023F90B /* Build configuration list for PBXNativeTarget "Example" */;
buildPhases = (
86A019FCA585C05E8A14D464 /* [CP] Check Pods Manifest.lock */,
78B88832209E0BCB0023F90B /* Sources */,
78B88833209E0BCB0023F90B /* Frameworks */,
78B88834209E0BCB0023F90B /* Resources */,
BDD14110D4B9F32EBF639049 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -138,6 +156,48 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
86A019FCA585C05E8A14D464 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Example-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
showEnvVarsInLog = 0;
};
BDD14110D4B9F32EBF639049 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
78B88832209E0BCB0023F90B /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -288,6 +348,7 @@
};
78B88849209E0BCC0023F90B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D4C80BC259AF761125CD8346 /* Pods-Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
Expand All @@ -306,6 +367,7 @@
};
78B8884A209E0BCC0023F90B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = CB2DAF75842D531199F69CEB /* Pods-Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
Expand Down
10 changes: 10 additions & 0 deletions Example/Example.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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>
42 changes: 42 additions & 0 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
PODS:
- Fakery (4.1.1)
- Kingfisher (5.7.0)
- RxCocoa (5.0.0):
- RxRelay (~> 5)
- RxSwift (~> 5)
- RxKingfisher (1.0.0):
- Kingfisher (~> 5)
- RxCocoa (~> 5)
- RxSwift (~> 5)
- RxRelay (5.0.0):
- RxSwift (~> 5)
- RxSwift (5.0.0)

DEPENDENCIES:
- Fakery
- RxCocoa
- RxKingfisher (from `../`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Fakery
- Kingfisher
- RxCocoa
- RxRelay
- RxSwift

EXTERNAL SOURCES:
RxKingfisher:
:path: "../"

SPEC CHECKSUMS:
Fakery: d3380c4aa1efe7631c0831d7e26aa9db4491f014
Kingfisher: c7d211b54f1f30d8060aadab177d52b4349c825b
RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
RxKingfisher: 0f07678aca3e6a20143dfba67ec2d2c70d443a9a
RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
RxSwift: 8b0671caa829a763bbce7271095859121cbd895f

PODFILE CHECKSUM: c2c6711fe7cf93b2a28df5eb886c2eb1ee88e971

COCOAPODS: 1.7.5
4 changes: 2 additions & 2 deletions RxKingfisher.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxKingfisher"
s.version = "0.6.0"
s.version = "1.0.0"
s.summary = "Reactive extension for the Kingfisher image downloading and caching library"
s.description = <<-DESC
Reactive extension for the Kingfisher image downloading and caching library
Expand All @@ -13,7 +13,7 @@ Pod::Spec.new do |s|
s.source_files = "Sources/**/*"
s.frameworks = "Foundation"

s.swift_version = "5"
s.swift_version = "5.0"

s.ios.deployment_target = "10.0"
s.tvos.deployment_target = "10.0"
Expand Down

0 comments on commit eb5f8fd

Please sign in to comment.