1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-09-11 17:15:34 +03:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Tae Won Ha
6045c88d67
Update neovim 2022-05-22 16:44:25 +02:00
Tae Won Ha
c017466cc6
Use swift-tools 5.6 and bump Nimble to 10.0.0 2022-05-22 15:54:52 +02:00
17 changed files with 184 additions and 214 deletions

View File

@ -1,4 +1,4 @@
// swift-tools-version:5.3
// swift-tools-version:5.6
import PackageDescription
@ -9,7 +9,7 @@ let package = Package(
.library(name: "Commons", targets: ["Commons", "CommonsObjC"]),
],
dependencies: [
.package(url: "https://github.com/Quick/Nimble", .upToNextMinor(from: "9.2.1")),
.package(url: "https://github.com/Quick/Nimble", from: "10.0.0"),
],
targets: [
.target(name: "Commons", dependencies: []),

View File

@ -90,7 +90,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1200;
LastUpgradeCheck = 1330;
LastUpgradeCheck = 1340;
TargetAttributes = {
4B7FBFF724EC936C002D12A1 = {
CreatedOnToolsVersion = 12.0;

@ -1 +1 @@
Subproject commit f42fde64d27b4e4470159cf54440c6c6c0f72907
Subproject commit 53c4b2ebbd110c9f9305c1bfe397ebb7d95f4f99

View File

@ -1,4 +1,4 @@
// swift-tools-version:5.3
// swift-tools-version:5.6
import PackageDescription
@ -9,13 +9,9 @@ let package = Package(
.library(name: "NvimView", targets: ["NvimView"]),
],
dependencies: [
.package(
name: "MessagePack",
url: "https://github.com/a2/MessagePack.swift",
.upToNextMinor(from: "4.0.0")
),
.package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMinor(from: "6.5.0")),
.package(url: "https://github.com/Quick/Nimble", .upToNextMinor(from: "9.2.1")),
.package(url: "https://github.com/a2/MessagePack.swift", from: "4.0.0"),
.package(url: "https://github.com/ReactiveX/RxSwift", from: "6.5.0"),
.package(url: "https://github.com/Quick/Nimble", from: "10.0.0"),
.package(name: "NvimServer", path: "../NvimServer"),
.package(name: "RxPack", path: "../RxPack"),
.package(name: "Commons", path: "../Commons"),
@ -29,7 +25,7 @@ let package = Package(
"RxPack",
"Tabs",
.product(name: "NvimServerTypes", package: "NvimServer"),
"MessagePack",
.product(name: "MessagePack", package: "MessagePack.swift"),
"Commons",
],
// com.qvacua.NvimView.vim is copied by the download NvimServer script.
@ -39,9 +35,6 @@ let package = Package(
.copy("Resources/NvimServer"),
]
),
.testTarget(
name: "NvimViewTests",
dependencies: ["NvimView", "Nimble"]
),
.testTarget(name: "NvimViewTests", dependencies: ["NvimView", "Nimble"]),
]
)

View File

@ -311,7 +311,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1200;
LastUpgradeCheck = 1330;
LastUpgradeCheck = 1340;
ORGANIZATIONNAME = "Tae Won Ha";
TargetAttributes = {
4B0225EF224AAE260052362B = {

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

View File

@ -1,4 +1,4 @@
// swift-tools-version:5.3
// swift-tools-version:5.6
import PackageDescription
@ -10,26 +10,16 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMinor(from: "6.5.0")),
.package(
name: "MessagePack",
url: "https://github.com/a2/MessagePack.swift",
.upToNextMinor(from: "4.0.0")
),
.package(
name: "Socket",
url: "https://github.com/IBM-Swift/BlueSocket",
.upToNextMinor(from: "2.0.2")
),
.package(url: "https://github.com/Quick/Nimble", .upToNextMinor(from: "9.2.1")),
.package(url: "https://github.com/a2/MessagePack.swift", from: "4.0.0"),
.package(url: "https://github.com/IBM-Swift/BlueSocket", from: "2.0.2"),
.package(url: "https://github.com/Quick/Nimble", from: "10.0.0"),
],
targets: [
.target(
name: "RxPack",
dependencies: ["RxSwift", "MessagePack", "Socket"]
),
.testTarget(
name: "RxPackTests",
dependencies: ["RxPack", "Nimble"]
),
.target(name: "RxPack", dependencies: [
"RxSwift",
.product(name: "MessagePack", package: "MessagePack.swift"),
.product(name: "Socket", package: "BlueSocket"),
]),
.testTarget(name: "RxPackTests", dependencies: ["RxPack", "Nimble"]),
]
)

View File

@ -107,7 +107,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1020;
LastUpgradeCheck = 1330;
LastUpgradeCheck = 1340;
ORGANIZATIONNAME = "Tae Won Ha";
TargetAttributes = {
4B02265B224AB1490052362B = {

View File

@ -1,5 +1,4 @@
// swift-tools-version:5.3
// The swift-tools-version declares the minimum version of Swift required to build this package.
// swift-tools-version:5.6
import PackageDescription
@ -10,25 +9,17 @@ let package = Package(
.library(name: "Tabs", targets: ["Tabs"]),
],
dependencies: [
.package(
name: "MaterialIcons",
url: "https://github.com/qvacua/material-icons",
.upToNextMinor(from: "0.1.0")
),
.package(
name: "PureLayout",
url: "https://github.com/PureLayout/PureLayout",
.upToNextMinor(from: "3.1.9")
),
.package(url: "https://github.com/qvacua/material-icons", from: "0.1.0"),
.package(url: "https://github.com/PureLayout/PureLayout", from: "3.1.9"),
],
targets: [
.target(
name: "Tabs",
dependencies: ["PureLayout", "MaterialIcons"]
),
.testTarget(
name: "TabsTests",
dependencies: ["Tabs"]
dependencies: [
"PureLayout",
.product(name: "MaterialIcons", package: "material-icons"),
]
),
.testTarget(name: "TabsTests", dependencies: ["Tabs"]),
]
)

View File

@ -98,7 +98,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1220;
LastUpgradeCheck = 1330;
LastUpgradeCheck = 1340;
TargetAttributes = {
4BEBD4B5256A76BB002218F8 = {
CreatedOnToolsVersion = 12.2;

View File

@ -1,142 +1,140 @@
{
"object": {
"pins": [
{
"package": "Socket",
"repositoryURL": "https://github.com/IBM-Swift/BlueSocket",
"state": {
"branch": null,
"revision": "dd924c3bc2c1c144c42b8dda3896f1a03115ded4",
"version": "2.0.2"
}
},
{
"package": "CwlCatchException",
"repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
"state": {
"branch": null,
"revision": "f809deb30dc5c9d9b78c872e553261a61177721a",
"version": "2.0.0"
}
},
{
"package": "CwlPreconditionTesting",
"repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
"state": {
"branch": null,
"revision": "fb7a26374e8570ff5c68142e5c83406d6abae0d8",
"version": "2.0.2"
}
},
{
"package": "DictionaryCoding",
"repositoryURL": "https://github.com/elegantchaos/DictionaryCoding",
"state": {
"branch": null,
"revision": "ae19e456bd550fed8f341e5bae4318333c53a5b4",
"version": "1.0.9"
}
},
{
"package": "Down",
"repositoryURL": "https://github.com/johnxnguyen/Down",
"state": {
"branch": null,
"revision": "f34b166be1f1db4aa8f573067e901d72f2a6be57",
"version": "0.11.0"
}
},
{
"package": "EonilFSEvents",
"repositoryURL": "https://github.com/eonil/FSEvents",
"state": {
"branch": null,
"revision": "e6b7cdfa2754454e194a45ee6c2004d0f630fe88",
"version": "0.1.7"
}
},
{
"package": "MaterialIcons",
"repositoryURL": "https://github.com/qvacua/material-icons",
"state": {
"branch": null,
"revision": "c3db645060fd27df5f7e0a9873c2af22c280725e",
"version": "0.1.0"
}
},
{
"package": "MessagePack",
"repositoryURL": "https://github.com/a2/MessagePack.swift",
"state": {
"branch": null,
"revision": "27b35fd49e92fcae395bf8ccb233499d89cc7890",
"version": "4.0.0"
}
},
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble",
"state": {
"branch": null,
"revision": "c93f16c25af5770f0d3e6af27c9634640946b068",
"version": "9.2.1"
}
},
{
"package": "PureLayout",
"repositoryURL": "https://github.com/PureLayout/PureLayout",
"state": {
"branch": null,
"revision": "5561683c96dc49b023c1299bfe4f6fbeed5f8199",
"version": "3.1.9"
}
},
{
"package": "RxSwift",
"repositoryURL": "https://github.com/ReactiveX/RxSwift",
"state": {
"branch": null,
"revision": "b4307ba0b6425c0ba4178e138799946c3da594f8",
"version": "6.5.0"
}
},
{
"package": "ShortcutRecorder",
"repositoryURL": "https://github.com/Kentzo/ShortcutRecorder",
"state": {
"branch": null,
"revision": "07b065085e172d85b7b5a0f3cc05f6ed47ad5af1",
"version": "3.3.0"
}
},
{
"package": "Sparkle",
"repositoryURL": "https://github.com/sparkle-project/Sparkle",
"state": {
"branch": null,
"revision": "286edd1fa22505a9e54d170e9fd07d775ea233f2",
"version": "2.1.0"
}
},
{
"package": "swift-argument-parser",
"repositoryURL": "https://github.com/apple/swift-argument-parser",
"state": {
"branch": null,
"revision": "6b2aa2748a7881eebb9f84fb10c01293e15b52ca",
"version": "0.5.0"
}
},
{
"package": "Swifter",
"repositoryURL": "https://github.com/httpswift/swifter",
"state": {
"branch": null,
"revision": "9483a5d459b45c3ffd059f7b55f9638e268632fd",
"version": "1.5.0"
}
"pins" : [
{
"identity" : "bluesocket",
"kind" : "remoteSourceControl",
"location" : "https://github.com/IBM-Swift/BlueSocket",
"state" : {
"revision" : "dd924c3bc2c1c144c42b8dda3896f1a03115ded4",
"version" : "2.0.2"
}
]
},
"version": 1
},
{
"identity" : "cwlcatchexception",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattgallagher/CwlCatchException.git",
"state" : {
"revision" : "f809deb30dc5c9d9b78c872e553261a61177721a",
"version" : "2.0.0"
}
},
{
"identity" : "cwlpreconditiontesting",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git",
"state" : {
"revision" : "c21f7bab5ca8eee0a9998bbd17ca1d0eb45d4688",
"version" : "2.1.0"
}
},
{
"identity" : "dictionarycoding",
"kind" : "remoteSourceControl",
"location" : "https://github.com/elegantchaos/DictionaryCoding",
"state" : {
"revision" : "ae19e456bd550fed8f341e5bae4318333c53a5b4",
"version" : "1.0.9"
}
},
{
"identity" : "down",
"kind" : "remoteSourceControl",
"location" : "https://github.com/johnxnguyen/Down",
"state" : {
"revision" : "f34b166be1f1db4aa8f573067e901d72f2a6be57",
"version" : "0.11.0"
}
},
{
"identity" : "fsevents",
"kind" : "remoteSourceControl",
"location" : "https://github.com/eonil/FSEvents",
"state" : {
"revision" : "e6b7cdfa2754454e194a45ee6c2004d0f630fe88",
"version" : "0.1.7"
}
},
{
"identity" : "material-icons",
"kind" : "remoteSourceControl",
"location" : "https://github.com/qvacua/material-icons",
"state" : {
"revision" : "c3db645060fd27df5f7e0a9873c2af22c280725e",
"version" : "0.1.0"
}
},
{
"identity" : "messagepack.swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/a2/MessagePack.swift",
"state" : {
"revision" : "27b35fd49e92fcae395bf8ccb233499d89cc7890",
"version" : "4.0.0"
}
},
{
"identity" : "nimble",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Quick/Nimble",
"state" : {
"revision" : "1f3bde57bde12f5e7b07909848c071e9b73d6edc",
"version" : "10.0.0"
}
},
{
"identity" : "purelayout",
"kind" : "remoteSourceControl",
"location" : "https://github.com/PureLayout/PureLayout",
"state" : {
"revision" : "5561683c96dc49b023c1299bfe4f6fbeed5f8199",
"version" : "3.1.9"
}
},
{
"identity" : "rxswift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ReactiveX/RxSwift",
"state" : {
"revision" : "b4307ba0b6425c0ba4178e138799946c3da594f8",
"version" : "6.5.0"
}
},
{
"identity" : "shortcutrecorder",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Kentzo/ShortcutRecorder",
"state" : {
"revision" : "07b065085e172d85b7b5a0f3cc05f6ed47ad5af1",
"version" : "3.3.0"
}
},
{
"identity" : "sparkle",
"kind" : "remoteSourceControl",
"location" : "https://github.com/sparkle-project/Sparkle",
"state" : {
"revision" : "286edd1fa22505a9e54d170e9fd07d775ea233f2",
"version" : "2.1.0"
}
},
{
"identity" : "swift-argument-parser",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
"revision" : "6b2aa2748a7881eebb9f84fb10c01293e15b52ca",
"version" : "0.5.0"
}
},
{
"identity" : "swifter",
"kind" : "remoteSourceControl",
"location" : "https://github.com/httpswift/swifter",
"state" : {
"revision" : "9483a5d459b45c3ffd059f7b55f9638e268632fd",
"version" : "1.5.0"
}
}
],
"version" : 2
}

View File

@ -820,7 +820,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 1330;
LastUpgradeCheck = 1340;
ORGANIZATIONNAME = "Tae Won Ha";
TargetAttributes = {
4BEBA5041CFF374B00673FDF = {
@ -1453,7 +1453,7 @@
repositoryURL = "https://github.com/Quick/Nimble";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 9.2.1;
minimumVersion = 10.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "1340"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

View File

@ -1,4 +1,4 @@
// swift-tools-version:5.3
// swift-tools-version:5.6
import PackageDescription
@ -9,22 +9,18 @@ let package = Package(
.library(name: "Workspace", targets: ["Workspace"]),
],
dependencies: [
.package(
name: "PureLayout",
url: "https://github.com/PureLayout/PureLayout",
.upToNextMinor(from: "3.1.9")
),
.package(
name: "MaterialIcons",
url: "https://github.com/qvacua/material-icons",
.upToNextMinor(from: "0.1.0")
),
.package(url: "https://github.com/PureLayout/PureLayout", from: "3.1.9"),
.package(url: "https://github.com/qvacua/material-icons", from: "0.1.0"),
.package(path: "../Commons"),
],
targets: [
.target(
name: "Workspace",
dependencies: ["PureLayout", "MaterialIcons", "Commons"]
dependencies: [
"PureLayout",
.product(name: "MaterialIcons", package: "material-icons"),
"Commons",
]
),
.testTarget(
name: "WorkspaceTests",

View File

@ -5,6 +5,6 @@
},
"dependencies": {
"vimrDeps": "vimr-deps-2021-12-12",
"nvimServer": "nvimserver-0.7.0-0"
"nvimServer": "nvimserver-0.7.0-1"
}
}

View File

@ -2,6 +2,8 @@
* Improved trackpad scrolling sensitivity (removed the option for customizing the sensitivity). Thanks @tsung-ju for the PR!
* ...
* Dependencies updates
- Quick/Nimble@10.0.0
# 0.39.0-20220416.182927