Skip to content

chore: modernize Ruby/CocoaPods build setup #1376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keramzyt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: modernize Ruby/CocoaPods build setup #1376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
source 'https://rubygems.org'

gem 'cocoapods', '~> 1.10'
gem 'travis', '~> 1.10'
ruby '>= 3.2.0'

gem 'cocoapods', '~> 1.16'
gem 'xcodeproj', '>= 1.27', '< 2.0'
gem 'mutex_m'
gem 'base64'
gem 'logger'
gem 'bigdecimal'
95 changes: 37 additions & 58 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,49 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.3.0)
bigdecimal (4.1.2)
claide (1.0.3)
cocoapods (1.10.1)
addressable (~> 2.6)
cocoapods (1.16.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.1)
cocoapods-core (= 1.16.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.19.0, < 2.0)
cocoapods-core (1.10.1)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.27.0, < 2.0)
cocoapods-core (1.16.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.4.0)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-trunk (1.5.0)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
Expand All @@ -56,73 +58,50 @@ GEM
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
faraday (1.1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
faraday_middleware (1.0.0)
faraday (~> 1.0)
ffi (1.14.2)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh (0.18.0)
activesupport (~> 5.0)
addressable (~> 2.4)
faraday (~> 1.0)
faraday_middleware (~> 1.0)
multi_json (~> 1.0)
net-http-persistent (~> 2.9)
net-http-pipeline
gh_inspector (1.1.3)
highline (2.0.3)
httpclient (2.8.3)
i18n (1.8.7)
concurrent-ruby (~> 1.0)
json (2.5.1)
json_pure (2.3.1)
launchy (2.4.3)
addressable (~> 2.3)
logger (1.7.0)
minitest (5.14.3)
molinillo (0.6.6)
multi_json (1.15.0)
multipart-post (2.1.1)
nanaimo (0.3.0)
molinillo (0.8.0)
mutex_m (0.3.0)
nanaimo (0.4.0)
nap (1.1.0)
net-http-persistent (2.9.4)
net-http-pipeline (1.0.1)
netrc (0.11.0)
public_suffix (4.0.6)
pusher-client (0.6.2)
json
websocket (~> 1.0)
ruby-macho (1.4.0)
ruby2_keywords (0.0.2)
rexml (3.4.4)
ruby-macho (2.5.1)
thread_safe (0.3.6)
travis (1.10.0)
faraday (~> 1.0)
faraday_middleware (~> 1.0)
gh (~> 0.13)
highline (~> 2.0)
json_pure (~> 2.3)
launchy (~> 2.1, < 2.5.0)
pusher-client (~> 0.4)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
websocket (1.2.8)
xcodeproj (1.19.0)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
nanaimo (~> 0.4.0)
rexml (>= 3.3.6, < 4.0)

PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.10)
travis (~> 1.10)
base64
bigdecimal
cocoapods (~> 1.16)
logger
mutex_m
xcodeproj (>= 1.27, < 2.0)

RUBY VERSION
ruby 3.4.4p34

BUNDLED WITH
1.17.3
2.6.9
6 changes: 2 additions & 4 deletions MacDown.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,12 +1191,10 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MacDown/Pods-MacDown-frameworks.sh",
"${PODS_ROOT}/Sparkle/Sparkle.framework",
"${PODS_ROOT}/Sparkle/Sparkle.framework.dSYM",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework",
"${DWARF_DSYM_FOLDER_PATH}/Sparkle.framework.dSYM",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -1759,7 +1757,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MacDown/Code/MacDown-Prefix.pch";
INFOPLIST_FILE = "MacDown/MacDown-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 14.6;
PRODUCT_BUNDLE_IDENTIFIER = "com.uranusjr.${PRODUCT_NAME:rfc1034identifier:lower}-debug";
PRODUCT_NAME = MacDown;
SDKROOT = macosx;
Expand All @@ -1777,7 +1775,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "MacDown/Code/MacDown-Prefix.pch";
INFOPLIST_FILE = "MacDown/MacDown-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 14.6;
PRODUCT_BUNDLE_IDENTIFIER = "com.uranusjr.${PRODUCT_NAME:rfc1034identifier:lower}";
PRODUCT_NAME = MacDown;
SDKROOT = macosx;
Expand Down
9 changes: 4 additions & 5 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
platform :osx, "10.8"
platform :osx, "10.13"

source 'https://github.com/MacDownApp/cocoapods-specs.git' # Patched libraries.
source 'https://cdn.cocoapods.org/'
source 'https://github.com/CocoaPods/Specs.git'

project 'MacDown.xcodeproj'

Expand All @@ -16,12 +16,11 @@ target "MacDown" do
pod 'MASPreferences', '~> 1.3'
pod 'Sparkle', '~> 1.18', :inhibit_warnings => false

# Locked on 0.4.x until we drop 10.8.
pod 'PAPreferences', '~> 0.4'
pod 'PAPreferences', '~> 0.5'
end

target "MacDownTests" do
pod 'PAPreferences', '~> 0.4'
pod 'PAPreferences', '~> 0.5'
end

target "macdown-cmd" do
Expand Down
16 changes: 8 additions & 8 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ DEPENDENCIES:
- LibYAML (~> 0.1)
- M13OrderedDictionary (~> 1.1)
- MASPreferences (~> 1.3)
- PAPreferences (~> 0.4)
- PAPreferences (~> 0.5)
- Sparkle (~> 1.18)

SPEC REPOS:
https://github.com/MacDownApp/cocoapods-specs.git:
- handlebars-objc
- hoedown
- LibYAML
trunk:
https://github.com/CocoaPods/Specs.git:
- GBCli
- JJPluralForm
- M13OrderedDictionary
- MASPreferences
- PAPreferences
- Sparkle
https://github.com/MacDownApp/cocoapods-specs.git:
- handlebars-objc
- hoedown
- LibYAML

SPEC CHECKSUMS:
GBCli: e5f988fadb68e1e3c01919f134009fed9796fde0
Expand All @@ -46,6 +46,6 @@ SPEC CHECKSUMS:
PAPreferences: 9f0ffb1e67174a0df001af9d3320166ceb9ee6f5
Sparkle: 06ea33170007c5937ee54da481b4481af98fac79

PODFILE CHECKSUM: e9356b9a2ceafda7889ba385de6e9f2d8b06cba0
PODFILE CHECKSUM: e6512d583ee77030cbd7116a1cffcd60650889f8

COCOAPODS: 1.8.4
COCOAPODS: 1.16.2