Skip to content

Commit d378133

Browse files
mxclmxcl
authored
Merge pull request #32 from master-nevi/master
Add SwiftPM and Github actions support
2 parents e0e74c5 + 8234da8 commit d378133

13 files changed

Lines changed: 111 additions & 18 deletions

File tree

‎.github/workflows/CI.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "OMGHTTPURLRQ CI"
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- '*'
10+
11+
jobs:
12+
Pods:
13+
name: Cocoapods Lint (Latest Stable Xcode)
14+
runs-on: macOS-11
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v2
18+
19+
- name: Setup Xcode version
20+
uses: maxim-lobanov/setup-xcode@v1.4.0
21+
with:
22+
xcode-version: latest-stable
23+
24+
- name: Run pod lib lint
25+
run: pod lib lint --fail-fast
26+
27+
SwiftPM:
28+
name: SwiftPM (Latest Stable Xcode)
29+
runs-on: macOS-11
30+
steps:
31+
- name: Checkout
32+
uses: actions/checkout@v2
33+
34+
- name: Setup Xcode version
35+
uses: maxim-lobanov/setup-xcode@v1.4.0
36+
with:
37+
xcode-version: latest-stable
38+
39+
- name: Build
40+
run: swift build
41+
42+
- name: Run tests
43+
run: swift test

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
/Carthage
22
/Cartfile.resolved
33
xcuserdata
4-
.DS_Store
4+
.DS_Store
5+
6+
# Swift Package Manager
7+
.build/
8+
.swiftpm/
9+
Package.resolved

‎.travis.yml‎

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

‎OMGHTTPURLRQ.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ Pod::Spec.new do |s|
2323
s.default_subspecs = 'RQ'
2424

2525
s.subspec 'RQ' do |ss|
26-
ss.source_files = 'Sources/OMGHTTPURLRQ.{h,m}'
26+
ss.source_files = 'Sources/RQ/OMGHTTPURLRQ.{h,m}'
2727
ss.dependency 'OMGHTTPURLRQ/UserAgent'
2828
ss.dependency 'OMGHTTPURLRQ/FormURLEncode'
2929
end
3030

3131
s.subspec 'UserAgent' do |ss|
32-
ss.source_files = 'Sources/OMGUserAgent.{h,m}'
32+
ss.source_files = 'Sources/UserAgent/OMGUserAgent.{h,m}'
3333
end
3434

3535
s.subspec 'FormURLEncode' do |ss|
36-
ss.source_files = 'Sources/OMGFormURLEncode.{h,m}'
36+
ss.source_files = 'Sources/FormURLEncode/OMGFormURLEncode.{h,m}'
3737
end
3838

3939
end

‎OMGHTTPURLRQ.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
/* End PBXBuildFile section */
1919

2020
/* Begin PBXFileReference section */
21-
51D4A3D61BAC562700BC6AE2 /* OMGFormURLEncode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OMGFormURLEncode.h; path = Sources/OMGFormURLEncode.h; sourceTree = "<group>"; };
22-
51D4A3D81BAC562700BC6AE2 /* OMGUserAgent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OMGUserAgent.h; path = Sources/OMGUserAgent.h; sourceTree = "<group>"; };
21+
51D4A3D61BAC562700BC6AE2 /* OMGFormURLEncode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OMGFormURLEncode.h; path = Sources/FormURLEncode/OMGFormURLEncode.h; sourceTree = "<group>"; };
22+
51D4A3D81BAC562700BC6AE2 /* OMGUserAgent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OMGUserAgent.h; path = Sources/UserAgent/OMGUserAgent.h; sourceTree = "<group>"; };
2323
635FC0261AB8AE4600E3CFFE /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
24-
6364E0251A7FFDED00F83CA1 /* OMGFormURLEncode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OMGFormURLEncode.h; path = Sources/OMGFormURLEncode.h; sourceTree = "<group>"; };
25-
6364E0261A7FFDED00F83CA1 /* OMGFormURLEncode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OMGFormURLEncode.m; path = Sources/OMGFormURLEncode.m; sourceTree = "<group>"; };
26-
6364E0271A7FFDED00F83CA1 /* OMGHTTPURLRQ.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OMGHTTPURLRQ.h; path = Sources/OMGHTTPURLRQ.h; sourceTree = "<group>"; };
27-
6364E0281A7FFDED00F83CA1 /* OMGHTTPURLRQ.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OMGHTTPURLRQ.m; path = Sources/OMGHTTPURLRQ.m; sourceTree = "<group>"; };
28-
6364E0291A7FFDED00F83CA1 /* OMGUserAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OMGUserAgent.h; path = Sources/OMGUserAgent.h; sourceTree = "<group>"; };
29-
6364E02A1A7FFDED00F83CA1 /* OMGUserAgent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OMGUserAgent.m; path = Sources/OMGUserAgent.m; sourceTree = "<group>"; };
24+
6364E0251A7FFDED00F83CA1 /* OMGFormURLEncode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OMGFormURLEncode.h; path = Sources/FormURLEncode/OMGFormURLEncode.h; sourceTree = "<group>"; };
25+
6364E0261A7FFDED00F83CA1 /* OMGFormURLEncode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OMGFormURLEncode.m; path = Sources/FormURLEncode/OMGFormURLEncode.m; sourceTree = "<group>"; };
26+
6364E0271A7FFDED00F83CA1 /* OMGHTTPURLRQ.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OMGHTTPURLRQ.h; path = Sources/RQ/OMGHTTPURLRQ.h; sourceTree = "<group>"; };
27+
6364E0281A7FFDED00F83CA1 /* OMGHTTPURLRQ.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OMGHTTPURLRQ.m; path = Sources/RQ/OMGHTTPURLRQ.m; sourceTree = "<group>"; };
28+
6364E0291A7FFDED00F83CA1 /* OMGUserAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OMGUserAgent.h; path = Sources/UserAgent/OMGUserAgent.h; sourceTree = "<group>"; };
29+
6364E02A1A7FFDED00F83CA1 /* OMGUserAgent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OMGUserAgent.m; path = Sources/UserAgent/OMGUserAgent.m; sourceTree = "<group>"; };
3030
636A05041A7FFFE600EA66E1 /* OMGFormURLEncodeTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OMGFormURLEncodeTestCase.m; path = Tests/OMGFormURLEncodeTestCase.m; sourceTree = "<group>"; };
3131
63EDFE721A7FFD0E0030F974 /* OMGHTTPURLRQ.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OMGHTTPURLRQ.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3232
63EDFE7D1A7FFD0E0030F974 /* OMGTest.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OMGTest.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -237,7 +237,7 @@
237237
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
238238
COMBINE_HIDPI_IMAGES = YES;
239239
COPY_PHASE_STRIP = NO;
240-
CURRENT_PROJECT_VERSION = 3.2.4;
240+
CURRENT_PROJECT_VERSION = 3.3.0;
241241
DEFINES_MODULE = YES;
242242
DYLIB_COMPATIBILITY_VERSION = 1;
243243
DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
@@ -295,7 +295,7 @@
295295
CLANG_WARN_UNREACHABLE_CODE = YES;
296296
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
297297
COMBINE_HIDPI_IMAGES = YES;
298-
CURRENT_PROJECT_VERSION = 3.2.4;
298+
CURRENT_PROJECT_VERSION = 3.3.0;
299299
DEFINES_MODULE = YES;
300300
DYLIB_COMPATIBILITY_VERSION = 1;
301301
DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";

‎Package.swift‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// swift-tools-version:5.3
2+
3+
import PackageDescription
4+
5+
let package = Package(
6+
name: "OMGHTTPURLRQ",
7+
platforms: [
8+
.iOS(.v9),
9+
.tvOS(.v9),
10+
.watchOS(.v2),
11+
.macOS(.v10_10)
12+
],
13+
products: [
14+
.library(
15+
name: "OMGHTTPURLRQ",
16+
targets: ["OMGHTTPURLRQ"]),
17+
.library(
18+
name: "OMGHTTPURLRQUserAgent",
19+
targets: ["OMGHTTPURLRQUserAgent"]),
20+
.library(
21+
name: "OMGHTTPURLRQFormURLEncode",
22+
targets: ["OMGHTTPURLRQFormURLEncode"]),
23+
],
24+
dependencies: [],
25+
targets: [
26+
.target(
27+
name: "OMGHTTPURLRQ",
28+
dependencies: [
29+
"OMGHTTPURLRQUserAgent",
30+
"OMGHTTPURLRQFormURLEncode"
31+
],
32+
path: "Sources/RQ",
33+
publicHeadersPath: "."),
34+
.target(
35+
name: "OMGHTTPURLRQUserAgent",
36+
path: "Sources/UserAgent",
37+
publicHeadersPath: "."),
38+
.target(
39+
name: "OMGHTTPURLRQFormURLEncode",
40+
path: "Sources/FormURLEncode",
41+
publicHeadersPath: "."),
42+
.testTarget(
43+
name: "OMGHTTPURLRQTests",
44+
dependencies: ["OMGHTTPURLRQ"],
45+
path: "Tests",
46+
exclude: ["Tests-Info.plist"]),
47+
]
48+
)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# OMGHTTPURLRQ [![Build Status](https://travis-ci.org/mxcl/OMGHTTPURLRQ.svg?branch=master)](https://travis-ci.org/mxcl/OMGHTTPURLRQ)
1+
# OMGHTTPURLRQ ![Build Status](https://github.com/mxcl/OMGHTTPURLRQ/actions/workflows/CI.yml/badge.svg)
22

33
[![Join the chat at https://gitter.im/mxcl/OMGHTTPURLRQ](https://badges.gitter.im/mxcl/OMGHTTPURLRQ.svg)](https://gitter.im/mxcl/OMGHTTPURLRQ?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
44

Sources/OMGFormURLEncode.h renamed to Sources/FormURLEncode/OMGFormURLEncode.h

File renamed without changes.

Sources/OMGFormURLEncode.m renamed to Sources/FormURLEncode/OMGFormURLEncode.m

File renamed without changes.

Sources/OMGHTTPURLRQ.h renamed to Sources/RQ/OMGHTTPURLRQ.h

File renamed without changes.

0 commit comments

Comments
 (0)