Skip to content

Commit b5d8584

Browse files
KyleLeneauKyleLeneau
committed
Getting carthage tests to pass
1 parent 0e0ebdb commit b5d8584

File tree

4 files changed

+31
-33
lines changed

4 files changed

+31
-33
lines changed

‎.travis.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,11 @@ jobs:
230230
script: make test_install_SPM
231231

232232
## Carthage Build
233-
## Commented out until `make test_CarthageBuild` performs *reliably*.
234-
## See https://github.com/groue/GRDB.swift/pull/262
235-
# - stage: Test Installation
236-
# osx_image: xcode10
237-
# before_install:
238-
# - brew update
239-
# - brew outdated carthage || brew upgrade carthage
240-
# env:
241-
# - TID=Carthages
242-
# script: make test_CarthageBuild
233+
- stage: Test Installation
234+
osx_image: xcode10
235+
before_install:
236+
- brew update
237+
- brew outdated carthage || brew upgrade carthage
238+
env:
239+
- TID=Carthages
240+
script: make test_CarthageBuild

‎DemoApps/GRDBDemoiOS/GRDBDemoiOS/PlayerEditionViewController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ extension PlayerEditionViewController {
5959
}
6060
}
6161

62-
override func willMove(toParent parent: UIViewController?) {
63-
super.willMove(toParent: parent)
62+
override func willMove(toParentViewController parent: UIViewController?) {
63+
super.willMove(toParentViewController: parent)
6464

6565
if parent == nil {
6666
// Self is popping from its navigation controller

‎Tests/Carthage/GRDBiOS/iOS.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,16 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
277479482141D92B00FCD661 /* PlayerEditionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 277479452141D92B00FCD661 /* PlayerEditionViewController.swift */; };
11+
277479492141D92B00FCD661 /* PlayersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 277479462141D92B00FCD661 /* PlayersViewController.swift */; };
12+
2774794A2141D92B00FCD661 /* Player.swift in Sources */ = {isa = PBXBuildFile; fileRef = 277479472141D92B00FCD661 /* Player.swift */; };
1013
5644E4041C1072A30090716E /* GRDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5644E4031C1072A30090716E /* GRDB.framework */; };
1114
5644E4061C1072CA0090716E /* GRDB.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5644E4031C1072A30090716E /* GRDB.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1215
567374431B4D46600089DE44 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 567374411B4D46600089DE44 /* Main.storyboard */; };
1316
567374451B4D46600089DE44 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 567374441B4D46600089DE44 /* Assets.xcassets */; };
1417
567374481B4D46600089DE44 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 567374461B4D46600089DE44 /* LaunchScreen.storyboard */; };
15-
568E2B991CACE4ED00426E7B /* SimplePersonsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 568E2B981CACE4ED00426E7B /* SimplePersonsViewController.swift */; };
1618
56AEC9D91CAA985700452D96 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AEC9D21CAA985700452D96 /* AppDelegate.swift */; };
1719
56AEC9DA1CAA985700452D96 /* AppDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AEC9D31CAA985700452D96 /* AppDatabase.swift */; };
18-
56AEC9DB1CAA985700452D96 /* DemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AEC9D41CAA985700452D96 /* DemoViewController.swift */; };
19-
56AEC9DD1CAA985700452D96 /* Person.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AEC9D61CAA985700452D96 /* Person.swift */; };
20-
56AEC9DE1CAA985700452D96 /* PersonEditionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AEC9D71CAA985700452D96 /* PersonEditionViewController.swift */; };
21-
56AEC9DF1CAA985700452D96 /* PersonsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AEC9D81CAA985700452D96 /* PersonsViewController.swift */; };
2220
/* End PBXBuildFile section */
2321

2422
/* Begin PBXCopyFilesBuildPhase section */
@@ -36,19 +34,17 @@
3634
/* End PBXCopyFilesBuildPhase section */
3735

3836
/* Begin PBXFileReference section */
37+
277479452141D92B00FCD661 /* PlayerEditionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlayerEditionViewController.swift; sourceTree = "<group>"; };
38+
277479462141D92B00FCD661 /* PlayersViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlayersViewController.swift; sourceTree = "<group>"; };
39+
277479472141D92B00FCD661 /* Player.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Player.swift; sourceTree = "<group>"; };
3940
5644E4031C1072A30090716E /* GRDB.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GRDB.framework; path = ../../../Carthage/Build/iOS/GRDB.framework; sourceTree = "<group>"; };
4041
567374381B4D46600089DE44 /* iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
4142
567374421B4D46600089DE44 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
4243
567374441B4D46600089DE44 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4344
567374471B4D46600089DE44 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4445
567374491B4D46600089DE44 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
45-
568E2B981CACE4ED00426E7B /* SimplePersonsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SimplePersonsViewController.swift; sourceTree = "<group>"; };
4646
56AEC9D21CAA985700452D96 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4747
56AEC9D31CAA985700452D96 /* AppDatabase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDatabase.swift; sourceTree = "<group>"; };
48-
56AEC9D41CAA985700452D96 /* DemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoViewController.swift; sourceTree = "<group>"; };
49-
56AEC9D61CAA985700452D96 /* Person.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Person.swift; sourceTree = "<group>"; };
50-
56AEC9D71CAA985700452D96 /* PersonEditionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PersonEditionViewController.swift; sourceTree = "<group>"; };
51-
56AEC9D81CAA985700452D96 /* PersonsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PersonsViewController.swift; sourceTree = "<group>"; };
5248
/* End PBXFileReference section */
5349

5450
/* Begin PBXFrameworksBuildPhase section */
@@ -84,16 +80,14 @@
8480
isa = PBXGroup;
8581
children = (
8682
56AEC9D21CAA985700452D96 /* AppDelegate.swift */,
87-
567374441B4D46600089DE44 /* Assets.xcassets */,
8883
56AEC9D31CAA985700452D96 /* AppDatabase.swift */,
89-
56AEC9D41CAA985700452D96 /* DemoViewController.swift */,
84+
277479472141D92B00FCD661 /* Player.swift */,
85+
277479452141D92B00FCD661 /* PlayerEditionViewController.swift */,
86+
277479462141D92B00FCD661 /* PlayersViewController.swift */,
87+
567374441B4D46600089DE44 /* Assets.xcassets */,
9088
567374491B4D46600089DE44 /* Info.plist */,
9189
567374461B4D46600089DE44 /* LaunchScreen.storyboard */,
9290
567374411B4D46600089DE44 /* Main.storyboard */,
93-
56AEC9D61CAA985700452D96 /* Person.swift */,
94-
56AEC9D71CAA985700452D96 /* PersonEditionViewController.swift */,
95-
56AEC9D81CAA985700452D96 /* PersonsViewController.swift */,
96-
568E2B981CACE4ED00426E7B /* SimplePersonsViewController.swift */,
9791
);
9892
name = GRDBDemoiOS;
9993
path = ../../../DemoApps/GRDBDemoiOS/GRDBDemoiOS;
@@ -190,12 +184,10 @@
190184
isa = PBXSourcesBuildPhase;
191185
buildActionMask = 2147483647;
192186
files = (
193-
56AEC9DD1CAA985700452D96 /* Person.swift in Sources */,
194-
56AEC9DF1CAA985700452D96 /* PersonsViewController.swift in Sources */,
195-
56AEC9DB1CAA985700452D96 /* DemoViewController.swift in Sources */,
187+
277479482141D92B00FCD661 /* PlayerEditionViewController.swift in Sources */,
196188
56AEC9DA1CAA985700452D96 /* AppDatabase.swift in Sources */,
197-
568E2B991CACE4ED00426E7B /* SimplePersonsViewController.swift in Sources */,
198-
56AEC9DE1CAA985700452D96 /* PersonEditionViewController.swift in Sources */,
189+
277479492141D92B00FCD661 /* PlayersViewController.swift in Sources */,
190+
2774794A2141D92B00FCD661 /* Player.swift in Sources */,
199191
56AEC9D91CAA985700452D96 /* AppDelegate.swift in Sources */,
200192
);
201193
runOnlyForDeploymentPostprocessing = 0;

‎Tests/Carthage/GRDBiOS/iOS.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
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>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)