Skip to content

Commit 36a176c

Browse files
committed
Merge remote-tracking branch 'origin/develop' into release/release-0.2.0
# Conflicts: # JamfKit.podspec
2 parents 5772bd5 + 7db823e commit 36a176c

File tree

189 files changed

+9162
-1214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+9162
-1214
lines changed

.jazzy.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
author: Ethenyl
22
author_url: https://github.com/Ethenyl
3-
github_url: https://github.com/Ethenyl/JAMFKit
4-
root_url: https://ethenyl.github.io/JAMFKit/
5-
module: JAMFKit
3+
github_url: https://github.com/Ethenyl/JamfKit
4+
root_url: https://ethenyl.github.io/JamfKit/
5+
module: JamfKit
66
output: docs
77
theme: fullwidth
8-
xcodebuild_arguments: [-workspace, 'JAMFKit.xcworkspace', -scheme, 'JAMFKit iOS']
8+
xcodebuild_arguments: [-workspace, 'JamfKit.xcworkspace', -scheme, 'JamfKit iOS']

.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2
1+
4.0

.travis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
os: osx
22
language: objective-c
3-
osx_image: xcode8.3
3+
osx_image: xcode9.2
44

55
env:
66
global:
7-
- WORKSPACE="JAMFKit.xcworkspace"
8-
matrix:
9-
- PLATFORM="macOS" SCHEME="JAMFKit macOS" DESTINATION="arch=x86_64"
10-
- PLATFORM="iOS" SCHEME="JAMFKit iOS" DESTINATION='platform=iOS Simulator,name=iPhone 7'
7+
- WORKSPACE="JamfKit.xcworkspace"
8+
matrix:
9+
- PLATFORM="macOS" SCHEME="JamfKit macOS" DESTINATION="arch=x86_64"
10+
- PLATFORM="iOS" SCHEME="JamfKit iOS" DESTINATION='platform=iOS Simulator,name=iPhone 8'
1111

1212
before_install:
1313
- gem install xcpretty
@@ -16,4 +16,4 @@ script:
1616
- set -o pipefail && xcodebuild clean test -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" | xcpretty
1717

1818
after_success:
19-
- bash <(curl -s https://codecov.io/bash) -J 'JAMFKit'
19+
- bash <(curl -s https://codecov.io/bash) -J 'JamfKit'

Assets/JamfKit_1024.png

71.1 KB
Loading

Assets/JamfKit_256.png

13.2 KB
Loading

Assets/JamfKit_512.png

29.7 KB
Loading

Assets/JamfKit_Black_1024.png

53.2 KB
Loading

Assets/JamfKit_Black_256.png

8.48 KB
Loading

Assets/JamfKit_Black_512.png

20.7 KB
Loading

Assets/JamfKit_White_1024.png

58.8 KB
Loading

Assets/JamfKit_White_256.png

9.44 KB
Loading

Assets/JamfKit_White_512.png

22.6 KB
Loading

JAMFKit/.swift-version

-1
This file was deleted.

0 commit comments

Comments
 (0)