Skip to content

Commit

Permalink
Merge pull request #35 from merlos/fix/zoom-to-the-infinity-and-beyond
Browse files Browse the repository at this point in the history
Fix/zoom to the infinity and beyond
  • Loading branch information
merlos authored Oct 4, 2020
2 parents 809d0b4 + 92e340d commit cc01487
Show file tree
Hide file tree
Showing 113 changed files with 2,916 additions and 2,618 deletions.
14 changes: 11 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# * https://www.objc.io/issues/6-build-tools/travis-ci/
# * https://github.com/supermarin/xcpretty#usage

osx_image: xcode10.2
osx_image: xcode12
language: swift
# cache: cocoapods
# podfile: Example/Podfile
Expand All @@ -11,7 +11,15 @@ before_install:
# - pod install --project-directory=Example
- gem install xcpretty
script:

# Display some environment info.
- xcodebuild -version
- xcodebuild -showsdks
- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator12.2 ONLY_ACTIVE_ARCH=NO | xcpretty
- pod lib lint
- xcrun xctrace list devices

# Build-a-bear

#- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | grep -E "Test Case |\[MAPCACHE\]|error:"

- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/MapCache.xcworkspace -scheme MapCache-Example -sdk iphonesimulator14.0 -destination 'platform=iOS Simulator,name=iPhone 11' ONLY_ACTIVE_ARCH=NO | xcpretty
- pod lib lint --allow-warnings
15 changes: 11 additions & 4 deletions Example/MapCache.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
607FACEB1AFB9204008FA782 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = "<group>"; };
86806D7962E8E2CA29F7E1EF /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
89293F562528CF9C00D8ABA2 /* .jazzy.yaml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; name = .jazzy.yaml; path = ../.jazzy.yaml; sourceTree = "<group>"; };
89293F572528CF9C00D8ABA2 /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; name = .travis.yml; path = ../.travis.yml; sourceTree = "<group>"; };
89293F582528CF9C00D8ABA2 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Package.swift; path = ../Package.swift; sourceTree = "<group>"; };
893072CB22A47E4A008612A1 /* DiskCacheSpecs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiskCacheSpecs.swift; sourceTree = "<group>"; };
893072CD22A47F06008612A1 /* String+DiskCacheSpecs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+DiskCacheSpecs.swift"; sourceTree = "<group>"; };
895E719D22B34F2A0006977C /* ZoomRangeSpecs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZoomRangeSpecs.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -172,6 +175,9 @@
children = (
EEF136F62BE41AE85E8E4DEA /* MapCache.podspec */,
86806D7962E8E2CA29F7E1EF /* README.md */,
89293F562528CF9C00D8ABA2 /* .jazzy.yaml */,
89293F572528CF9C00D8ABA2 /* .travis.yml */,
89293F582528CF9C00D8ABA2 /* Package.swift */,
98B68CF07B3AC619DB7870E1 /* LICENSE */,
);
name = "Podspec Metadata";
Expand Down Expand Up @@ -262,10 +268,9 @@
};
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "MapCache" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -485,9 +490,10 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "";
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
Expand Down Expand Up @@ -534,8 +540,9 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = "";
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
VALIDATE_PRODUCT = YES;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,18 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
onlyGenerateCoverageForSpecifiedTargets = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
BuildableName = "MapCache_Example.app"
BlueprintName = "MapCache_Example"
ReferencedContainer = "container:MapCache.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -69,17 +78,6 @@
</SkippedTests>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
BuildableName = "MapCache_Example.app"
BlueprintName = "MapCache_Example"
ReferencedContainer = "container:MapCache.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -101,8 +99,6 @@
ReferencedContainer = "container:MapCache.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
4 changes: 2 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ target 'MapCache_Example' do
target 'MapCache_Tests' do
inherit! :search_paths
pod 'OHHTTPStubs/Swift','~> 8.0.0'
pod 'Quick', '~> 2.1.0'
pod 'Nimble', '~> 8.0.1'
pod 'Quick', '~> 3.0.0'
pod 'Nimble', '~> 9.0.0-rc.3'
end
end
20 changes: 10 additions & 10 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- MapCache (0.6.0)
- Nimble (8.0.1)
- MapCache (0.8.2)
- Nimble (9.0.0-rc.3)
- OHHTTPStubs/Core (8.0.0)
- OHHTTPStubs/Default (8.0.0):
- OHHTTPStubs/Core
Expand All @@ -14,13 +14,13 @@ PODS:
- OHHTTPStubs/OHPathHelpers (8.0.0)
- OHHTTPStubs/Swift (8.0.0):
- OHHTTPStubs/Default
- Quick (2.1.0)
- Quick (3.0.0)

DEPENDENCIES:
- MapCache (from `../`)
- Nimble (~> 8.0.1)
- OHHTTPStubs/Swift
- Quick (~> 2.1.0)
- Nimble (~> 9.0.0-rc.3)
- OHHTTPStubs/Swift (~> 8.0.0)
- Quick (~> 3.0.0)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
Expand All @@ -33,11 +33,11 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
MapCache: 8afa98ddc3539a384ba75b019284cded95aaccab
Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
MapCache: 8aba59bb2231af79c2b07a7b2c303d3c63b5f291
Nimble: 1b5fa99320d0d87ed72bb0add38dc696aa77f556
OHHTTPStubs: 9cbce6364bec557cc3439aa6bb7514670d780881
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2

PODFILE CHECKSUM: f633177aab625c73613530f877c4d12c4a305fa7
PODFILE CHECKSUM: 7457c5aa836f6afd21c0dbf4a82325af9b183e31

COCOAPODS: 1.7.5
13 changes: 7 additions & 6 deletions Example/Pods/Local Podspecs/MapCache.podspec.json

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

20 changes: 10 additions & 10 deletions Example/Pods/Manifest.lock

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.

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.

Loading

0 comments on commit cc01487

Please sign in to comment.