Skip to content

Commit 2d86f50

Browse files
committed
Swift 3.2 support. Deintegrated CocoaPods for the Tests target. Created just 1 scheme that supports all platforms. Updated the Travis CI config.
1 parent b077fc4 commit 2d86f50

84 files changed

Lines changed: 379 additions & 4917 deletions

File tree

Some content is hidden

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

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Carthage/Checkouts/OHHTTPStubs"]
2+
path = Carthage/Checkouts/OHHTTPStubs
3+
url = https://github.com/AliSoftware/OHHTTPStubs.git

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1
1+
4

.travis.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
language: objective-c
2-
osx_image: xcode8
2+
osx_image: xcode9
3+
branches:
4+
only:
5+
- master
36
env:
47
global:
58
- LC_CTYPE=en_US.UTF-8
69
- LANG=en_US.UTF-8
710
- WORKSPACE=IPAPI.xcworkspace
8-
- IOS_FRAMEWORK_SCHEME="IPAPI iOS"
9-
- MACOS_FRAMEWORK_SCHEME="IPAPI macOS"
10-
- TVOS_FRAMEWORK_SCHEME="IPAPI tvOS"
11-
- WATCHOS_FRAMEWORK_SCHEME="IPAPI watchOS"
11+
- FRAMEWORK_SCHEME="IPAPI"
1212
matrix:
13-
- DESTINATION="OS=3.0,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" POD_LINT="NO"
14-
- DESTINATION="OS=2.0,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" POD_LINT="NO"
13+
- DESTINATION="OS=3.0,name=Apple Watch - 42mm" SCHEME="$FRAMEWORK_SCHEME" RUN_TESTS="NO" POD_LINT="NO"
14+
- DESTINATION="OS=2.0,name=Apple Watch - 42mm" SCHEME="$FRAMEWORK_SCHEME" RUN_TESTS="NO" POD_LINT="NO"
1515

16-
- DESTINATION="OS=10.0,name=iPhone 7 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="YES"
17-
- DESTINATION="OS=9.0,name=iPad 2" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO"
16+
- DESTINATION="OS=10.0,name=iPhone 7 Plus" SCHEME="$FRAMEWORK_SCHEME" RUN_TESTS="NO" POD_LINT="YES"
17+
- DESTINATION="OS=9.0,name=iPad 2" SCHEME="$FRAMEWORK_SCHEME" RUN_TESTS="NO" POD_LINT="NO"
1818

19-
- DESTINATION="OS=10.0,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO"
20-
- DESTINATION="OS=9.0,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO"
19+
- DESTINATION="OS=10.0,name=Apple TV 1080p" SCHEME="$FRAMEWORK_SCHEME" RUN_TESTS="NO" POD_LINT="NO"
20+
- DESTINATION="OS=9.0,name=Apple TV 1080p" SCHEME="$FRAMEWORK_SCHEME" RUN_TESTS="NO" POD_LINT="NO"
2121

22-
- DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO"
22+
- DESTINATION="arch=x86_64" SCHEME="$FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO"
2323
script:
2424
- set -o pipefail
25+
- git submodule update --init
2526
- xcodebuild -version
2627

2728
# Build Framework in Debug and Run Tests if specified

Cartfile.private

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "AliSoftware/OHHTTPStubs"

Cartfile.resolved

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "AliSoftware/OHHTTPStubs" "6.0.0"

Carthage/Checkouts/OHHTTPStubs

Submodule OHHTTPStubs added at f90c2bb

IPAPI.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'IPAPI'
3-
s.version = '1.1.1'
3+
s.version = '1.2.0'
44
s.license = 'MIT'
55
s.summary = 'http://ip-api.com Geolocation API client written in Swift.'
66
s.homepage = 'https://github.com/arturgrigor/IPAPI'

IPAPI.xcodeproj/project.pbxproj

Lines changed: 285 additions & 674 deletions
Large diffs are not rendered by default.

IPAPI.xcodeproj/xcshareddata/xcschemes/IPAPI macOS.xcscheme

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)