From 0a97456d4ab9674148e4bc96bc51dce22f151631 Mon Sep 17 00:00:00 2001 From: Darren Clark Date: Mon, 9 Oct 2017 17:32:07 -0400 Subject: [PATCH 1/2] Test carthage support --- .gitmodules | 4 ++-- SQLCipher/src | 2 +- SQLiteCustom/src | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5a407f41bc..7dc8d90364 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ url = https://github.com/realm/realm-cocoa.git [submodule "SQLCipher/src"] path = SQLCipher/src - url = https://github.com/groue/sqlcipher.git + url = https://github.com/darrenclark/sqlcipher.git [submodule "SQLiteCustom/src"] path = SQLiteCustom/src - url = https://github.com/swiftlyfalling/SQLiteLib + url = https://github.com/darrenclark/SQLiteLib diff --git a/SQLCipher/src b/SQLCipher/src index d0f6d20911..5276bcd899 160000 --- a/SQLCipher/src +++ b/SQLCipher/src @@ -1 +1 @@ -Subproject commit d0f6d20911a119fb26d4040df434c110b871b578 +Subproject commit 5276bcd89993ef8028c3ff94f3973484e5ae209a diff --git a/SQLiteCustom/src b/SQLiteCustom/src index d0b7a5cebc..b877895ee2 160000 --- a/SQLiteCustom/src +++ b/SQLiteCustom/src @@ -1 +1 @@ -Subproject commit d0b7a5cebcafc61488ffe6500527e4a6b998e40e +Subproject commit b877895ee2a94c84509ae388ef95bd1114319aae From 1cd5bbe75cf34a4511fb683a0d0cc9a348aa3854 Mon Sep 17 00:00:00 2001 From: Darren Clark Date: Mon, 9 Oct 2017 17:55:27 -0400 Subject: [PATCH 2/2] Travis - re-enable Carthage --- .travis.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ff1a5ef0d..b239a780f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -141,11 +141,10 @@ jobs: - TID=SPM script: make test_install_SPM - ## The following doesn’t work, as `make test_CarthageBuild` does not yet work. - ## Carthage Build - #- stage: Carthage - # osx_image: xcode9 - # before_install: - # - brew update - # - brew outdated carthage || brew upgrade carthage - # script: make test_CarthageBuild + # Carthage Build + - stage: Carthage + osx_image: xcode9 + before_install: + - brew update + - brew outdated carthage || brew upgrade carthage + script: make test_CarthageBuild