Spring cleaning (#36)

garriguv · web-flow · commit 4df23f51638f · 2021-10-13T22:52:38.000+02:00
* Bump SQLite.swift to 0.12.2

* Update recommended Xcode settings

* Remove travis config file, rip

* Set recommended Swift version to 5.0

* 0.12.2 part 2

* Update project settings part 2

* Update testing scripts

* Add GitHub action
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,18 @@
+name: Build
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: macos-10.15
+
+    steps:
+    - name: setup
+      run: ./bin/setup
+    - name: tests
+      run: ./bin/run-tests
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,7 @@ xcuserdata
 
 # Swift Package Manager
 .build/
+.swiftpm/
 
 # Carthage
 Carthage/Build
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.2
+5.0
diff --git a/.travis.yml b/.travis.yml
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "stephencelis/SQLite.swift" "0.12.0"
+github "stephencelis/SQLite.swift" "0.12.2"
diff --git a/Carthage/Checkouts/SQLite.swift b/Carthage/Checkouts/SQLite.swift
@@ -1 +1 @@
-Subproject commit 691fc89e75873d417d700920e79a63cf210d1d71
+Subproject commit 0a9893ec030501a3956bee572d6b4fdd3ae158a1
diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/stephencelis/SQLite.swift.git",
         "state": {
           "branch": null,
-          "revision": "691fc89e75873d417d700920e79a63cf210d1d71",
-          "version": "0.12.0"
+          "revision": "0a9893ec030501a3956bee572d6b4fdd3ae158a1",
+          "version": "0.12.2"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
@@ -7,7 +7,7 @@ let package = Package(
         .library(name: "SQLiteMigrationManager", targets: ["SQLiteMigrationManager"])
     ],
     dependencies: [
-        .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.12.0")
+        .package(url: "https://github.com/stephencelis/SQLite.swift.git", .upToNextMinor(from: "0.12.2"))
     ],
     targets: [
         .target(
diff --git a/SQLiteMigrationManager.swift.podspec b/SQLiteMigrationManager.swift.podspec
@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/garriguv/SQLiteMigrationManager.swift.git", tag: s.version.to_s, submodules: true }
   s.source_files = "Sources"
 
-  s.dependency "SQLite.swift", "~> 0.12.0"
+  s.dependency "SQLite.swift", "~> 0.12.2"
 end
diff --git a/SQLiteMigrationManager.xcodeproj/project.pbxproj b/SQLiteMigrationManager.xcodeproj/project.pbxproj
@@ -296,7 +296,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1010;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "Vincent Garrigues";
 				TargetAttributes = {
 					CFE35EC521DE71980004E4E4 = {
@@ -305,6 +305,7 @@
 					};
 					EBB203692205CCF9001B59FA = {
 						CreatedOnToolsVersion = 10.1;
+						LastSwiftMigration = 1300;
 						ProvisioningStyle = Automatic;
 					};
 					EBE813E31C4BA00200EE04E8 = {
@@ -524,7 +525,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -548,7 +549,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "io.garriguv.SQLiteMigrationManagerTests-macOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -575,6 +576,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -600,7 +602,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -636,6 +638,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -655,7 +658,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
@@ -681,6 +684,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "SQLiteMigrationManager iOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = io.garriguv.SQLiteMigrationManager;
 				PRODUCT_MODULE_NAME = SQLiteMigrationManager;
@@ -702,6 +706,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "SQLiteMigrationManager iOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = io.garriguv.SQLiteMigrationManager;
 				PRODUCT_MODULE_NAME = SQLiteMigrationManager;
diff --git a/SQLiteMigrationManager.xcodeproj/xcshareddata/xcschemes/SQLiteMigrationManager iOS.xcscheme b/SQLiteMigrationManager.xcodeproj/xcshareddata/xcschemes/SQLiteMigrationManager iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES"
-      onlyGenerateCoverageForSpecifiedTargets = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
+            BuildableName = "SQLiteMigrationManager.framework"
+            BlueprintName = "SQLiteMigrationManager iOS"
+            ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <CodeCoverageTargets>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -52,17 +61,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EBE813E31C4BA00200EE04E8"
-            BuildableName = "SQLiteMigrationManager.framework"
-            BlueprintName = "SQLiteMigrationManager iOS"
-            ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -83,8 +81,6 @@
             ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/SQLiteMigrationManager.xcodeproj/xcshareddata/xcschemes/SQLiteMigrationManager macOS.xcscheme b/SQLiteMigrationManager.xcodeproj/xcshareddata/xcschemes/SQLiteMigrationManager macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CFE35EC521DE71980004E4E4"
+            BuildableName = "SQLiteMigrationManager.framework"
+            BlueprintName = "SQLiteMigrationManager macOS"
+            ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO"
@@ -41,17 +50,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "CFE35EC521DE71980004E4E4"
-            BuildableName = "SQLiteMigrationManager.framework"
-            BlueprintName = "SQLiteMigrationManager macOS"
-            ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -72,8 +70,6 @@
             ReferencedContainer = "container:SQLiteMigrationManager.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/bin/run-tests b/bin/run-tests
@@ -6,13 +6,13 @@ main() {
   xcodebuild \
     -workspace SQLiteMigrationManager.xcworkspace \
     -scheme "SQLiteMigrationManager iOS" \
-    -sdk iphonesimulator12.2 \
-    -destination "platform=iOS Simulator,name=iPhone X,OS=12.2"\
+    -sdk iphonesimulator15.0 \
+    -destination "platform=iOS Simulator,name=iPhone 12,OS=15.0"\
     test
   xcodebuild \
     -workspace SQLiteMigrationManager.xcworkspace \
     -scheme "SQLiteMigrationManager macOS" \
-    -sdk macosx10.14 \
+    -sdk macosx11.3 \
     -destination "arch=x86_64" \
     test
   swift build
diff --git a/bin/setup b/bin/setup
@@ -7,7 +7,7 @@ carthage_installed() {
 }
 
 install_dependencies() {
-  carthage update --platform iOS,macOS --use-submodules --no-use-binaries
+  carthage update --platform iOS,macOS --use-submodules --no-use-binaries --use-xcframeworks
 }
 
 main() {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "stephencelis/SQLite.swift" "0.12.0"`
	`1`	`+github "stephencelis/SQLite.swift" "0.12.2"`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`	`"repositoryURL": "https://github.com/stephencelis/SQLite.swift.git",`
`7`	`7`	`"state": {`
`8`	`8`	`"branch": null,`
`9`		`- "revision": "691fc89e75873d417d700920e79a63cf210d1d71",`
`10`		`- "version": "0.12.0"`
	`9`	`+ "revision": "0a9893ec030501a3956bee572d6b4fdd3ae158a1",`
	`10`	`+ "version": "0.12.2"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ carthage_installed() {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`install_dependencies() {`
`10`		`- carthage update --platform iOS,macOS --use-submodules --no-use-binaries`
	`10`	`+ carthage update --platform iOS,macOS --use-submodules --no-use-binaries --use-xcframeworks`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`main() {`