Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
33 changes: 4 additions & 29 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,44 +20,19 @@ steps:
- label: "🔬 Build and Test"
key: "test"
command: |
build_and_test_pod
install_gems
bundle exec fastlane ios test
plugins: *common_plugins
artifact_paths:
- .build/logs/*.log
- .build/derived-data/Logs/**/*.xcactivitylog

#################
# Validate Podspec
#################
- label: "🔬 Validate Podspec"
key: "validate"
command: |
# validate_podspec
echo '+++ ⚠️ validate_podspec was bypassed ⚠️'
# post a message in the logs
cat .buildkite/validate_podspec_annotation.md
# and also as an annotation
cat .buildkite/validate_podspec_annotation.md | buildkite-agent annotate --style 'warning'
plugins: *common_plugins

#################
# Lint
#################
- label: "🧹 Lint"
key: "lint"
command: |
lint_pod
plugins: *common_plugins

#################
# Publish the Podspec (if we're building a tag)
#################
- label: "⬆️ Publish Podspec"
key: "publish"
command: .buildkite/publish-pod.sh
install_gems
bundle exec rubocop
plugins: *common_plugins
depends_on:
- "test"
- "validate"
- "lint"
if: build.tag != null
17 changes: 0 additions & 17 deletions .buildkite/publish-pod.sh

This file was deleted.

10 changes: 0 additions & 10 deletions .buildkite/validate_podspec_annotation.md

This file was deleted.

11 changes: 0 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,6 @@ Package.resolved

.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
Expand Down
5 changes: 0 additions & 5 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,3 @@ AllCops:
- DerivedData/**/*
- vendor/**/*
NewCops: enable

# Allow the Podspec filename to match the project
Naming/FileName:
Exclude:
- 'MediaEditor.podspec'
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ When releasing a new version:

### Breaking Changes

_None._
- Remove CocoaPods support.
Comment thread
mokagio marked this conversation as resolved.
Outdated

### New Features

Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@

source 'https://rubygems.org'

gem 'cocoapods', '~> 1.16'
gem 'fastlane', '~> 2.236'
gem 'rubocop', '~> 1.88'
77 changes: 1 addition & 76 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,8 @@ GEM
specs:
CFPropertyList (3.0.8)
abbrev (0.1.2)
activesupport (7.2.3.1)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1, < 6)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
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)
artifactory (3.0.17)
ast (2.4.3)
atomos (0.1.3)
Expand Down Expand Up @@ -47,61 +32,17 @@ GEM
benchmark (0.5.0)
bigdecimal (4.1.2)
claide (1.1.0)
cocoapods (1.16.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.16.2)
cocoapods-deintegrate (>= 1.0.3, < 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.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.8.0)
nap (~> 1.0)
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 (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
concurrent-ruby (1.3.7)
connection_pool (3.0.2)
csv (3.3.5)
declarative (0.0.20)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20240107)
dotenv (2.8.1)
drb (2.2.3)
emoji_regex (3.2.3)
escape (0.0.4)
ethon (0.18.0)
ffi (>= 1.15.0)
logger
excon (0.112.0)
faraday (1.10.6)
faraday-em_http (~> 1.0)
Expand Down Expand Up @@ -184,9 +125,6 @@ GEM
xcpretty (~> 0.4.1)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-sirp (1.1.0)
ffi (1.17.4)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.103.0)
google-apis-core (>= 0.15.0, < 2.a)
Expand Down Expand Up @@ -234,8 +172,6 @@ GEM
domain_name (~> 0.5)
httpclient (2.9.0)
mutex_m
i18n (1.15.2)
concurrent-ruby (~> 1.0)
jmespath (1.6.2)
json (2.20.0)
jwt (3.2.0)
Expand All @@ -245,15 +181,11 @@ GEM
logger (1.7.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
minitest (5.27.0)
molinillo (0.8.0)
multi_json (1.21.1)
multipart-post (2.4.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
nap (1.1.0)
naturally (2.3.0)
netrc (0.11.0)
nkf (0.3.0)
optparse (0.8.1)
os (1.1.4)
Expand Down Expand Up @@ -291,11 +223,9 @@ GEM
rubocop-ast (1.49.1)
parser (>= 3.3.7.2)
prism (~> 1.7)
ruby-macho (2.5.1)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.4.1)
securerandom (0.4.1)
security (0.1.5)
signet (0.22.0)
addressable (~> 2.8)
Expand All @@ -312,10 +242,6 @@ GEM
tty-screen (0.8.2)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
typhoeus (1.6.0)
ethon (>= 0.18.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
Expand All @@ -335,9 +261,8 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.16)
fastlane (~> 2.236)
rubocop (~> 1.88)

BUNDLED WITH
2.3.22
2.6.8
28 changes: 0 additions & 28 deletions MediaEditor.podspec

This file was deleted.

12 changes: 4 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MediaEditor

[![CircleCI](https://circleci.com/gh/wordpress-mobile/MediaEditor-iOS.svg?style=svg)](https://circleci.com/gh/wordpress-mobile/MediaEditor-iOS) [![Version](https://img.shields.io/cocoapods/v/MediaEditor.svg?style=flat)](http://cocoadocs.org/docsets/MediaEditor) [![License](https://img.shields.io/cocoapods/l/MediaEditor.svg?style=flat)](http://cocoadocs.org/docsets/MediaEditor) [![Platform](https://img.shields.io/cocoapods/p/MediaEditor.svg?style=flat)](http://cocoadocs.org/docsets/MediaEditor) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![CircleCI](https://circleci.com/gh/wordpress-mobile/MediaEditor-iOS.svg?style=svg)](https://circleci.com/gh/wordpress-mobile/MediaEditor-iOS) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)

MediaEditor is an extendable library for iOS that allows you to quickly and easily add image editing features to your app. You can edit single or multiple images, from the device's library or any other source. It has been designed to feel natural and part of the OS.

Expand Down Expand Up @@ -54,18 +54,14 @@ Check the Example app for even more ways to use the MediaEditor:

# Requirements

* iOS 11.0+
* iOS 15.0+
* Swift 5

# Installation

### Cocoapods
### Swift Package Manager

Add the following to your Podfile:

```ruby
pod 'MediaEditor'
```
Add `https://github.com/wordpress-mobile/MediaEditor-iOS` as a package dependency.

### Manual Installation

Expand Down
9 changes: 1 addition & 8 deletions Sources/Extensions/Bundle+mediaEditor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@ extension Bundle {
#if SWIFT_PACKAGE
return Bundle.module
#else
let defaultBundle = Bundle(for: MediaEditor.self)
// If installed with CocoaPods, resources will be in MediaEditor.bundle
if let bundleURL = defaultBundle.resourceURL,
let resourceBundle = Bundle(url: bundleURL.appendingPathComponent("MediaEditor.bundle")) {
return resourceBundle
}
// Otherwise, the default bundle is used for resources
return defaultBundle
return Bundle(for: MediaEditor.self)
#endif
}

Expand Down