Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

Commit

Permalink
Merge pull request #54 from adobe/staging
Browse files Browse the repository at this point in the history
promote 2.1.2 build from staging to master
  • Loading branch information
sbenedicadb authored Dec 4, 2019
2 parents 59cbd4a + eb67b16 commit d4ba9b9
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 19 deletions.
6 changes: 3 additions & 3 deletions ACPPlacesMonitor.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ACPPlacesMonitor"
s.version = "2.1.1"
s.version = "2.1.2"
s.summary = "Places monitor for Adobe Experience Cloud SDK. Written and maintained by Adobe."
s.description = <<-DESC
The Places monitor provides native geolocation functionality, enabling use of the Places product in the V5 Adobe Experience Cloud SDK.
Expand All @@ -18,8 +18,8 @@ Pod::Spec.new do |s|

s.static_framework = true

s.dependency "ACPCore", ">= 2.3.4"
s.dependency "ACPPlaces", ">= 1.2.0"
s.dependency "ACPCore", ">= 2.3.6"
s.dependency "ACPPlaces", ">= 1.3.0"

s.subspec "iOS" do |ios|
ios.public_header_files = "ACPPlacesMonitor/ACPPlacesMonitor.h"
Expand Down
2 changes: 1 addition & 1 deletion ACPPlacesMonitor/ACPPlacesMonitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

//
// ACPPlacesMonitor.h
// Places Monitor Version: 2.1.1
// Places Monitor Version: 2.1.2
//

#import <Foundation/Foundation.h>
Expand Down
2 changes: 1 addition & 1 deletion ACPPlacesMonitor/ACPPlacesMonitorConstants.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#import "ACPPlacesMonitorConstants.h"

#pragma mark - Monitor Properties
NSString* const ACPPlacesMonitorExtensionVersion = @"2.1.1";
NSString* const ACPPlacesMonitorExtensionVersion = @"2.1.2";
NSString* const ACPPlacesMonitorExtensionName = @"com.adobe.placesMonitor";
int const ACPPlacesMonitorDefaultMaxMonitoredRegionCount = 20;

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 2.1.2 (4 Dec, 2019)
- GitHub issue #51 - Call Places API to collect `CLAuthorizationStatus` from device when it changes.

### 2.1.1 (25 Nov, 2019)
- GitHub issue #44 - Fixed import statements for Cocoapods projects using multiple pod projects option.

Expand Down
8 changes: 4 additions & 4 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ workspace 'ACPPlacesMonitor'
project 'ACPPlacesMonitor.xcodeproj'

target 'ACPPlacesMonitor_iOS' do
pod 'ACPCore', '>= 2.1.0'
pod 'ACPPlaces', '>= 1.0.0'
pod 'ACPCore', '>= 2.3.6'
pod 'ACPPlaces', '>= 1.3.0'
end

target 'ACPPlacesMonitor-iOS-unit-tests' do
pod 'ACPCore', '>= 2.1.0'
pod 'ACPPlaces', '>= 1.0.0'
pod 'ACPCore', '>= 2.3.6'
pod 'ACPPlaces', '>= 1.3.0'
pod 'OCMock', '3.4.3'
end
18 changes: 9 additions & 9 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ PODS:
- ACPCore (2.3.6):
- ACPCore/iOS (= 2.3.6)
- ACPCore/iOS (2.3.6)
- ACPPlaces (1.2.0):
- ACPCore (>= 2.3.2)
- ACPPlaces/iOS (= 1.2.0)
- ACPPlaces/iOS (1.2.0):
- ACPCore (>= 2.3.2)
- ACPPlaces (1.3.0):
- ACPCore (>= 2.3.6)
- ACPPlaces/iOS (= 1.3.0)
- ACPPlaces/iOS (1.3.0):
- ACPCore (>= 2.3.6)
- OCMock (3.4.3)

DEPENDENCIES:
- ACPCore (>= 2.1.0)
- ACPPlaces (>= 1.0.0)
- ACPCore (>= 2.3.6)
- ACPPlaces (>= 1.3.0)
- OCMock (= 3.4.3)

SPEC REPOS:
Expand All @@ -22,9 +22,9 @@ SPEC REPOS:

SPEC CHECKSUMS:
ACPCore: 1d3a5b79f172de3d998cf63b5c1538da1dd66f33
ACPPlaces: 35401daa06d6b4bb9cfb91cce62e07d871aa0f10
ACPPlaces: deef721ad68ce9abb2b547183a0a9ec326454400
OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab

PODFILE CHECKSUM: e6b5f1a437e9254655924c3febf1f623ef768d43
PODFILE CHECKSUM: b79127b500aa51cc2fc16181b75acbd1dc0dd69c

COCOAPODS: 1.8.4
11 changes: 11 additions & 0 deletions tests/ACPPlacesMonitorLocationDelegateTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -351,4 +351,15 @@ - (void) testAuthStatusStringDefaultCase {
XCTAssertEqual(@"Not Determined", result);
}

- (void) testAuthStatusChangeReportedToPlaces {
// setup
id placesMock = OCMClassMock([ACPPlaces class]);

// test
[_locationDelegate locationManager:_manager didChangeAuthorizationStatus:kCLAuthorizationStatusAuthorizedAlways];

// verify
OCMVerify([placesMock setAuthorizationStatus:kCLAuthorizationStatusAuthorizedAlways]);
}

@end
2 changes: 1 addition & 1 deletion tests/mocks/ACPPlacesMonitorConstantsTests.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define ACPPlacesMonitorConstantsTests_h

#pragma mark - Monitor Properties
static NSString* const ACPPlacesMonitorExtensionVersion_Test = @"2.1.1";
static NSString* const ACPPlacesMonitorExtensionVersion_Test = @"2.1.2";
static NSString* const ACPPlacesMonitorExtensionName_Test = @"com.adobe.placesMonitor";
static int const ACPPlacesMonitorDefaultMaxMonitoredRegionCount_Test = 20;

Expand Down

0 comments on commit d4ba9b9

Please sign in to comment.