Universal Framework

Should simplify installation.

When SQLCipher support was introduced, we also needed to add a new
target with the dependency, per platform. By flattening the platforms,
we only need one extra target, SQLiteCipher.

Signed-off-by: Stephen Celis <stephen@stephencelis.com>

Author: stephencelis

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "sqlcipher"]
-	path = sqlcipher
+	path = Vendor/sqlcipher
 	url = https://github.com/sqlcipher/sqlcipher.git

.travis.yml

@@ -1,8 +1,6 @@
 language: objective-c
 env:
-  - BUILD_PLATFORM=iOS
-  - BUILD_PLATFORM=Mac
-before_install:
-  - gem install xcpretty --no-document
+  - BUILD_SDK=iphonesimulator ONLY_ACTIVE_ARCH=NO
+  - BUILD_SDK=macosx
 script:
   - make test

Documentation/Index.md

@@ -67,11 +67,11 @@ To install SQLite.swift as an Xcode sub-project:
 
     ![Installation](Resources/installation@2x.png)
 
- 2. In your target’s **Build Phases**, add **SQLite iOS** (or **SQLite Mac**) to the **Target Dependencies** build phase.
+ 2. In your target’s **Build Phases**, add **SQLite** to the **Target Dependencies** build phase.
 
- 3. Add the appropriate **SQLite.framework** product to the **Link Binary With Libraries** build phase.
+ 3. Add **SQLite.framework** to the **Link Binary With Libraries** build phase.
 
- 4. Add the same **SQLite.framework** to a **Copy Files** build phase with a **Frameworks** destination. (Add a new build phase if need be.)
+ 4. Add **SQLite.framework** to a **Copy Files** build phase with a **Frameworks** destination. (Add a new build phase if need be.)
 
 You should now be able to `import SQLite` from any of your target’s source files and begin using SQLite.swift.
 

Makefile

@@ -1,20 +1,14 @@
 BUILD_TOOL = xcodebuild
-BUILD_PLATFORM ?= Mac
-BUILD_ARGUMENTS = -scheme 'SQLite $(BUILD_PLATFORM)'
-
-XCPRETTY := $(shell command -v xcpretty)
+BUILD_SDK = macosx
+BUILD_ARGUMENTS = -scheme SQLite -sdk $(BUILD_SDK)
 
 default: test
 
 build:
 	$(BUILD_TOOL) $(BUILD_ARGUMENTS)
 
 test:
-ifdef XCPRETTY
-	@set -o pipefail && $(BUILD_TOOL) $(BUILD_ARGUMENTS) test | $(XCPRETTY) -c
-else
 	$(BUILD_TOOL) $(BUILD_ARGUMENTS) test
-endif
 
 clean:
 	$(BUILD_TOOL) $(BUILD_ARGUMENTS) clean

README.md

@@ -115,13 +115,13 @@ To install SQLite.swift:
 
     ![](Documentation/Resources/installation@2x.png)
 
- 2. In your target’s **Build Phases**, add **SQLite iOS** (or **SQLite Mac**)
-    to the **Target Dependencies** build phase.
+ 2. In your target’s **Build Phases**, add **SQLite** to the **Target
+    Dependencies** build phase.
 
- 3. Add the appropriate **SQLite.framework** product to the
-    **Link Binary With Libraries** build phase.
+ 3. Add **SQLite.framework** to the **Link Binary With Libraries** build
+    phase.
 
- 4. Add the same **SQLite.framework** to a **Copy Files** build phase with a
+ 4. Add **SQLite.framework** to a **Copy Files** build phase with a
     **Frameworks** destination. (Add a new build phase if need be.)
 
 [4.1]: https://developer.apple.com/xcode/downloads/