Skip to content

Commit

Permalink
Merge pull request #97 from iosphere/feature/xcode-10
Browse files Browse the repository at this point in the history
Xcode 10 & more
  • Loading branch information
Sebastian Hagedorn authored Sep 5, 2018
2 parents 3685ef1 + 25e211a commit 4ff9a38
Show file tree
Hide file tree
Showing 23 changed files with 117 additions and 384 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
language: objective-c
osx_image: xcode8
osx_image: xcode10
install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet

script:
- set -o pipefail
# Build framework target and clean all targets between builds
- xcodebuild -project ISHPermissionKit.xcodeproj -scheme ISHPermissionKit -destination 'platform=iOS Simulator,name=iPhone 6' -derivedDataPath build/ISHPermissionKit clean build | xcpretty
- xcodebuild -project ISHPermissionKit.xcodeproj -scheme ISHPermissionKit -destination 'platform=iOS Simulator,name=iPhone 8' -derivedDataPath build/ISHPermissionKit clean build | xcpretty

# Build static lib target and clean all targets between builds
- xcodebuild -project ISHPermissionKit.xcodeproj -scheme ISHPermissionKitLib -destination 'platform=iOS Simulator,name=iPhone 6' -derivedDataPath build/ISHPermissionKitLib clean build | xcpretty
- xcodebuild -project ISHPermissionKit.xcodeproj -scheme ISHPermissionKitLib -destination 'platform=iOS Simulator,name=iPhone 8' -derivedDataPath build/ISHPermissionKitLib clean build | xcpretty

# run tests
- xcodebuild -project ISHPermissionKit.xcodeproj -scheme 'ISHPermissionKit' -destination 'platform=iOS Simulator,name=iPhone 6' -derivedDataPath build/ISHPermissionKit clean test | xcpretty
- xcodebuild -project ISHPermissionKit.xcodeproj -scheme 'ISHPermissionKit' -destination 'platform=iOS Simulator,name=iPhone 8' -derivedDataPath build/ISHPermissionKit clean test | xcpretty
15 changes: 11 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# <img src="icon.png" align="center" width="40" height="40"> Changelog

## 2.1

* Ready for Xcode 10 and iOS 12
* Bump deployment target to iOS 9
* Remove deprecated permission categories (AssetsLibrary and AddressBook-based APIs)
* Allow determination of possible requests without displaying any UI

## 2.0

This release requires additional setup to ensure your apps pass binary validation in iTunes Connect. Please study the [README](/README.md) file carefully.
Expand All @@ -13,9 +20,9 @@ This release requires additional setup to ensure your apps pass binary validatio
## 1.2.0

* Provide callback to handle true errors
* Fix issues for social media account permissions if user had no user account:
**this may require your implementations to handle the error to avoid asking the user
again for permission**
* Fix issues for social media account permissions if user had no user account:
**this may require your implementations to handle the error to avoid asking the user
again for permission**
* Add methods to query request-able and granted permissions given a set of categories
* Add some rudimentary unit tests

Expand Down Expand Up @@ -57,7 +64,7 @@ This release requires additional setup to ensure your apps pass binary validatio
## 0.6.0

* HealthKit is not used in default setting. If you need to use HealthKit please consult the readme and use the ISHPermissionKitLib+HealthKit variant.
* This is an important update if you do not use HealthKit as you might otherwise get a rejection from Apple for not providing a privacy policy or have no reason to link to HealthKit.
* This is an important update if you do not use HealthKit as you might otherwise get a rejection from Apple for not providing a privacy policy or have no reason to link to HealthKit.

## 0.5.0

Expand Down
14 changes: 7 additions & 7 deletions ISHPermissionKit.podspec
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Pod::Spec.new do |s|

s.name = 'ISHPermissionKit'
s.version = '2.0.0'
s.version = '2.1.0'
s.summary = 'A polite and unified way of asking for permission on iOS.'
s.description = 'This framework provides a unified way of asking for user permissions on iOS. It also
s.description = 'This framework provides a unified way of asking for user permissions on iOS. It also
provides UI to explain the permission requirements before presenting the system
permission dialog to the user. This allows the developer to postpone the system dialog. The framework
permission dialog to the user. This allows the developer to postpone the system dialog. The framework
provides no actual chrome, leaving the developer and designer in charge of creating the views.'

s.homepage = 'https://github.com/iosphere/ISHPermissionKit.git'
s.screenshots = 'https://raw.githubusercontent.com/iosphere/ISHPermissionKit/master/assets/demo.gif'

s.license = 'New BSD'
s.license = 'New BSD'
s.authors = { 'Felix Lamouroux' => '[email protected]' }

s.platform = :ios, '7.0'
s.platform = :ios, '9.0'
s.source = { :git => 'https://github.com/iosphere/ISHPermissionKit.git', :tag => s.version.to_s }
s.module_name = 'ISHPermissionKit'

Expand Down Expand Up @@ -61,7 +61,7 @@ Pod::Spec.new do |s|

s.subspec 'PhotoLibrary' do |photo|
photo.dependency 'ISHPermissionKit/Core'
photo.weak_framework = 'Photos', 'AssetsLibrary'
photo.weak_framework = 'Photos'
feature_flags = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'ISHPermissionRequestPhotoLibraryEnabled' }
photo.pod_target_xcconfig = feature_flags
photo.user_target_xcconfig = feature_flags
Expand Down Expand Up @@ -93,7 +93,7 @@ Pod::Spec.new do |s|

s.subspec 'Contacts' do |contacts|
contacts.dependency 'ISHPermissionKit/Core'
contacts.weak_framework = 'Contacts', 'AddressBook'
contacts.weak_framework = 'Contacts'
feature_flags = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'ISHPermissionRequestContactsEnabled' }
contacts.pod_target_xcconfig = feature_flags
contacts.user_target_xcconfig = feature_flags
Expand Down
Loading

0 comments on commit 4ff9a38

Please sign in to comment.