Skip to content
This repository was archived by the owner on Dec 15, 2024. It is now read-only.

Commit 1cb98a6

Browse files
committed
Merge branch 'release/3.0.0'
2 parents 371ec55 + ae7093c commit 1cb98a6

File tree

82 files changed

+2969
-6405
lines changed

Some content is hidden

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

82 files changed

+2969
-6405
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ Xcode/SwiftFoundation.xcodeproj/xcuserdata
1515
Xcode/SwiftFoundation.xcodeproj/project.xcworkspace/xcuserdata
1616

1717
.DS_Store
18+
19+
.swiftpm

.travis.yml

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
language: generic
2-
osx_image: xcode8
3-
os:
4-
- linux
5-
sudo: required
6-
dist: trusty
7-
before_install:
8-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install carthage ; fi
9-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then carthage bootstrap ; fi
10-
install:
11-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then SWIFT_DIR=tests ; fi
2+
matrix:
3+
include:
4+
# Test Ubuntu Linux 16.04 / Swift 5.2
5+
- os: linux
6+
dist: xenial
7+
sudo: required
8+
env:
9+
- SWIFT_VERSION=swift-5.2.2-RELEASE
10+
- SWIFT_URL=https://swift.org/builds/swift-5.2.2-release/ubuntu1604/swift-5.2.2-RELEASE/swift-5.2.2-RELEASE-ubuntu16.04.tar.gz
11+
install:
12+
- export PATH=$(pwd)/tests/$SWIFT_VERSION-ubuntu16.04/usr/bin:"${PATH}"
13+
# Test Xcode 11.4 / Swift 5.2.2
14+
- os: osx
15+
osx_image: xcode11.4
16+
addons:
17+
apt:
18+
packages:
19+
- clang
20+
- pkg-config
21+
script:
22+
# Setup Linux environment
1223
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update ; fi
13-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install clang uuid-dev libjson-c-dev ; fi
24+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install clang ; fi
25+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then SWIFT_DIR=tests ; fi
1426
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir $SWIFT_DIR ; fi
15-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl https://swift.org/builds/development/ubuntu1404/$SWIFT_VERSION/$SWIFT_VERSION-ubuntu14.04.tar.gz -s | tar xz -C $SWIFT_DIR &> /dev/null ; fi
16-
env:
17-
- SWIFT_VERSION=swift-DEVELOPMENT-SNAPSHOT-2016-08-04-a
18-
script:
19-
- uname
20-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xctool test -project Xcode/SwiftFoundation.xcodeproj -scheme "SwiftFoundation OS X" -sdk macosx ONLY_ACTIVE_ARCH=NO ; fi
21-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xctool build -project Xcode/SwiftFoundation.xcodeproj -scheme "SwiftFoundation iOS" -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO ; fi
22-
23-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH=$(pwd)/tests/$SWIFT_VERSION-ubuntu14.04/usr/bin:"${PATH}" ; fi
24-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then swift build ; fi
25-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then .build/debug/UnitTests ; fi
26-
27+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl $SWIFT_URL -s | tar xz -C $SWIFT_DIR &> /dev/null ; fi
28+
# Run Unit Tests
29+
- swift test

Cartfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

Cartfile.resolved

Lines changed: 0 additions & 1 deletion
This file was deleted.

Package.swift

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
1+
// swift-tools-version:5.1
12
import PackageDescription
23

4+
let libraryType: PackageDescription.Product.Library.LibraryType
5+
#if os(Linux)
6+
libraryType = .dynamic
7+
#else
8+
libraryType = .static
9+
#endif
10+
311
let package = Package(
412
name: "SwiftFoundation",
5-
dependencies: [
6-
.Package(url: "https://github.com/PureSwift/CStatfs.git", majorVersion: 1),
7-
.Package(url: "https://github.com/PureSwift/CJSONC.git", majorVersion: 1)
13+
products: [
14+
.library(
15+
name: "SwiftFoundation",
16+
type: libraryType,
17+
targets: ["SwiftFoundation"]
18+
)
819
],
9-
exclude: ["Xcode", "Carthage"]
20+
targets: [
21+
.target(name: "SwiftFoundation"),
22+
.testTarget(name: "SwiftFoundationTests", dependencies: ["SwiftFoundation"])
23+
]
1024
)

README.md

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
# SwiftFoundation #
2-
[![Swift](https://img.shields.io/badge/swift-3.0-orange.svg?style=flat)](https://developer.apple.com/swift/)
3-
[![Platforms](https://img.shields.io/badge/platform-osx%20%7C%20ios%20%7C%20watchos%20%7C%20tvos%20%7C%20linux-lightgrey.svg)](https://developer.apple.com/swift/)
2+
[![Swift](https://img.shields.io/badge/swift-5.0-orange.svg?style=flat)](https://developer.apple.com/swift/)
3+
[![Platforms](https://img.shields.io/badge/platform-osx%20%7C%20ios%20%7C%20watchos%20%7C%20tvos%20%7C%20linux%20%7C%20wasm-lightgrey.svg)](https://developer.apple.com/swift/)
44
[![Release](https://img.shields.io/github/release/pureswift/swiftfoundation.svg)](https://github.com/PureSwift/SwiftFoundation/releases)
55
[![License](https://img.shields.io/badge/license-MIT-71787A.svg)](https://tldrlegal.com/license/mit-license)
66
[![Build Status](https://travis-ci.org/PureSwift/SwiftFoundation.svg?branch=develop)](https://travis-ci.org/PureSwift/SwiftFoundation)
7-
[![Join the chat at https://gitter.im/PureSwift/SwiftFoundation](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/PureSwift/SwiftFoundation?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
8-
9-
[![SPM compatible](https://img.shields.io/badge/SPM-compatible-4BC51D.svg?style=flat)](https://github.com/apple/swift-package-manager)
10-
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
117

128
Cross-Platform, Protocol-Oriented Programming base library to complement the Swift Standard Library.
139

@@ -27,30 +23,19 @@ Cross-Platform, Protocol-Oriented Programming base library to complement the Swi
2723

2824
## Targeted Platforms
2925

30-
- LLVM Compiler
31-
- Darwin (OS X, iOS, WatchOS)
32-
- Linux
33-
34-
## Compiling on Ubuntu
35-
36-
```
37-
sudo apt-get install uuid-dev libjson-c-dev
38-
swift build
39-
.build/debug/UnitTests
40-
```
26+
- Darwin (macOS, iOS, watchOS, tvOS)
27+
- Linux (Ubuntu x86_64, [Debian Armv7](https://github.com/uraimo/buildSwiftOnARM))
28+
- [WebAssembly](https://swiftwasm.org) (wasm32)
4129

4230
## Implemented
4331
To see what parts of Foundation are implemented, just look at the unit tests. Completed functionality will be fully unit tested. Note that there is some functionality that is written as a protocol only, that will not be included on this list.
4432

4533
- [x] Base64
4634
- [x] Data
4735
- [x] Date
48-
- [x] FileManager
49-
- [x] JSON
50-
- [x] Null
51-
- [x] Order (equivalent to ```NSComparisonResult```)
52-
- [X] RegularExpression (POSIX, not ICU)
53-
- [x] SortDescriptor
36+
- [ ] FileManager
37+
- [ ] JSON
38+
- [ ] RegularExpression (POSIX, not ICU)
5439
- [x] Thread
5540
- [x] URL
5641
- [x] UUID

0 commit comments

Comments
 (0)