Skip to content

Commit abc8b2d

Browse files
garriguvgarriguv
authored
Migrate to Swift 4.2 and remove Quick and Nimble (#23)
* Migrate to Swift 4.2 * has-, createMigrationsTable & currentVersion * originVersion * migrations emptyBundle * migrations * appliedVersions * pendingMigrations * needsMigration * Rename function and better MARK * migrateDatabase * Remove Quick and Nimble Fixes #15
1 parent 2a339c2 commit abc8b2d

File tree

10 files changed

+386
-501
lines changed

10 files changed

+386
-501
lines changed

‎.gitmodules

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
[submodule "Carthage/Checkouts/Quick"]
2-
path = Carthage/Checkouts/Quick
3-
url = https://github.com/Quick/Quick.git
4-
[submodule "Carthage/Checkouts/Nimble"]
5-
path = Carthage/Checkouts/Nimble
6-
url = https://github.com/Quick/Nimble.git
71
[submodule "Carthage/Checkouts/SQLite.swift"]
82
path = Carthage/Checkouts/SQLite.swift
93
url = https://github.com/stephencelis/SQLite.swift.git

‎.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
4.2

‎Cartfile.private

-2
This file was deleted.

‎Cartfile.resolved

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
github "Quick/Nimble" "v7.3.1"
2-
github "Quick/Quick" "v1.3.2"
31
github "stephencelis/SQLite.swift" "0.11.5"

‎Carthage/Checkouts/Nimble

-1
This file was deleted.

‎Carthage/Checkouts/Quick

-1
This file was deleted.

‎SQLiteMigrationManager.xcodeproj/project.pbxproj

+10-18
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
9FD5BAB7356B0F99D4ABADA6 /* SQLiteMigrationManagerSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD5B59A9E0E9497A3FC4E2D /* SQLiteMigrationManagerSpec.swift */; };
1110
9FD5BFCFC94877B8D96F1073 /* SQLiteMigrationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD5B054E651DC4BD08A8C8E /* SQLiteMigrationManager.swift */; };
11+
EBA6A620219B0E680073DE4F /* SQLiteMigrationManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBA6A61F219B0E680073DE4F /* SQLiteMigrationManagerTests.swift */; };
1212
EBD6C6801C4C3ACC004270C5 /* Migrations_empty.bundle in Resources */ = {isa = PBXBuildFile; fileRef = EBD6C67E1C4C3ACC004270C5 /* Migrations_empty.bundle */; };
1313
EBD6C6811C4C3ACC004270C5 /* Migrations.bundle in Resources */ = {isa = PBXBuildFile; fileRef = EBD6C67F1C4C3ACC004270C5 /* Migrations.bundle */; };
1414
EBD6C6831C4E5059004270C5 /* 3_add-row.sql in Resources */ = {isa = PBXBuildFile; fileRef = EBD6C6821C4E5059004270C5 /* 3_add-row.sql */; };
1515
EBD6C6A51C4E686C004270C5 /* Migrations-names.bundle in Resources */ = {isa = PBXBuildFile; fileRef = EBD6C6A41C4E686C004270C5 /* Migrations-names.bundle */; };
1616
EBD762D21C4BA3E800951FE6 /* SQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBD762D11C4BA3E800951FE6 /* SQLite.framework */; };
17-
EBD762D51C4BA3FA00951FE6 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBD762D31C4BA3FA00951FE6 /* Nimble.framework */; };
18-
EBD762D61C4BA3FA00951FE6 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBD762D41C4BA3FA00951FE6 /* Quick.framework */; };
1917
EBE813EF1C4BA00200EE04E8 /* SQLiteMigrationManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBE813E41C4BA00200EE04E8 /* SQLiteMigrationManager.framework */; };
2018
/* End PBXBuildFile section */
2119

@@ -31,14 +29,12 @@
3129

3230
/* Begin PBXFileReference section */
3331
9FD5B054E651DC4BD08A8C8E /* SQLiteMigrationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SQLiteMigrationManager.swift; sourceTree = "<group>"; };
34-
9FD5B59A9E0E9497A3FC4E2D /* SQLiteMigrationManagerSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SQLiteMigrationManagerSpec.swift; sourceTree = "<group>"; };
32+
EBA6A61F219B0E680073DE4F /* SQLiteMigrationManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SQLiteMigrationManagerTests.swift; sourceTree = "<group>"; };
3533
EBD6C67E1C4C3ACC004270C5 /* Migrations_empty.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Migrations_empty.bundle; sourceTree = "<group>"; };
3634
EBD6C67F1C4C3ACC004270C5 /* Migrations.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Migrations.bundle; sourceTree = "<group>"; };
3735
EBD6C6821C4E5059004270C5 /* 3_add-row.sql */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "3_add-row.sql"; sourceTree = "<group>"; };
3836
EBD6C6A41C4E686C004270C5 /* Migrations-names.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = "Migrations-names.bundle"; sourceTree = "<group>"; };
3937
EBD762D11C4BA3E800951FE6 /* SQLite.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SQLite.framework; path = "Carthage/Checkouts/SQLite.swift/build/Debug-iphoneos/SQLite.framework"; sourceTree = "<group>"; };
40-
EBD762D31C4BA3FA00951FE6 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = "Carthage/Checkouts/Nimble/build/Debug-iphoneos/Nimble.framework"; sourceTree = "<group>"; };
41-
EBD762D41C4BA3FA00951FE6 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = "Carthage/Checkouts/Quick/build/Debug-iphoneos/Quick.framework"; sourceTree = "<group>"; };
4238
EBE813E41C4BA00200EE04E8 /* SQLiteMigrationManager.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLiteMigrationManager.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4339
EBE813E91C4BA00200EE04E8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4440
EBE813EE1C4BA00200EE04E8 /* SQLiteMigrationManagerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SQLiteMigrationManagerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -58,8 +54,6 @@
5854
isa = PBXFrameworksBuildPhase;
5955
buildActionMask = 2147483647;
6056
files = (
61-
EBD762D51C4BA3FA00951FE6 /* Nimble.framework in Frameworks */,
62-
EBD762D61C4BA3FA00951FE6 /* Quick.framework in Frameworks */,
6357
EBE813EF1C4BA00200EE04E8 /* SQLiteMigrationManager.framework in Frameworks */,
6458
);
6559
runOnlyForDeploymentPostprocessing = 0;
@@ -81,8 +75,6 @@
8175
EBE813DA1C4BA00200EE04E8 = {
8276
isa = PBXGroup;
8377
children = (
84-
EBD762D31C4BA3FA00951FE6 /* Nimble.framework */,
85-
EBD762D41C4BA3FA00951FE6 /* Quick.framework */,
8678
EBD762D11C4BA3E800951FE6 /* SQLite.framework */,
8779
EBE813E61C4BA00200EE04E8 /* SQLiteMigrationManager */,
8880
EBE813F21C4BA00200EE04E8 /* SQLiteMigrationManagerTests */,
@@ -112,8 +104,8 @@
112104
isa = PBXGroup;
113105
children = (
114106
EBE813F51C4BA00200EE04E8 /* Info.plist */,
115-
9FD5B59A9E0E9497A3FC4E2D /* SQLiteMigrationManagerSpec.swift */,
116107
9FD5BB58743A46516BAD09C9 /* resources */,
108+
EBA6A61F219B0E680073DE4F /* SQLiteMigrationManagerTests.swift */,
117109
);
118110
path = SQLiteMigrationManagerTests;
119111
sourceTree = "<group>";
@@ -179,11 +171,11 @@
179171
TargetAttributes = {
180172
EBE813E31C4BA00200EE04E8 = {
181173
CreatedOnToolsVersion = 7.2;
182-
LastSwiftMigration = 0910;
174+
LastSwiftMigration = 1010;
183175
};
184176
EBE813ED1C4BA00200EE04E8 = {
185177
CreatedOnToolsVersion = 7.2;
186-
LastSwiftMigration = 0910;
178+
LastSwiftMigration = 1010;
187179
};
188180
};
189181
};
@@ -239,7 +231,7 @@
239231
isa = PBXSourcesBuildPhase;
240232
buildActionMask = 2147483647;
241233
files = (
242-
9FD5BAB7356B0F99D4ABADA6 /* SQLiteMigrationManagerSpec.swift in Sources */,
234+
EBA6A620219B0E680073DE4F /* SQLiteMigrationManagerTests.swift in Sources */,
243235
);
244236
runOnlyForDeploymentPostprocessing = 0;
245237
};
@@ -382,7 +374,7 @@
382374
PRODUCT_BUNDLE_IDENTIFIER = io.garriguv.SQLiteMigrationManager;
383375
PRODUCT_NAME = "$(TARGET_NAME)";
384376
SKIP_INSTALL = YES;
385-
SWIFT_VERSION = 4.0;
377+
SWIFT_VERSION = 4.2;
386378
};
387379
name = Debug;
388380
};
@@ -404,7 +396,7 @@
404396
PRODUCT_BUNDLE_IDENTIFIER = io.garriguv.SQLiteMigrationManager;
405397
PRODUCT_NAME = "$(TARGET_NAME)";
406398
SKIP_INSTALL = YES;
407-
SWIFT_VERSION = 4.0;
399+
SWIFT_VERSION = 4.2;
408400
};
409401
name = Release;
410402
};
@@ -416,7 +408,7 @@
416408
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
417409
PRODUCT_BUNDLE_IDENTIFIER = io.garriguv.SQLiteMigrationManagerTests;
418410
PRODUCT_NAME = "$(TARGET_NAME)";
419-
SWIFT_VERSION = 4.0;
411+
SWIFT_VERSION = 4.2;
420412
};
421413
name = Debug;
422414
};
@@ -428,7 +420,7 @@
428420
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
429421
PRODUCT_BUNDLE_IDENTIFIER = io.garriguv.SQLiteMigrationManagerTests;
430422
PRODUCT_NAME = "$(TARGET_NAME)";
431-
SWIFT_VERSION = 4.0;
423+
SWIFT_VERSION = 4.2;
432424
};
433425
name = Release;
434426
};

‎SQLiteMigrationManager.xcodeproj/xcshareddata/xcschemes/SQLiteMigrationManager.xcscheme

+11
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,18 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
codeCoverageEnabled = "YES"
30+
onlyGenerateCoverageForSpecifiedTargets = "YES"
2931
shouldUseLaunchSchemeArgsEnv = "YES">
32+
<CodeCoverageTargets>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
36+
BuildableName = "SQLiteMigrationManager.framework"
37+
BlueprintName = "SQLiteMigrationManager"
38+
ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
39+
</BuildableReference>
40+
</CodeCoverageTargets>
3041
<Testables>
3142
<TestableReference
3243
skipped = "NO">

0 commit comments

Comments
 (0)