Skip to content

Commit d6981d7

Browse files
committed
Migrated project to Xcode 9.3 and Swift 4.1.
1 parent 22c2aec commit d6981d7

File tree

11 files changed

+35
-23
lines changed

11 files changed

+35
-23
lines changed

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Changelog
22

3+
## 1.4 (2018-03-30)
4+
- Migrated project to Xcode 9.3 and Swift 4
5+
- Bug fixes (esp. in `syntax-rules`)
6+
- Fixed logic for referencing `unquote`, etc. in `backquote`.
7+
- Include native date/time operations and functionality for accessing user data
8+
- Native support for a few common string functions
9+
- Support for `read-token` (generalization of `read-line`)
10+
- Added libraries `(lispkit stack)`, `(lispkit queue)`, `(lispkit logic)`
11+
- Implement bitwise operations for exact integers of arbitrary size
12+
- Complete rewrite of the error reporting and representation sub-system
13+
- Preparations for managing source locations
14+
315
## 1.3 (2017-12-03)
416
- Support simple HTTP API
517
- Support compression for bytevectors

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "objecthub/swift-numberkit" ~> 2.1.0
1+
github "objecthub/swift-numberkit" ~> 2.2.0

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "objecthub/swift-numberkit" "2.1.0"
1+
github "objecthub/swift-numberkit" "2.2.0"

LispKit.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@
10741074
isa = PBXProject;
10751075
attributes = {
10761076
LastSwiftUpdateCheck = 0730;
1077-
LastUpgradeCheck = 0900;
1077+
LastUpgradeCheck = 0930;
10781078
ORGANIZATIONNAME = ObjectHub;
10791079
TargetAttributes = {
10801080
CC1227351CBFE74500821EB7 = {
@@ -1317,12 +1317,14 @@
13171317
CLANG_WARN_BOOL_CONVERSION = YES;
13181318
CLANG_WARN_COMMA = YES;
13191319
CLANG_WARN_CONSTANT_CONVERSION = YES;
1320+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
13201321
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
13211322
CLANG_WARN_EMPTY_BODY = YES;
13221323
CLANG_WARN_ENUM_CONVERSION = YES;
13231324
CLANG_WARN_INFINITE_RECURSION = YES;
13241325
CLANG_WARN_INT_CONVERSION = YES;
13251326
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1327+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
13261328
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
13271329
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
13281330
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1374,12 +1376,14 @@
13741376
CLANG_WARN_BOOL_CONVERSION = YES;
13751377
CLANG_WARN_COMMA = YES;
13761378
CLANG_WARN_CONSTANT_CONVERSION = YES;
1379+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
13771380
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
13781381
CLANG_WARN_EMPTY_BODY = YES;
13791382
CLANG_WARN_ENUM_CONVERSION = YES;
13801383
CLANG_WARN_INFINITE_RECURSION = YES;
13811384
CLANG_WARN_INT_CONVERSION = YES;
13821385
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1386+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
13831387
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
13841388
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
13851389
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

LispKit.xcodeproj/xcshareddata/xcschemes/LispKit.xcscheme

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
30-
shouldUseLaunchSchemeArgsEnv = "YES"
31-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3231
<Testables>
3332
<TestableReference
3433
skipped = "NO">
@@ -57,7 +56,6 @@
5756
buildConfiguration = "Debug"
5857
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5958
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60-
language = ""
6159
launchStyle = "0"
6260
useCustomWorkingDirectory = "NO"
6361
ignoresPersistentStateOnLaunch = "NO"

LispKit.xcodeproj/xcshareddata/xcschemes/LispKitRepl.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
========================
33

44
[![Platform: macOS](https://img.shields.io/badge/Platform-macOS-blue.svg?style=flat)](https://developer.apple.com/osx/)
5-
[![Language: Swift 4.0](https://img.shields.io/badge/Language-Swift%204.0-green.svg?style=flat)](https://developer.apple.com/swift/)
6-
[![IDE: Xcode 9.2](https://img.shields.io/badge/IDE-Xcode%209.2-orange.svg?style=flat)](https://developer.apple.com/xcode/)
5+
[![Language: Swift 4.1](https://img.shields.io/badge/Language-Swift%204.1-green.svg?style=flat)](https://developer.apple.com/swift/)
6+
[![IDE: Xcode 9.3](https://img.shields.io/badge/IDE-Xcode%209.3-orange.svg?style=flat)](https://developer.apple.com/xcode/)
77
[![Carthage: compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
88
[![License: Apache](http://img.shields.io/badge/License-Apache-lightgrey.svg?style=flat)](https://raw.githubusercontent.com/objecthub/swift-lispkit/master/LICENSE)
99

@@ -171,7 +171,7 @@ Linking ./.build/x86_64-apple-macosx10.10/release/LispKitRepl
171171
The read-eval-print loop can be built using the Swift Package Manager. Nevertheless, it is
172172
recommended to use Xcode 9 in combination with Carthage:
173173

174-
- [Xcode 9.2](https://developer.apple.com/xcode/)
174+
- [Xcode 9.3](https://developer.apple.com/xcode/)
175175
- [Carthage](https://github.com/Carthage/Carthage)
176-
- [Swift 4.0](https://developer.apple.com/swift/)
176+
- [Swift 4.1](https://developer.apple.com/swift/)
177177
- [NumberKit](http://github.com/objecthub/swift-numberkit)

Sources/LispKit/Base/Compression.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public extension Data {
119119
}
120120
let streamBase = UnsafeMutablePointer<compression_stream>.allocate(capacity: 1)
121121
defer {
122-
streamBase.deallocate(capacity: 1)
122+
streamBase.deallocate()
123123
}
124124
var stream = streamBase.pointee
125125
let status = compression_stream_init(&stream, operation, algorithm)
@@ -132,7 +132,7 @@ public extension Data {
132132
let bufferSize = count < 64 ? 64 : count > 32768 ? 32768 : count
133133
let buffer = UnsafeMutablePointer<UInt8>.allocate(capacity: bufferSize)
134134
defer {
135-
buffer.deallocate(capacity: bufferSize)
135+
buffer.deallocate()
136136
}
137137
stream.dst_ptr = buffer
138138
stream.dst_size = bufferSize

Sources/LispKit/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.3.1</string>
18+
<string>1.4.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
2222
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>NSHumanReadableCopyright</key>
24-
<string>Copyright © 2016–2017 Matthias Zenger. All rights reserved.</string>
24+
<string>Copyright © 2016–2018 Matthias Zenger. All rights reserved.</string>
2525
<key>NSPrincipalClass</key>
2626
<string></string>
2727
</dict>

Sources/LispKitRepl/Info.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.3.1</string>
18+
<string>1.4.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1.3.1</string>
22+
<string>1.4.0</string>
2323
<key>LSMinimumSystemVersion</key>
2424
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2525
<key>NSHumanReadableCopyright</key>
26-
<string>Copyright © 2017 Matthias Zenger. All rights reserved.</string>
26+
<string>Copyright © 2016–2018 Matthias Zenger. All rights reserved.</string>
2727
</dict>
2828
</plist>

Sources/LispKitRepl/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ let console = CommandLineConsole()
2828
#if SPM
2929
let context = Context(console: console,
3030
implementationName: "LispKit",
31-
implementationVersion: "1.3.1")
31+
implementationVersion: "1.4.0")
3232
#else
3333
let context = Context(console: console)
3434
#endif

0 commit comments

Comments
 (0)