Skip to content

Commit

Permalink
Merge pull request #2 from dogo/develop
Browse files Browse the repository at this point in the history
merge latest
  • Loading branch information
syto203 authored Nov 11, 2020
2 parents 417f069 + 4cc166e commit a5222ef
Show file tree
Hide file tree
Showing 17 changed files with 373 additions and 60 deletions.
8 changes: 8 additions & 0 deletions .github/scripts/build_app.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

set -eo pipefail

xcodebuild -project SCLAlertView.xcodeproj \
-scheme SCLAlertView \
-destination platform=iOS\ Simulator,OS=14.0,name=iPhone\ 11 \
clean build | xcpretty
16 changes: 16 additions & 0 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Building
on: [push, pull_request]

jobs:
build:
name: Building SCLAlertView
runs-on: macOS-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Setup Xcode version
uses: maxim-lobanov/[email protected]
with:
xcode-version: 12.0.0
- name: Building iOS app
run: exec ./.github/scripts/build_app.sh
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.1
2.6.5
7 changes: 0 additions & 7 deletions .travis.yml

This file was deleted.

8 changes: 8 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# frozen_string_literal: true

source "https://rubygems.org"
ruby "2.6.5"

git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

gem "cocoapods"
96 changes: 96 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.2)
activesupport (5.2.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.10.0)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.0)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.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)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.19.0, < 2.0)
cocoapods-core (1.10.0)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.4.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.7)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.13.1)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
json (2.3.1)
minitest (5.14.2)
molinillo (0.6.6)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
public_suffix (4.0.6)
ruby-macho (1.4.0)
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
xcodeproj (1.19.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)

PLATFORMS
ruby

DEPENDENCIES
cocoapods

RUBY VERSION
ruby 2.6.5p114

BUNDLED WITH
2.1.4
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SCLAlertView-Objective-C

Animated Alert View written in Swift but ported to Objective-C, which can be used as a `UIAlertView` or `UIAlertController` replacement.

[![Build Status](https://travis-ci.org/dogo/SCLAlertView.svg?branch=master)](https://travis-ci.org/dogo/SCLAlertView)
![Build Status](https://github.com/dogo/SCLAlertView/workflows/Building/badge.svg)
[![Cocoapods](http://img.shields.io/cocoapods/v/SCLAlertView-Objective-C.svg)](http://cocoapods.org/?q=SCLAlertView-Objective-C)
[![Pod License](http://img.shields.io/cocoapods/l/SCLAlertView-Objective-C.svg)](https://github.com/dogo/SCLAlertView/blob/master/LICENSE)
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
Expand Down Expand Up @@ -112,10 +112,6 @@ SCLAlertView *alert = [[SCLAlertView alloc] initWithNewWindow];
SCLAlertView *alert = [[SCLAlertView alloc] initWithNewWindowWidth:300.0f];
```

### New Window: Known issues

1. SCLAlert animation is wrong in landscape. (iOS 6.X and 7.X)

### Add buttons
```Objective-C
SCLAlertView *alert = [[SCLAlertView alloc] init];
Expand Down
4 changes: 2 additions & 2 deletions SCLAlertView-Objective-C.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = "SCLAlertView-Objective-C"
spec.version = "1.1.6"
spec.version = "1.2.0"
spec.summary = "Beautiful animated Alert View. Written in Swift but ported to Objective-C"
spec.homepage = "https://github.com/dogo/SCLAlertView"
spec.screenshots = "https://raw.githubusercontent.com/dogo/SCLAlertView/master/ScreenShots/ScreenShot.png", "https://raw.githubusercontent.com/dogo/SCLAlertView/master/ScreenShots/ScreenShot2.png"
Expand All @@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
spec.social_media_url = "http://twitter.com/di_autilio"
spec.platform = :ios
spec.frameworks = "UIKit", "AudioToolbox", "Accelerate", "CoreGraphics"
spec.ios.deployment_target = '8.0'
spec.ios.deployment_target = '9.0'
spec.source = { :git => "https://github.com/dogo/SCLAlertView.git", :tag => spec.version.to_s }
spec.source_files = "SCLAlertView/*"
spec.requires_arc = true
Expand Down
Loading

0 comments on commit a5222ef

Please sign in to comment.