Skip to content

Commit c8f8d71

Browse files
arturgrigorarturgrigor
authored
Merge pull request #2 from arturgrigor/develop
Swift 5.1 and Xcode 11 support
2 parents 19d54e5 + 31a8e92 commit c8f8d71

File tree

11 files changed

+49
-26
lines changed

11 files changed

+49
-26
lines changed

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2
1+
5.1

‎.travis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode10
2+
osx_image: xcode11.2
33
branches:
44
only:
55
- master
@@ -10,13 +10,13 @@ env:
1010
- SCHEME="IPAPI"
1111
matrix:
1212
- DESTINATION="OS=4.0,name=Apple Watch Series 3 - 42mm" RUN_TESTS="NO" POD_LINT="NO"
13-
- DESTINATION="OS=2.0,name=Apple Watch - 42mm" RUN_TESTS="NO" POD_LINT="NO"
13+
- DESTINATION="OS=3.2,name=Apple Watch - 42mm" RUN_TESTS="NO" POD_LINT="NO"
1414

15-
- DESTINATION="OS=12.0,name=iPhone 8 Plus" RUN_TESTS="NO" POD_LINT="NO"
16-
- DESTINATION="OS=9.0,name=iPad 2" RUN_TESTS="NO" POD_LINT="NO"
15+
- DESTINATION="OS=13.2,name=iPhone 11 Pro Max" RUN_TESTS="NO" POD_LINT="NO"
16+
- DESTINATION="OS=10.3.1,name=iPad Air" RUN_TESTS="NO" POD_LINT="NO"
1717

18-
- DESTINATION="OS=12.0,name=Apple TV" RUN_TESTS="NO" POD_LINT="NO"
19-
- DESTINATION="OS=9.0,name=Apple TV 1080p" RUN_TESTS="NO" POD_LINT="NO"
18+
- DESTINATION="OS=13.2,name=Apple TV" RUN_TESTS="NO" POD_LINT="NO"
19+
- DESTINATION="OS=10.2,name=Apple TV 1080p" RUN_TESTS="NO" POD_LINT="NO"
2020

2121
- DESTINATION="arch=x86_64" RUN_TESTS="YES" POD_LINT="NO"
2222
script:

‎Cartfile.resolved‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "AliSoftware/OHHTTPStubs" "6.1.0"
1+
github "AliSoftware/OHHTTPStubs" "8.0.0"

‎Carthage/Checkouts/OHHTTPStubs‎

Submodule OHHTTPStubs updated 74 files

‎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.3.0'
3+
s.version = '2.1.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: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
isa = PBXProject;
333333
attributes = {
334334
LastSwiftUpdateCheck = 0900;
335-
LastUpgradeCheck = 1000;
335+
LastUpgradeCheck = 1020;
336336
ORGANIZATIONNAME = "Artur Grigor";
337337
TargetAttributes = {
338338
FE576B211E0C99E5009D4C46 = {
@@ -341,21 +341,23 @@
341341
};
342342
FEDFDB3D1FA39F7A00607D1A = {
343343
CreatedOnToolsVersion = 9.0.1;
344+
LastSwiftMigration = 1020;
344345
ProvisioningStyle = Automatic;
345346
};
346347
FEE454001E0BE8DB00D8E707 = {
347348
CreatedOnToolsVersion = 8.2.1;
348-
LastSwiftMigration = 0900;
349+
LastSwiftMigration = 1020;
349350
ProvisioningStyle = Automatic;
350351
};
351352
};
352353
};
353354
buildConfigurationList = FEE453FB1E0BE8DB00D8E707 /* Build configuration list for PBXProject "IPAPI" */;
354355
compatibilityVersion = "Xcode 3.2";
355-
developmentRegion = English;
356+
developmentRegion = en;
356357
hasScannedForEncodings = 0;
357358
knownRegions = (
358359
en,
360+
Base,
359361
);
360362
mainGroup = FEE453F71E0BE8DB00D8E707;
361363
productRefGroup = FEE454021E0BE8DB00D8E707 /* Products */;
@@ -589,6 +591,7 @@
589591
isa = XCBuildConfiguration;
590592
buildSettings = {
591593
ALWAYS_SEARCH_USER_PATHS = NO;
594+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
592595
CLANG_ANALYZER_NONNULL = YES;
593596
CLANG_ENABLE_MODULES = YES;
594597
CLANG_ENABLE_OBJC_ARC = YES;
@@ -642,7 +645,7 @@
642645
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
643646
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
644647
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
645-
SWIFT_VERSION = 4.2;
648+
SWIFT_VERSION = 5.0;
646649
TARGETED_DEVICE_FAMILY = "1,2,3,4";
647650
TVOS_DEPLOYMENT_TARGET = 9.0;
648651
VERSIONING_SYSTEM = "apple-generic";
@@ -654,6 +657,7 @@
654657
isa = XCBuildConfiguration;
655658
buildSettings = {
656659
ALWAYS_SEARCH_USER_PATHS = NO;
660+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
657661
CLANG_ANALYZER_NONNULL = YES;
658662
CLANG_ENABLE_MODULES = YES;
659663
CLANG_ENABLE_OBJC_ARC = YES;
@@ -699,7 +703,7 @@
699703
SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos watchsimulator iphonesimulator watchos iphoneos";
700704
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
701705
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
702-
SWIFT_VERSION = 4.2;
706+
SWIFT_VERSION = 5.0;
703707
TARGETED_DEVICE_FAMILY = "1,2,3,4";
704708
TVOS_DEPLOYMENT_TARGET = 9.0;
705709
VERSIONING_SYSTEM = "apple-generic";
@@ -717,6 +721,7 @@
717721
INFOPLIST_FILE = Sources/Info.plist;
718722
LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
719723
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
724+
MARKETING_VERSION = 2.1.0;
720725
PRODUCT_BUNDLE_IDENTIFIER = "me.arturgrigor.$(PRODUCT_NAME:rfc1034identifier)";
721726
PRODUCT_NAME = IPAPI;
722727
SKIP_INSTALL = YES;
@@ -734,6 +739,7 @@
734739
INFOPLIST_FILE = Sources/Info.plist;
735740
LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
736741
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
742+
MARKETING_VERSION = 2.1.0;
737743
PRODUCT_BUNDLE_IDENTIFIER = "me.arturgrigor.$(PRODUCT_NAME:rfc1034identifier)";
738744
PRODUCT_NAME = IPAPI;
739745
SKIP_INSTALL = YES;

‎IPAPI.xcodeproj/xcshareddata/xcschemes/IPAPI.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016 - 2018 Artur Grigor
3+
Copyright (c) 2016 - 2019 Artur Grigor
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Package.swift‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
1-
// swift-tools-version:3.1
1+
// swift-tools-version:5.0
22

33
import PackageDescription
44

55
let package = Package(
66
name: "IPAPI",
7-
exclude: ["Sources/Info.plist", "Sources/IPAPI.h", "Tests", "Pods"]
7+
platforms: [
8+
.iOS(.v8),
9+
.macOS(.v10_10),
10+
.tvOS(.v9),
11+
.watchOS(.v2)
12+
],
13+
products: [
14+
.library(name: "IPAPI", targets: ["IPAPI"])
15+
],
16+
targets: [
17+
.target(
18+
name: "IPAPI",
19+
path: "Sources",
20+
exclude: ["Sources/Info.plist", "Sources/IPAPI.h", "Sources/Info.plist"]
21+
)
22+
],
23+
swiftLanguageVersions: [.v5]
824
)

‎README.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
[![SwiftPM compatible](https://img.shields.io/badge/SPM-compatible-4BC51D.svg?style=flat)](https://swift.org/package-manager)
12
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
23
[![Build Status](https://travis-ci.org/arturgrigor/IPAPI.svg?branch=master)](https://travis-ci.org/arturgrigor/IPAPI)
34
[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/IPAPI.svg)](https://img.shields.io/cocoapods/v/IPAPI.svg)
@@ -11,8 +12,8 @@ http://ip-api.com Geolocation API client written in Swift.
1112
## Requirements
1213

1314
- iOS 8.0+ / macOS 10.10+ / tvOS 9.0+ / watchOS 2.0+
14-
- Xcode 10.0+
15-
- Swift 4.2+
15+
- Xcode 10.2+
16+
- Swift 5.1+
1617

1718
## Installation
1819

@@ -30,7 +31,7 @@ $ brew install carthage
3031
To integrate IPAPI into your Xcode project using Carthage, specify it in your `Cartfile`:
3132

3233
```ogdl
33-
github "arturgrigor/IPAPI" ~> 1.3
34+
github "arturgrigor/IPAPI" ~> 2.1
3435
```
3536

3637
Run `carthage update` to build the framework and drag the built `IPAPI.framework` into your Xcode project.
@@ -53,7 +54,7 @@ platform :ios, '10.0'
5354
use_frameworks!
5455

5556
target '<Your Target Name>' do
56-
pod 'IPAPI', '~> 1.3'
57+
pod 'IPAPI', '~> 2.1'
5758
end
5859
```
5960

@@ -65,13 +66,13 @@ $ pod install
6566

6667
### Swift Package Manager
6768

68-
The [Swift Package Manager](https://swift.org/package-manager/) is a tool for automating the distribution of Swift code and is integrated into the `swift` compiler. It is in early development, but IPAPI does support its use on supported platforms.
69+
The [Swift Package Manager](https://swift.org/package-manager/) is a tool for automating the distribution of Swift code and is integrated into the `swift` compiler.
6970

7071
Once you have your Swift package set up, adding IPAPI as a dependency is as easy as adding it to the `dependencies` value of your `Package.swift`.
7172

7273
```swift
7374
dependencies: [
74-
.Package(url: "https://github.com/arturgrigor/IPAPI.git", majorVersion: 1)
75+
.Package(url: "https://github.com/arturgrigor/IPAPI.git", majorVersion: 2)
7576
]
7677
```
7778

0 commit comments

Comments
 (0)