From eb5f8fdca868d217fbcb4b09bfe6b357fecc2283 Mon Sep 17 00:00:00 2001 From: freak4pc Date: Wed, 7 Aug 2019 22:32:49 +0300 Subject: [PATCH] RxKingfisher 1.0.0: Swift 5 --- .circleci/config.yml | 18 +++--- CHANGELOG.md | 14 ++++- Example/Example.xcodeproj/project.pbxproj | 62 +++++++++++++++++++ .../contents.xcworkspacedata | 10 +++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++ Example/Podfile.lock | 42 +++++++++++++ RxKingfisher.podspec | 4 +- 7 files changed, 145 insertions(+), 13 deletions(-) create mode 100644 Example/Example.xcworkspace/contents.xcworkspacedata create mode 100644 Example/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 Example/Podfile.lock diff --git a/.circleci/config.yml b/.circleci/config.yml index ec62265..3a99970 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 @@ -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": @@ -42,7 +42,7 @@ jobs: environment: LANG: en_US.UTF-8 macos: - xcode: '10.1.0' + xcode: '10.3.0' steps: - checkout - run: @@ -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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 49bcd9b..563ac7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index f4e6227..1099303 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -12,9 +12,11 @@ 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 = ""; }; 78B8883B209E0BCB0023F90B /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -22,6 +24,8 @@ 78B88840209E0BCC0023F90B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 78B88843209E0BCC0023F90B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 78B88845209E0BCC0023F90B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 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 = ""; }; + 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 = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -29,6 +33,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + BBFB8C7BF7564FB86E5570EB /* Pods_Example.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -38,6 +43,8 @@ 305E9882AE591C27EB021201 /* Pods */ = { isa = PBXGroup; children = ( + D4C80BC259AF761125CD8346 /* Pods-Example.debug.xcconfig */, + CB2DAF75842D531199F69CEB /* Pods-Example.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -48,6 +55,7 @@ 78B88838209E0BCB0023F90B /* Example */, 78B88837209E0BCB0023F90B /* Products */, 305E9882AE591C27EB021201 /* Pods */, + 9F7B61552060B4BBDBF74993 /* Frameworks */, ); sourceTree = ""; }; @@ -72,6 +80,14 @@ path = Example; sourceTree = ""; }; + 9F7B61552060B4BBDBF74993 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 0072DB56C74927D616BA0CDF /* Pods_Example.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -79,9 +95,11 @@ 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 = ( ); @@ -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; @@ -288,6 +348,7 @@ }; 78B88849209E0BCC0023F90B /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D4C80BC259AF761125CD8346 /* Pods-Example.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -306,6 +367,7 @@ }; 78B8884A209E0BCC0023F90B /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = CB2DAF75842D531199F69CEB /* Pods-Example.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; diff --git a/Example/Example.xcworkspace/contents.xcworkspacedata b/Example/Example.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..a37cf19 --- /dev/null +++ b/Example/Example.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/Example/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Example/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/Podfile.lock b/Example/Podfile.lock new file mode 100644 index 0000000..10b7335 --- /dev/null +++ b/Example/Podfile.lock @@ -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 diff --git a/RxKingfisher.podspec b/RxKingfisher.podspec index 9265731..b952b76 100644 --- a/RxKingfisher.podspec +++ b/RxKingfisher.podspec @@ -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 @@ -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"