diff --git a/Configurations/make-release-package.sh b/Configurations/make-release-package.sh index 76728c78..0013c770 100755 --- a/Configurations/make-release-package.sh +++ b/Configurations/make-release-package.sh @@ -122,10 +122,9 @@ if [ "$ACTION" = "" ] ; then exit 1 fi - # Generate new Package manifest, podspec, and carthage files + # Generate new Package manifest and carthage files cd "$CONFIGURATION_BUILD_DIR" cp "$PROJECT_DIR/Package.swift" "$CONFIGURATION_BUILD_DIR" - cp "$PROJECT_DIR/Sparkle.podspec" "$CONFIGURATION_BUILD_DIR" cp "$PROJECT_DIR/Carthage-dev.json" "$CONFIGURATION_BUILD_DIR" fi @@ -141,14 +140,11 @@ if [ "$ACTION" = "" ] ; then echo "Version: $MARKETING_VERSION" echo "Tag: $latest_git_tag" echo "Checksum: $spm_checksum" - - sed -E -i '' -e "/s\.version.+=/ s/\".+\"/\"$MARKETING_VERSION\"/" "Sparkle.podspec" "$PROJECT_DIR/Configurations/update-carthage.py" "Carthage-dev.json" "$MARKETING_VERSION" - cp "Sparkle.podspec" "$PROJECT_DIR" # Note the Carthage-dev.json file will finally be copied to the website repo in Carthage/Sparkle.json in the end cp "Carthage-dev.json" "$PROJECT_DIR" - echo "Sparkle.podspec and Carthage-dev.json updated with following values:" + echo "Carthage-dev.json is updated with following values:" echo "Version: $MARKETING_VERSION" else echo "warning: Xcode version $XCODE_VERSION_ACTUAL does not support computing checksums for Swift Packages. Please update the Package manifest manually." diff --git a/Configurations/release-move-tag.sh b/Configurations/release-move-tag.sh index 024dacae..2a4de570 100755 --- a/Configurations/release-move-tag.sh +++ b/Configurations/release-move-tag.sh @@ -13,10 +13,10 @@ function move_tag() { long_message=$(git tag -n99 -l $latest_git_tag) # gets corresponding message long_message=${long_message/$latest_git_tag} # trims tag name long_message="$(echo -e "${long_message}" | sed -e 's/^[[:space:]]*//')" # trim leading whitespace - git add Package.swift Sparkle.podspec Carthage-dev.json + git add Package.swift Carthage-dev.json git commit -m "Update Package management files for version ${latest_git_tag}" git tag -fa $latest_git_tag -m "${long_message}" - echo "Package.swift and Sparkle.podspec committed and tag '$latest_git_tag' moved." + echo "Package.swift is committed and tag '$latest_git_tag' moved." } if [ "$commits_since_tag" -gt 0 ]; then @@ -27,11 +27,11 @@ elif [ "$CI" == true ]; then move_tag else # TODO: add sanity check to see if version is actually being updated or not? - read -p "Do you want to commit changes to Package.swift, Sparkle.podspec, Carthage-dev.json and force move tag '$latest_git_tag'? (required for official release) [Y/n]" -n 1 -r + read -p "Do you want to commit changes to Package.swift, Carthage-dev.json, and force move tag '$latest_git_tag'? (required for official release) [Y/n]" -n 1 -r echo # (optional) move to a new line if [[ $REPLY =~ ^[Yy]$ ]]; then move_tag else - echo "Package.swift, Sparkle.podspec, and Carthage-dev.json have not been committed and tag has not been moved." + echo "Package.swift and Carthage-dev.json have not been committed and tag has not been moved." fi fi diff --git a/Makefile b/Makefile index fa99a23e..5444d7c8 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,6 @@ release: xcodebuild -scheme Distribution -configuration Release -derivedDataPath "$(BUILDDIR)" build ./Configurations/release-move-tag.sh open "$(BUILDDIR)/Build/Products/Release/" - cat Sparkle.podspec - @echo "Don't forget to update CocoaPods! pod trunk push" @echo "Don't forget to upload Sparkle-for-Swift-Package-Manager.zip!" build: diff --git a/README.markdown b/README.markdown index 75308cbb..5b641267 100644 --- a/README.markdown +++ b/README.markdown @@ -1,4 +1,4 @@ -# Sparkle 2 [![Build Status](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml/badge.svg?branch=2.x)](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml) ![SwiftPM](https://img.shields.io/badge/SwiftPM-compatible-4BC51D.svg?style=flat) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![CocoaPods](https://img.shields.io/cocoapods/v/Sparkle.svg?cacheSeconds=86400)](https://cocoapods.org/pods/Sparkle) +# Sparkle 2 [![Build Status](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml/badge.svg?branch=2.x)](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml) ![SwiftPM](https://img.shields.io/badge/SwiftPM-compatible-4BC51D.svg?style=flat) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) Secure and reliable software update framework for macOS. diff --git a/Sparkle.podspec b/Sparkle.podspec deleted file mode 100644 index d34c1f5b..00000000 --- a/Sparkle.podspec +++ /dev/null @@ -1,33 +0,0 @@ -Pod::Spec.new do |s| - s.name = "Sparkle" - s.version = "2.9.6" - s.summary = "A software update framework for macOS" - s.description = "Sparkle is an easy-to-use software update framework for macOS." - s.homepage = "https://sparkle-project.org" - s.documentation_url = "https://sparkle-project.org/documentation/" - s.screenshot = "https://sparkle-project.org/images/screenshot-noshadow2.png" - s.license = { - :type => 'MIT', - :file => 'LICENSE' - } - s.authors = { - 'Zorg' => 'zorgiepoo@gmail.com', - 'Kornel LesiƄski' => 'pornel@pornel.net', - 'Jake Petroules' => 'jake.petroules@petroules.com', - 'C.W. Betts' => 'computers57@hotmail.com', - 'Andy Matuschak' => 'andy@andymatuschak.org', - } - - s.platform = :osx, '12.0' - s.source = { :http => "https://github.com/sparkle-project/Sparkle/releases/download/#{s.version}/Sparkle-#{s.version}.tar.xz" } - s.source_files = 'Sparkle.framework/Versions/B/Headers/*.h' - - s.preserve_paths = ['bin/*', 'Symbols'] - s.public_header_files = 'Sparkle.framework/Versions/B/Headers/*.h' - s.vendored_frameworks = 'Sparkle.framework' - s.xcconfig = { - 'FRAMEWORK_SEARCH_PATHS' => '"${PODS_ROOT}/Sparkle"', - 'LD_RUNPATH_SEARCH_PATHS' => '@loader_path/../Frameworks' - } - s.requires_arc = true -end diff --git a/Sparkle.xcodeproj/project.pbxproj b/Sparkle.xcodeproj/project.pbxproj index 4374b5a8..4c27b852 100644 --- a/Sparkle.xcodeproj/project.pbxproj +++ b/Sparkle.xcodeproj/project.pbxproj @@ -932,7 +932,6 @@ 142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBinaryDeltaTest.m; sourceTree = ""; }; 14652F7919A93E5F00959E44 /* set-git-version-info.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "set-git-version-info.sh"; sourceTree = ""; }; 14652F8319A9759F00959E44 /* SUExport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUExport.h; sourceTree = ""; }; - 146EC84E19A68CF8004A50C5 /* Sparkle.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = Sparkle.podspec; sourceTree = SOURCE_ROOT; }; 14732BB1195FF6B700593899 /* .clang-format */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".clang-format"; sourceTree = SOURCE_ROOT; }; 14732BB91960EEEE00593899 /* SampleAppcast.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = SampleAppcast.xml; sourceTree = ""; }; 14732BBA1960EF7100593899 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = SOURCE_ROOT; }; @@ -2493,7 +2492,6 @@ 72045CE426FEE708004F96E5 /* strip-framework.sh */, 720C192827127A3800740C8E /* release-move-tag.sh */, 720B4C2325EBFAFD005A0592 /* link-tools.sh */, - 146EC84E19A68CF8004A50C5 /* Sparkle.podspec */, ); path = Configurations; sourceTree = "";