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

Enabled Examples building on Xcode 11 #619

Closed
wants to merge 1 commit into from
+22 −11
Closed

Enabled Examples building on Xcode 11 #619

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: 10 additions & 0 deletions Examples/ExampleBaseViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ import UIKit

// basically a view controller with a back button and a tap gesture configured
class ExampleBaseViewController: UIViewController {

init() {
super.init(nibName: nil, bundle: nil)
modalPresentationStyle = .overFullScreen
}

required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

let dismissButton = UIButton(type: .system)

override func viewDidLoad() {
Expand Down
4 changes: 2 additions & 2 deletions Hero.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-HeroExamples/Pods-HeroExamples-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-HeroExamples/Pods-HeroExamples-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/ChameleonFramework/ChameleonFramework.framework",
"${BUILT_PRODUCTS_DIR}/CollectionKit/CollectionKit.framework",
);
Expand All @@ -927,7 +927,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HeroExamples/Pods-HeroExamples-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HeroExamples/Pods-HeroExamples-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
89DC76B30A0BF7FD724C24D3 /* [CP] Check Pods Manifest.lock */ = {
Expand Down
2 changes: 1 addition & 1 deletion LegacyExamples/Examples/BuiltInTransition/AnimationSelectTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class AnimationSelectTableViewController: UITableViewController {

override func viewDidLoad() {
super.viewDidLoad()
tableView.backgroundColor = UIColor.randomFlat
tableView.backgroundColor = UIColor.randomFlat()
labelColor = UIColor(contrastingBlackOrWhiteColorOn: tableView.backgroundColor!, isFlat: true)
let screenEdgePanGR = UIScreenEdgePanGestureRecognizer(target: self, action: #selector(handlePan(gr:)))
screenEdgePanGR.edges = .left
Expand Down
2 changes: 1 addition & 1 deletion Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ target 'HeroExamples' do
platform :ios, '9.0'
use_frameworks!
pod "CollectionKit"
pod 'ChameleonFramework/Swift', :git => 'https://github.com/ViccAlexander/Chameleon.git'
pod 'ChameleonFramework/Swift', :git => 'https://github.com/wowansm/Chameleon.git', :branch => 'swift5'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should wait until mainline is swift5 compatible if not already.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Project is no longer maintened. We should remove it from the examples.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Makes sense to me, wanna just remove it within this PR then?

end

target 'HeroTvOSExamples' do
Expand Down
15 changes: 8 additions & 7 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,27 @@ PODS:
- CollectionKit/Core (2.2.0)

DEPENDENCIES:
- ChameleonFramework/Swift (from `https://github.com/ViccAlexander/Chameleon.git`)
- ChameleonFramework/Swift (from `https://github.com/wowansm/Chameleon.git`, branch `swift5`)
- CollectionKit

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

EXTERNAL SOURCES:
ChameleonFramework:
:git: https://github.com/ViccAlexander/Chameleon.git
:branch: swift5
:git: https://github.com/wowansm/Chameleon.git

CHECKOUT OPTIONS:
ChameleonFramework:
:commit: 6dd284bde21ea2e7f9fd89bc36f40df16e16369d
:git: https://github.com/ViccAlexander/Chameleon.git
:commit: 96d52c36a45847fff60bcff7a58fec1e4bd7390b
:git: https://github.com/wowansm/Chameleon.git

SPEC CHECKSUMS:
ChameleonFramework: d21a3cc247abfe5e37609a283a8238b03575cf64
CollectionKit: 5caa5341860d4c9b748ebfeaab97530b2d02c7c0

PODFILE CHECKSUM: 126cdb5cfac9a9e2d2e798696131fd8758b6c34d
PODFILE CHECKSUM: dd3255f57bc2d0e63ad0095225304694e193dc68

COCOAPODS: 1.5.3
COCOAPODS: 1.8.0