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
garriguv · Feb 2, 2019 · 0805fd1 · 0805fd1
1 parent 827250d
commit 0805fd1
Show file tree

Hide file tree

Showing 26 changed files with 297 additions and 72 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,8 @@
 language: objective-c
 osx_image: xcode10.1
+cache:
+  directories:
+    - Carthage
 env:
   global:
   - FRAMEWORK_NAME=SQLiteMigrationManager
@@ -11,7 +14,7 @@ before_script:
 script:
   - travis_retry ./bin/run-tests
 before_deploy:
-  - carthage build --platform iOS --no-skip-current
+  - carthage build --platform iOS,macOS --no-skip-current
   - carthage archive $FRAMEWORK_NAME
 deploy:
   provider: releases

diff --git a/Example/Podfile b/Example/Podfile
@@ -1,5 +1,7 @@
 use_frameworks!
 
+platform :ios, 9.0
+
 target 'SQLiteExample' do
   pod 'SQLite.swift'
   pod 'SQLiteMigrationManager.swift', path: '../'

diff --git a/Package.swift b/Package.swift
@@ -13,11 +13,11 @@ let package = Package(
         .target(
             name: "SQLiteMigrationManager",
             dependencies: ["SQLite"],
-            path: "SQLiteMigrationManager",
+            path: "Sources",
             sources: ["SQLiteMigrationManager.swift"]),
         .testTarget(
             name: "SQLiteMigrationManagerTests",
             dependencies: ["SQLiteMigrationManager"],
-            path: "SQLiteMigrationManagerTests",
+            path: "Tests",
             sources: ["SQLiteMigrationManagerTests.swift"])
     ])
diff --git a/SQLiteMigrationManager/Info.plist → SQLiteMigrationManager iOS/Info.plist b/SQLiteMigrationManager/Info.plist → SQLiteMigrationManager iOS/Info.plist
diff --git a/SQLiteMigrationManagerMacOs/Info.plist → SQLiteMigrationManager macOS/Info.plist b/SQLiteMigrationManagerMacOs/Info.plist → SQLiteMigrationManager macOS/Info.plist
diff --git a/...anagerMacOs/SQLiteMigrationManagerMacOs.h → ...nager macOS/SQLiteMigrationManagerMacOs.h b/...anagerMacOs/SQLiteMigrationManagerMacOs.h → ...nager macOS/SQLiteMigrationManagerMacOs.h
diff --git a/SQLiteMigrationManager.swift.podspec b/SQLiteMigrationManager.swift.podspec
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.module_name  = 'SQLiteMigrationManager'
 
   s.source       = { :git => "https://github.com/garriguv/SQLiteMigrationManager.swift.git", tag: s.version.to_s, submodules: true }
-  s.source_files  = "SQLiteMigrationManager", "SQLiteMigrationManager/**/*.{h,m}"
+  s.source_files = "Sources"
 
   s.dependency "SQLite.swift", "~> 0.11.0"
 end
diff --git a/SQLiteMigrationManager.xcodeproj/project.pbxproj b/SQLiteMigrationManager.xcodeproj/project.pbxproj
diff --git a/...xcschemes/SQLiteMigrationManager.xcscheme → ...hemes/SQLiteMigrationManager iOS.xcscheme b/...xcschemes/SQLiteMigrationManager.xcscheme → ...hemes/SQLiteMigrationManager iOS.xcscheme
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
                BuildableName = "SQLiteMigrationManager.framework"
-               BlueprintName = "SQLiteMigrationManager"
+               BlueprintName = "SQLiteMigrationManager iOS"
                ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -34,18 +34,20 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
             BuildableName = "SQLiteMigrationManager.framework"
-            BlueprintName = "SQLiteMigrationManager"
+            BlueprintName = "SQLiteMigrationManager iOS"
             ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
          </BuildableReference>
       </CodeCoverageTargets>
       <Testables>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            parallelizable = "YES"
+            testExecutionOrdering = "random">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "EBE813ED1C4BA00200EE04E8"
-               BuildableName = "SQLiteMigrationManagerTests.xctest"
-               BlueprintName = "SQLiteMigrationManagerTests"
+               BuildableName = "SQLiteMigrationManagerTests iOS.xctest"
+               BlueprintName = "SQLiteMigrationManagerTests iOS"
                ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -55,7 +57,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
             BuildableName = "SQLiteMigrationManager.framework"
-            BlueprintName = "SQLiteMigrationManager"
+            BlueprintName = "SQLiteMigrationManager iOS"
             ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -77,7 +79,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
             BuildableName = "SQLiteMigrationManager.framework"
-            BlueprintName = "SQLiteMigrationManager"
+            BlueprintName = "SQLiteMigrationManager iOS"
             ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -95,7 +97,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
             BuildableName = "SQLiteMigrationManager.framework"
-            BlueprintName = "SQLiteMigrationManager"
+            BlueprintName = "SQLiteMigrationManager iOS"
             ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/...emes/SQLiteMigrationManagerMacOs.xcscheme → ...mes/SQLiteMigrationManager macOS.xcscheme b/...emes/SQLiteMigrationManagerMacOs.xcscheme → ...mes/SQLiteMigrationManager macOS.xcscheme
@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "CFE35EC521DE71980004E4E4"
-               BuildableName = "SQLiteMigrationManagerMacOs.framework"
-               BlueprintName = "SQLiteMigrationManagerMacOs"
+               BuildableName = "SQLiteMigrationManager.framework"
+               BlueprintName = "SQLiteMigrationManager macOS"
                ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -28,7 +28,28 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES"
+            testExecutionOrdering = "random">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EBB203692205CCF9001B59FA"
+               BuildableName = "SQLiteMigrationManagerTests macOS.xctest"
+               BlueprintName = "SQLiteMigrationManagerTests macOS"
+               ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CFE35EC521DE71980004E4E4"
+            BuildableName = "SQLiteMigrationManager.framework"
+            BlueprintName = "SQLiteMigrationManager macOS"
+            ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -46,8 +67,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "CFE35EC521DE71980004E4E4"
-            BuildableName = "SQLiteMigrationManagerMacOs.framework"
-            BlueprintName = "SQLiteMigrationManagerMacOs"
+            BuildableName = "SQLiteMigrationManager.framework"
+            BlueprintName = "SQLiteMigrationManager macOS"
             ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -64,8 +85,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "CFE35EC521DE71980004E4E4"
-            BuildableName = "SQLiteMigrationManagerMacOs.framework"
-            BlueprintName = "SQLiteMigrationManagerMacOs"
+            BuildableName = "SQLiteMigrationManager.framework"
+            BlueprintName = "SQLiteMigrationManager macOS"
             ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/...ationManager.xcodeproj/xcuserdata/garriguv.xcuserdatad/xcschemes/xcschememanagement.plist b/...ationManager.xcodeproj/xcuserdata/garriguv.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -4,11 +4,21 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>SQLiteMigrationManager.xcscheme_^#shared#^_</key>
+		<key>SQLiteMigrationManager iOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>SQLiteMigrationManager macOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>SQLiteMigrationManagerTests macOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>6</integer>
+		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>

diff --git a/SQLiteMigrationManagerTests/Info.plist → SQLiteMigrationManagerTests iOS/Info.plist b/SQLiteMigrationManagerTests/Info.plist → SQLiteMigrationManagerTests iOS/Info.plist
diff --git a/SQLiteMigrationManagerTests macOS/Info.plist b/SQLiteMigrationManagerTests macOS/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/...ationManager/SQLiteMigrationManager.swift → Sources/SQLiteMigrationManager.swift b/...ationManager/SQLiteMigrationManager.swift → Sources/SQLiteMigrationManager.swift
diff --git a/...erTests/SQLiteMigrationManagerTests.swift → Tests/SQLiteMigrationManagerTests.swift b/...erTests/SQLiteMigrationManagerTests.swift → Tests/SQLiteMigrationManagerTests.swift
diff --git a/...ationManagerTests/resources/3_add-row.sql → Tests/resources/3_add-row.sql b/...ationManagerTests/resources/3_add-row.sql → Tests/resources/3_add-row.sql
diff --git a/...s/resources/Migrations-names.bundle/1.sql → ...s/resources/Migrations-names.bundle/1.sql b/...s/resources/Migrations-names.bundle/1.sql → ...s/resources/Migrations-names.bundle/1.sql
diff --git a/...grations-names.bundle/2_add_new_table.sql → ...grations-names.bundle/2_add_new_table.sql b/...grations-names.bundle/2_add_new_table.sql → ...grations-names.bundle/2_add_new_table.sql
diff --git a/...grations-names.bundle/3_add-new-table.sql → ...grations-names.bundle/3_add-new-table.sql b/...grations-names.bundle/3_add-new-table.sql → ...grations-names.bundle/3_add-new-table.sql
diff --git a/...grations-names.bundle/4_add new table.sql → ...grations-names.bundle/4_add new table.sql b/...grations-names.bundle/4_add new table.sql → ...grations-names.bundle/4_add new table.sql
diff --git a/...ns.bundle/20160117220032473_create-db.sql → ...ns.bundle/20160117220032473_create-db.sql b/...ns.bundle/20160117220032473_create-db.sql → ...ns.bundle/20160117220032473_create-db.sql
diff --git a/...tions.bundle/20160117220038856_second.sql → ...tions.bundle/20160117220038856_second.sql b/...tions.bundle/20160117220038856_second.sql → ...tions.bundle/20160117220038856_second.sql
diff --git a/...ations.bundle/20160117220050560_third.sql → ...ations.bundle/20160117220050560_third.sql b/...ations.bundle/20160117220050560_third.sql → ...ations.bundle/20160117220050560_third.sql
diff --git a/...resources/Migrations.bundle/malformed.sql → ...resources/Migrations.bundle/malformed.sql b/...resources/Migrations.bundle/malformed.sql → ...resources/Migrations.bundle/malformed.sql
diff --git a/...grations_empty.bundle/not_a_migration.txt → ...grations_empty.bundle/not_a_migration.txt b/...grations_empty.bundle/not_a_migration.txt → ...grations_empty.bundle/not_a_migration.txt
diff --git a/bin/run-tests b/bin/run-tests
@@ -5,10 +5,16 @@ set -euo pipefail
 main() {
   xcodebuild \
     -workspace SQLiteMigrationManager.xcworkspace \
-    -scheme SQLiteMigrationManager\
-    -sdk iphonesimulator12.1\
+    -scheme "SQLiteMigrationManager iOS" \
+    -sdk iphonesimulator12.1 \
     -destination "platform=iOS Simulator,name=iPhone X,OS=12.1"\
     test
+  xcodebuild \
+    -workspace SQLiteMigrationManager.xcworkspace \
+    -scheme "SQLiteMigrationManager macOS" \
+    -sdk macosx10.14 \
+    -destination "arch=x86_64" \
+    test
   swift build
 }
 main "$@"