Skip to content
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

modal blocked #84

Closed
wants to merge 12 commits into from
Closed

modal blocked #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a871e6b
Fix blocked modal when dismissed with drag down gesture
juangdelvalle Feb 18, 2020
0b99e61
Update podspec
juangdelvalle Feb 18, 2020
b62c185
Update project to Swift 5
juangdelvalle Feb 18, 2020
3266765
PR feedback
juangdelvalle Mar 5, 2020
914e35a
remove specific version of swift on podspec to pass CI
juangdelvalle Apr 23, 2020
3226b4a
update .yml to pass CI
juangdelvalle Apr 23, 2020
8f9c674
add swift associated versions on podspec
juangdelvalle Apr 23, 2020
c96eaf2
increase retries to avoid stalled build
juangdelvalle Apr 23, 2020
60c0449
update pods to avoid build stalls
juangdelvalle Apr 23, 2020
f1b26a6
update example project to latest swift
juangdelvalle Apr 23, 2020
e7daf59
update cocoapods
juangdelvalle Apr 23, 2020
09e0a31
remove swift specific version on podspec
juangdelvalle Apr 23, 2020
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
1 change: 0 additions & 1 deletion .swift-version
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
# * https://github.com/supermarin/xcpretty#usage

language: objective-c
osx_image: xcode10
osx_image: xcode11.3
bundler_args: --retry 5
# cache: cocoapods
# podfile: Example/Podfile

before_install:
- gem install cocoapods -v 1.1.1
- gem install cocoapods --no-document --quiet
- pod repo update
- pod install --project-directory=Example

script:
Expand Down
4 changes: 2 additions & 2 deletions Example/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'https://rubygems.org'

gem 'cocoapods', '1.2.0'
gem 'cocoapods-deintegrate', '1.0.1'
gem 'cocoapods', '1.9.1'
gem 'cocoapods-deintegrate', '1.0.4'
103 changes: 59 additions & 44 deletions Example/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,91 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.5)
activesupport (4.2.7.1)
CFPropertyList (3.0.2)
activesupport (4.2.11.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (1.0.1)
cocoapods (1.2.0)
algoliasearch (1.27.1)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.9.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.1, < 2.0)
cocoapods-core (= 1.2.0)
cocoapods-deintegrate (>= 1.0.1, < 2.0)
cocoapods-downloader (>= 1.1.3, < 2.0)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.9.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.1.2, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored (~> 1.2)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.5.5)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 0.2.5)
xcodeproj (>= 1.4.1, < 2.0)
cocoapods-core (1.2.0)
activesupport (>= 4.0.2, < 5)
ruby-macho (~> 1.4)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.1)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.1)
cocoapods-downloader (1.1.3)
netrc (~> 0.11)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.3.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-trunk (1.1.2)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.4.1)
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
cocoapods-try (1.1.0)
colored (1.2)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.6)
escape (0.0.4)
fourflusher (2.0.1)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.12.2)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.0.3)
i18n (0.8.0)
json (1.8.3)
minitest (5.10.1)
molinillo (0.5.6)
nanaimo (0.2.3)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.3.0)
minitest (5.14.0)
molinillo (0.6.6)
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.7.8)
ruby-macho (0.2.6)
thread_safe (0.3.5)
tzinfo (1.2.2)
netrc (0.11.0)
ruby-macho (1.4.0)
thread_safe (0.3.6)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
xcodeproj (1.4.2)
CFPropertyList (~> 2.3.3)
activesupport (>= 3)
claide (>= 1.0.1, < 2.0)
colored (~> 1.2)
nanaimo (~> 0.2.3)
xcodeproj (1.16.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.6)

PLATFORMS
ruby

DEPENDENCIES
cocoapods (= 1.2.0)
cocoapods-deintegrate (= 1.0.1)
cocoapods (= 1.9.1)
cocoapods-deintegrate (= 1.0.4)

BUNDLED WITH
1.14.4
1.17.3
2 changes: 1 addition & 1 deletion Example/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ platform :ios, '12.0'
use_frameworks!

target 'YoshiExample' do
pod "Instabug", '5.2.4'
pod "Instabug", '9.1.2'
pod "Yoshi", :path => "../", :subspecs => ['QAKit']
end
18 changes: 9 additions & 9 deletions Example/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
PODS:
- Instabug (5.2.4)
- Yoshi/Core (3.0.0)
- Yoshi/QAKit (3.0.0):
- Instabug (9.1.2)
- Yoshi/Core (3.0.1)
- Yoshi/QAKit (3.0.1):
- Yoshi/Core

DEPENDENCIES:
- Instabug (= 5.2.4)
- Instabug (= 9.1.2)
- Yoshi/QAKit (from `../`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
https://github.com/CocoaPods/Specs.git:
- Instabug

EXTERNAL SOURCES:
Yoshi:
:path: "../"

SPEC CHECKSUMS:
Instabug: 6fa40a5e2a4620f0589dfc8e4e01b1018c8c42b1
Yoshi: f681e9474a3d0aa8ec7ec935c579f52c2d00a360
Instabug: a638cb57c8768b102bab2930b68ed81f2d7ab877
Yoshi: 60f2e8fc0c47363c50a73b9adedbb7cb81c9a0a0

PODFILE CHECKSUM: 6937f5f3704e17fb013434d20f6bd261b2e48f51
PODFILE CHECKSUM: 51eb4be134648631dd57751eb3e238ef40a38f9d

COCOAPODS: 1.5.3
COCOAPODS: 1.9.1
27 changes: 6 additions & 21 deletions Example/YoshiExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@
276BCEC81C29F060002138C7 /* Frameworks */,
276BCEC91C29F060002138C7 /* Resources */,
9807FA47239685B35BD1B1CC /* [CP] Embed Pods Frameworks */,
2FE9A2C899648AB92ACEAA90 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -201,40 +200,26 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
2FE9A2C899648AB92ACEAA90 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-YoshiExample/Pods-YoshiExample-resources.sh",
"${PODS_ROOT}/Instabug/Instabug.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Instabug.bundle",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YoshiExample/Pods-YoshiExample-resources.sh\"\n";
showEnvVarsInLog = 0;
};
9807FA47239685B35BD1B1CC /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-YoshiExample/Pods-YoshiExample-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-YoshiExample/Pods-YoshiExample-frameworks.sh",
"${PODS_ROOT}/Instabug/Instabug.framework",
"${PODS_ROOT}/Instabug/Instabug.framework.dSYM",
"${BUILT_PRODUCTS_DIR}/Yoshi/Yoshi.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Instabug.framework",
"${DWARF_DSYM_FOLDER_PATH}/Instabug.framework.dSYM",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Yoshi.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YoshiExample/Pods-YoshiExample-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-YoshiExample/Pods-YoshiExample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
A406AEF3198A3BAC81FB073C /* [CP] Check Pods Manifest.lock */ = {
Expand Down
6 changes: 3 additions & 3 deletions Example/YoshiExample/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}

private func instabugMenu() -> YoshiMenu {
Instabug.start(withToken: "cf779d2e19c0affaad8567a7598e330d", invocationEvent: .none)
Instabug.setDefaultInvocationMode(.bugReporter)
Instabug.start(withToken: "cf779d2e19c0affaad8567a7598e330d", invocationEvents: [.none])
BugReporting.promptOptionsEnabledReportTypes = [.bug]

return YoshiActionMenu(title: "Start Instabug",
subtitle: nil,
completion: {
Instabug.invoke()
Instabug.show()
})
}

Expand Down
2 changes: 1 addition & 1 deletion Example/YoshiExample/YoshiExample-Bridging-Header.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
// Use this file to import your target's public headers that you would like to expose to Swift.
//

#import <Instabug/Instabug.h>
#import <Instabug/Instabug.h>
26 changes: 10 additions & 16 deletions Yoshi.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,20 @@
#

Pod::Spec.new do |s|
s.name = "Yoshi"
s.version = "3.0.0"
s.summary = "A helpful companion for your iOS app."

# This description is used to generate tags and improve search results.
# * Think: What does it do? Why did you write it? What is the focus?
# * Try to keep it short, snappy and to the point.
# * Write the description between the DESC delimiters below.
# * Finally, don't worry about the indent, CocoaPods strips it!
s.name = 'Yoshi'
s.version = '3.0.1'
s.summary = 'A helpful companion for your iOS app.'
s.license = 'MIT'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we no longer link reference the license file?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as I understand, is no longer required to make a reference to a license file, but I can change it to make the reference anyway.

s.homepage = 'https://github.com/prolificinteractive/Yoshi'
s.authors = { 'Michael Campbell' => '[email protected]' , 'Luna An' => '[email protected]'}
s.source = { :git => "https://github.com/prolificinteractive/Yoshi.git", :tag => s.version }
s.screenshots = 'https://raw.githubusercontent.com/prolificinteractive/Yoshi/a6e85e87cbd67f2bb3bfe60157e7b13281d80f20/Images/Yoshi.png", "https://raw.githubusercontent.com/prolificinteractive/Yoshi/c66cdf8dc2ab643fe57996d20d3cd37b8b70ceff/Images/Yoshi_iPad.png'
s.description = <<-DESC
Yoshi is a convenient wrapper around the UI code that is often needed for displaying debug menus. Out of the box, Yoshi provides easy-to-implement date, list and custom menus.
DESC

s.homepage = "https://github.com/prolificinteractive/Yoshi"
s.screenshots = "https://raw.githubusercontent.com/prolificinteractive/Yoshi/a6e85e87cbd67f2bb3bfe60157e7b13281d80f20/Images/Yoshi.png", "https://raw.githubusercontent.com/prolificinteractive/Yoshi/c66cdf8dc2ab643fe57996d20d3cd37b8b70ceff/Images/Yoshi_iPad.png"
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { "Michael Campbell" => "[email protected]" , "Luna An" => "[email protected]"}
s.source = { :git => "https://github.com/prolificinteractive/Yoshi.git", :tag => s.version.to_s }

s.platform = :ios, '8.0'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is platform no longer required?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

platform is now specified in s.ios.deployment_target = '8.0'

s.ios.deployment_target = '8.0'

s.requires_arc = true

# Default subspec that contains all shared code files for the library
Expand Down
Loading