Skip to content

Commit

Permalink
Merge pull request #18 from vadymmarkov/refactor/update-references
Browse files Browse the repository at this point in the history
Update references
  • Loading branch information
vadymmarkov authored Aug 27, 2018
2 parents 01a26cc + 1d30087 commit 61c7a14
Show file tree
Hide file tree
Showing 12 changed files with 85 additions and 50 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
GitHub Issues is for reporting bugs, discussing features and general feedback in **PinFloyd**. Be sure to check our [documentation](http://cocoadocs.org/docsets/PinFloyd), [FAQ](https://github.com/hyperoslo/PinFloyd/wiki/FAQ) and [past issues](https://github.com/hyperoslo/PinFloyd/issues?state=closed) before opening any new issues.
GitHub Issues is for reporting bugs, discussing features and general feedback in **PinFloyd**. Be sure to check our [documentation](http://cocoadocs.org/docsets/PinFloyd), [FAQ](https://github.com/vadymmarkov/PinFloyd/wiki/FAQ) and [past issues](https://github.com/vadymmarkov/PinFloyd/issues?state=closed) before opening any new issues.

If you are posting about a crash in your application, a stack trace is helpful, but additional context, in the form of code and explanation, is necessary to be of any use.
53 changes: 32 additions & 21 deletions Example/PinFloydDemo/PinFloydDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
D5C7F73D1C3BC9CE008CDDBA /* Frameworks */,
D5C7F73E1C3BC9CE008CDDBA /* Resources */,
B28E76524F5EEEC078972226 /* [CP] Embed Pods Frameworks */,
7334FD71A6ABDB41637005A0 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -139,8 +138,8 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0720;
ORGANIZATIONNAME = "Hyper Interaktiv AS";
LastUpgradeCheck = 0940;
ORGANIZATIONNAME = "Vadym Markov";
TargetAttributes = {
D5C7F73F1C3BC9CE008CDDBA = {
CreatedOnToolsVersion = 7.2;
Expand Down Expand Up @@ -179,30 +178,18 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
7334FD71A6ABDB41637005A0 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PinFloydDemo/Pods-PinFloydDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
B28E76524F5EEEC078972226 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-PinFloydDemo/Pods-PinFloydDemo-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/PinFloyd/PinFloyd.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PinFloyd.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand All @@ -215,13 +202,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-PinFloydDemo-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -258,13 +248,23 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand Down Expand Up @@ -302,13 +302,23 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand All @@ -327,6 +337,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -338,7 +349,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = PinFloydDemo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.PinFloydDemo;
PRODUCT_BUNDLE_IDENTIFIER = io.github.vadymmarkov.PinFloydDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
Expand All @@ -351,7 +362,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = PinFloydDemo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.PinFloydDemo;
PRODUCT_BUNDLE_IDENTIFIER = io.github.vadymmarkov.PinFloydDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0940"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
3 changes: 1 addition & 2 deletions Example/PinFloydDemo/Podfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use_frameworks!

platform :ios, '8.0'
platform :ios, '9.0'

target 'PinFloydDemo' do
pod 'PinFloyd', path: '../../'
end

8 changes: 4 additions & 4 deletions Example/PinFloydDemo/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- PinFloyd (0.1.0)
- PinFloyd (1.0.4)

DEPENDENCIES:
- PinFloyd (from `../../`)
Expand All @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: "../../"

SPEC CHECKSUMS:
PinFloyd: d5b8a5123602f25216b976b15fa2836f5ed96e16
PinFloyd: d8e195fa0464ab7880fa50da2e4bda8260dd6535

PODFILE CHECKSUM: f1e6d1f8d1b7cb3bc6d70fea8aa25fb799b3e4ff
PODFILE CHECKSUM: af9099564126b5ad24ef79e2f4437c9769ddfa26

COCOAPODS: 1.2.0
COCOAPODS: 1.5.3
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Licensed under the **MIT** license

> Copyright (c) 2015 Hyper Interaktiv AS
> Copyright (c) 2018 Vadym Markov
>
> Permission is hereby granted, free of charge, to any person obtaining
> a copy of this software and associated documentation files (the
Expand Down
12 changes: 7 additions & 5 deletions PinFloyd.podspec
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
Pod::Spec.new do |s|
s.name = "PinFloyd"
s.summary = "MapKit annotations clustering for iOS."
s.version = "1.0.3"
s.homepage = "https://github.com/hyperoslo/PinFloyd"
s.version = "1.0.4"
s.homepage = "https://github.com/vadymmarkov/PinFloyd"
s.license = 'MIT'
s.author = { "Hyper Interaktiv AS" => "[email protected]" }
s.author = {
"Vadym Markov" => "[email protected]"
}
s.source = {
:git => "https://github.com/hyperoslo/PinFloyd.git",
:git => "https://github.com/vadymmarkov/PinFloyd.git",
:tag => s.version.to_s
}
s.social_media_url = 'https://twitter.com/hyperoslo'
s.social_media_url = 'https://twitter.com/vadymmarkov'

s.ios.deployment_target = '9.0'
s.tvos.deployment_target = '9.2'
Expand Down
16 changes: 10 additions & 6 deletions PinFloyd.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0920;
ORGANIZATIONNAME = "Hyper Interaktiv AS";
LastUpgradeCheck = 0940;
ORGANIZATIONNAME = "Vadym Markov";
TargetAttributes = {
D5B2E89E1C3A780C00C0327D = {
CreatedOnToolsVersion = 7.2;
Expand Down Expand Up @@ -342,12 +342,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -399,12 +401,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -451,7 +455,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.PinFloyd-iOS";
PRODUCT_BUNDLE_IDENTIFIER = "io.github.vadymmarkov.PinFloyd-iOS";
PRODUCT_NAME = PinFloyd;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -471,7 +475,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.PinFloyd-iOS";
PRODUCT_BUNDLE_IDENTIFIER = "io.github.vadymmarkov.PinFloyd-iOS";
PRODUCT_NAME = PinFloyd;
SKIP_INSTALL = YES;
};
Expand All @@ -484,7 +488,7 @@
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/PinFloydTests/Info-iOS.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.PinFloydTests;
PRODUCT_BUNDLE_IDENTIFIER = io.github.vadymmarkov.PinFloydTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
Expand All @@ -497,7 +501,7 @@
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/PinFloydTests/Info-iOS.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.PinFloydTests;
PRODUCT_BUNDLE_IDENTIFIER = io.github.vadymmarkov.PinFloydTests;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0920"
LastUpgradeVersion = "0940"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand Down Expand Up @@ -56,7 +55,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
17 changes: 11 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# PinFloyd

[![CI Status](http://img.shields.io/travis/hyperoslo/PinFloyd.svg?style=flat)](https://travis-ci.org/hyperoslo/PinFloyd)
[![CI Status](http://img.shields.io/travis/vadymmarkov/PinFloyd.svg?style=flat)](https://travis-ci.org/vadymmarkov/PinFloyd)
[![Version](https://img.shields.io/cocoapods/v/PinFloyd.svg?style=flat)](http://cocoadocs.org/docsets/PinFloyd)
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![License](https://img.shields.io/cocoapods/l/PinFloyd.svg?style=flat)](http://cocoadocs.org/docsets/PinFloyd)
Expand Down Expand Up @@ -35,7 +35,7 @@ func mapView(_ mapView: MKMapView, regionDidChangeAnimated animated: Bool) {
}
```

Reuse annotation view:
Reuse annotation view:
```swift
func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? {
switch annotation {
Expand Down Expand Up @@ -68,19 +68,24 @@ pod 'PinFloyd'
To install just write into your Cartfile:

```ruby
github "hyperoslo/PinFloyd"
github "vadymmarkov/PinFloyd"
```

**PinFloyd** can also be installed manually. Just download and drop `Sources` folders in your project.

## Author

Hyper Interaktiv AS, ios@hyper.no
Vadym Markov, markov.vadym@gmail.com

## Credits

This library was originally done at [Hyper](http://hyper.no), a digital
communications agency with a passion for [good code](https://github.com/hyperoslo) and delightful user experiences.

## Contributing

We would love you to contribute to **PinFloyd**, check the [CONTRIBUTING](https://github.com/hyperoslo/PinFloyd/blob/master/CONTRIBUTING.md) file for more info.
Check the [CONTRIBUTING](https://github.com/vadymmarkov/RetroProgress/blob/master/CONTRIBUTING.md) file for more info.

## License

**PinFloyd** is available under the MIT license. See the [LICENSE](https://github.com/hyperoslo/PinFloyd/blob/master/LICENSE.md) file for more info.
**PinFloyd** is available under the MIT license. See the [LICENSE](https://github.com/vadymmarkov/PinFloyd/blob/master/LICENSE.md) file for more info.

0 comments on commit 61c7a14

Please sign in to comment.