Skip to content

Commit 0805fd1

Browse files
authored
0.5.0 (#28)
* Rename frameworks * Update scheme names * reorganize project to support future targets * Add Carthage cache on CI * set macos sdk to 10.14 * Update SPM * disable build cache * use double quotes * Add missing schemes * Revert "disable build cache" This reverts commit 0c7bc9c. * Update podspec * Add platform to Podfile * move schemes back to the project
1 parent 827250d commit 0805fd1

File tree

26 files changed

+297
-72
lines changed

26 files changed

+297
-72
lines changed

.travis.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
language: objective-c
22
osx_image: xcode10.1
3+
cache:
4+
directories:
5+
- Carthage
36
env:
47
global:
58
- FRAMEWORK_NAME=SQLiteMigrationManager
@@ -11,7 +14,7 @@ before_script:
1114
script:
1215
- travis_retry ./bin/run-tests
1316
before_deploy:
14-
- carthage build --platform iOS --no-skip-current
17+
- carthage build --platform iOS,macOS --no-skip-current
1518
- carthage archive $FRAMEWORK_NAME
1619
deploy:
1720
provider: releases

Example/Podfile

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use_frameworks!
22

3+
platform :ios, 9.0
4+
35
target 'SQLiteExample' do
46
pod 'SQLite.swift'
57
pod 'SQLiteMigrationManager.swift', path: '../'

Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ let package = Package(
1313
.target(
1414
name: "SQLiteMigrationManager",
1515
dependencies: ["SQLite"],
16-
path: "SQLiteMigrationManager",
16+
path: "Sources",
1717
sources: ["SQLiteMigrationManager.swift"]),
1818
.testTarget(
1919
name: "SQLiteMigrationManagerTests",
2020
dependencies: ["SQLiteMigrationManager"],
21-
path: "SQLiteMigrationManagerTests",
21+
path: "Tests",
2222
sources: ["SQLiteMigrationManagerTests.swift"])
2323
])
File renamed without changes.
File renamed without changes.

SQLiteMigrationManager.swift.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
1717
s.module_name = 'SQLiteMigrationManager'
1818

1919
s.source = { :git => "https://github.com/garriguv/SQLiteMigrationManager.swift.git", tag: s.version.to_s, submodules: true }
20-
s.source_files = "SQLiteMigrationManager", "SQLiteMigrationManager/**/*.{h,m}"
20+
s.source_files = "Sources"
2121

2222
s.dependency "SQLite.swift", "~> 0.11.0"
2323
end

SQLiteMigrationManager.xcodeproj/project.pbxproj

+210-51
Large diffs are not rendered by default.

SQLiteMigrationManager.xcodeproj/xcshareddata/xcschemes/SQLiteMigrationManager.xcscheme SQLiteMigrationManager.xcodeproj/xcshareddata/xcschemes/SQLiteMigrationManager iOS.xcscheme

+10-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
1818
BuildableName = "SQLiteMigrationManager.framework"
19-
BlueprintName = "SQLiteMigrationManager"
19+
BlueprintName = "SQLiteMigrationManager iOS"
2020
ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -34,18 +34,20 @@
3434
BuildableIdentifier = "primary"
3535
BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
3636
BuildableName = "SQLiteMigrationManager.framework"
37-
BlueprintName = "SQLiteMigrationManager"
37+
BlueprintName = "SQLiteMigrationManager iOS"
3838
ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
3939
</BuildableReference>
4040
</CodeCoverageTargets>
4141
<Testables>
4242
<TestableReference
43-
skipped = "NO">
43+
skipped = "NO"
44+
parallelizable = "YES"
45+
testExecutionOrdering = "random">
4446
<BuildableReference
4547
BuildableIdentifier = "primary"
4648
BlueprintIdentifier = "EBE813ED1C4BA00200EE04E8"
47-
BuildableName = "SQLiteMigrationManagerTests.xctest"
48-
BlueprintName = "SQLiteMigrationManagerTests"
49+
BuildableName = "SQLiteMigrationManagerTests iOS.xctest"
50+
BlueprintName = "SQLiteMigrationManagerTests iOS"
4951
ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
5052
</BuildableReference>
5153
</TestableReference>
@@ -55,7 +57,7 @@
5557
BuildableIdentifier = "primary"
5658
BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
5759
BuildableName = "SQLiteMigrationManager.framework"
58-
BlueprintName = "SQLiteMigrationManager"
60+
BlueprintName = "SQLiteMigrationManager iOS"
5961
ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
6062
</BuildableReference>
6163
</MacroExpansion>
@@ -77,7 +79,7 @@
7779
BuildableIdentifier = "primary"
7880
BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
7981
BuildableName = "SQLiteMigrationManager.framework"
80-
BlueprintName = "SQLiteMigrationManager"
82+
BlueprintName = "SQLiteMigrationManager iOS"
8183
ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
8284
</BuildableReference>
8385
</MacroExpansion>
@@ -95,7 +97,7 @@
9597
BuildableIdentifier = "primary"
9698
BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
9799
BuildableName = "SQLiteMigrationManager.framework"
98-
BlueprintName = "SQLiteMigrationManager"
100+
BlueprintName = "SQLiteMigrationManager iOS"
99101
ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
100102
</BuildableReference>
101103
</MacroExpansion>

SQLiteMigrationManager.xcodeproj/xcshareddata/xcschemes/SQLiteMigrationManagerMacOs.xcscheme SQLiteMigrationManager.xcodeproj/xcshareddata/xcschemes/SQLiteMigrationManager macOS.xcscheme

+27-6
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "CFE35EC521DE71980004E4E4"
18-
BuildableName = "SQLiteMigrationManagerMacOs.framework"
19-
BlueprintName = "SQLiteMigrationManagerMacOs"
18+
BuildableName = "SQLiteMigrationManager.framework"
19+
BlueprintName = "SQLiteMigrationManager macOS"
2020
ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -28,7 +28,28 @@
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
31+
<TestableReference
32+
skipped = "NO"
33+
parallelizable = "YES"
34+
testExecutionOrdering = "random">
35+
<BuildableReference
36+
BuildableIdentifier = "primary"
37+
BlueprintIdentifier = "EBB203692205CCF9001B59FA"
38+
BuildableName = "SQLiteMigrationManagerTests macOS.xctest"
39+
BlueprintName = "SQLiteMigrationManagerTests macOS"
40+
ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
41+
</BuildableReference>
42+
</TestableReference>
3143
</Testables>
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "CFE35EC521DE71980004E4E4"
48+
BuildableName = "SQLiteMigrationManager.framework"
49+
BlueprintName = "SQLiteMigrationManager macOS"
50+
ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
3253
<AdditionalOptions>
3354
</AdditionalOptions>
3455
</TestAction>
@@ -46,8 +67,8 @@
4667
<BuildableReference
4768
BuildableIdentifier = "primary"
4869
BlueprintIdentifier = "CFE35EC521DE71980004E4E4"
49-
BuildableName = "SQLiteMigrationManagerMacOs.framework"
50-
BlueprintName = "SQLiteMigrationManagerMacOs"
70+
BuildableName = "SQLiteMigrationManager.framework"
71+
BlueprintName = "SQLiteMigrationManager macOS"
5172
ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
5273
</BuildableReference>
5374
</MacroExpansion>
@@ -64,8 +85,8 @@
6485
<BuildableReference
6586
BuildableIdentifier = "primary"
6687
BlueprintIdentifier = "CFE35EC521DE71980004E4E4"
67-
BuildableName = "SQLiteMigrationManagerMacOs.framework"
68-
BlueprintName = "SQLiteMigrationManagerMacOs"
88+
BuildableName = "SQLiteMigrationManager.framework"
89+
BlueprintName = "SQLiteMigrationManager macOS"
6990
ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
7091
</BuildableReference>
7192
</MacroExpansion>

SQLiteMigrationManager.xcodeproj/xcuserdata/garriguv.xcuserdatad/xcschemes/xcschememanagement.plist

+11-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,21 @@
44
<dict>
55
<key>SchemeUserState</key>
66
<dict>
7-
<key>SQLiteMigrationManager.xcscheme_^#shared#^_</key>
7+
<key>SQLiteMigrationManager iOS.xcscheme_^#shared#^_</key>
88
<dict>
99
<key>orderHint</key>
1010
<integer>0</integer>
1111
</dict>
12+
<key>SQLiteMigrationManager macOS.xcscheme_^#shared#^_</key>
13+
<dict>
14+
<key>orderHint</key>
15+
<integer>1</integer>
16+
</dict>
17+
<key>SQLiteMigrationManagerTests macOS.xcscheme_^#shared#^_</key>
18+
<dict>
19+
<key>orderHint</key>
20+
<integer>6</integer>
21+
</dict>
1222
</dict>
1323
<key>SuppressBuildableAutocreation</key>
1424
<dict>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>BNDL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>1</string>
21+
</dict>
22+
</plist>

bin/run-tests

+8-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@ set -euo pipefail
55
main() {
66
xcodebuild \
77
-workspace SQLiteMigrationManager.xcworkspace \
8-
-scheme SQLiteMigrationManager\
9-
-sdk iphonesimulator12.1\
8+
-scheme "SQLiteMigrationManager iOS" \
9+
-sdk iphonesimulator12.1 \
1010
-destination "platform=iOS Simulator,name=iPhone X,OS=12.1"\
1111
test
12+
xcodebuild \
13+
-workspace SQLiteMigrationManager.xcworkspace \
14+
-scheme "SQLiteMigrationManager macOS" \
15+
-sdk macosx10.14 \
16+
-destination "arch=x86_64" \
17+
test
1218
swift build
1319
}
1420
main "$@"

0 commit comments

Comments
 (0)