Skip to content

Commit

Permalink
Merge pull request #191 from intere/release/1.2.0
Browse files Browse the repository at this point in the history
Release/1.2.0
  • Loading branch information
aaronbrethorst authored Jun 15, 2019
2 parents bca0fc3 + 5634a17 commit 78a57c1
Show file tree
Hide file tree
Showing 11 changed files with 298 additions and 303 deletions.
2 changes: 1 addition & 1 deletion ARCL.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ARCL"
s.version = "1.1.0"
s.version = "1.2.0"
s.summary = "ARKit + CoreLocation combines the high accuracy of AR with the scale of GPS data."
s.homepage = "https://github.com/ProjectDent/arkit-corelocation"
s.author = { "Andrew Hart" => "[email protected]" }
Expand Down
20 changes: 20 additions & 0 deletions ARKit+CoreLocation.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
B912B23DE2753A7230AC73FF /* Swiftlint */,
128F729F1F39B73C00AC6E4C /* SwiftLint */,
9CE3F8FA71585F7964C43538 /* [CP] Embed Pods Frameworks */,
8827CE3D1AC7506E30E59AA8 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -268,6 +269,25 @@
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
};
8827CE3D1AC7506E30E59AA8 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ARKit+CoreLocation/Pods-ARKit+CoreLocation-resources.sh\"\n";
showEnvVarsInLog = 0;
};
9CE3F8FA71585F7964C43538 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
8 changes: 4 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- ARCL (1.1.0)
- ARCL (1.2.0)

DEPENDENCIES:
- ARCL (from `.`)

EXTERNAL SOURCES:
ARCL:
:path: "."
:path: .

SPEC CHECKSUMS:
ARCL: de572e728e225494df56183b23e5203581915ffd
ARCL: 29c62033bea1143385e72bfd214f8fc35d9e3f80

PODFILE CHECKSUM: 1576bdfdc3990c7e821f93bcae8cf3b28a3cf18c

COCOAPODS: 1.5.0
COCOAPODS: 1.4.0
4 changes: 2 additions & 2 deletions Pods/Local Podspecs/ARCL.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

523 changes: 259 additions & 264 deletions Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Pods/Target Support Files/ARCL/ARCL.xcconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pods/Target Support Files/ARCL/Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

- next
- 1.2.0
- [PR #185 - Custom boxes for directions](https://github.com/ProjectDent/ARKit-CoreLocation/pull/185/files)
- [PR #184 - adds "ignoreAltitude" to LocationNode](https://github.com/ProjectDent/ARKit-CoreLocation/pull/184)
- [PR #183 - Scaling schemes](https://github.com/ProjectDent/ARKit-CoreLocation/pull/183)
Expand Down

0 comments on commit 78a57c1

Please sign in to comment.