Skip to content

Commit 69e799c

Browse files
authored
Merge pull request #4 from shingt/xcode-11.5
Xcode 11.5 / Apollo 0.30.0 / Switch to SPM
2 parents a7de5a3 + b254581 commit 69e799c

File tree

13 files changed

+96933
-36815
lines changed

13 files changed

+96933
-36815
lines changed

.gitignore

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,3 @@ xcuserdata/
2828
timeline.xctimeline
2929
playground.xcworkspace
3030

31-
# CocoaPods
32-
#
33-
# We recommend against adding the Pods directory to your .gitignore. However
34-
# you should judge for yourself, the pros and cons are mentioned at:
35-
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
36-
#
37-
Pods/
38-
39-
# Carthage
40-
#
41-
# Add this line if you want to avoid checking in source code from Carthage dependencies.
42-
Carthage/Checkouts
43-
Carthage/Build

Cartfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

Cartfile.resolved

Lines changed: 0 additions & 2 deletions
This file was deleted.

GitHub-GraphQL-API-Example-iOS.xcodeproj/project.pbxproj

Lines changed: 44 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 52;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
120103741DFBE26E00E8128E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 120103731DFBE26E00E8128E /* AppDelegate.swift */; };
1111
120103761DFBE26E00E8128E /* RepositoriesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 120103751DFBE26E00E8128E /* RepositoriesViewController.swift */; };
1212
1201037B1DFBE26E00E8128E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1201037A1DFBE26E00E8128E /* Assets.xcassets */; };
1313
1201037E1DFBE26E00E8128E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1201037C1DFBE26E00E8128E /* LaunchScreen.storyboard */; };
14-
120103871DFBF0AD00E8128E /* Apollo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 120103861DFBF0AD00E8128E /* Apollo.framework */; };
1514
1201038B1DFBF28200E8128E /* API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1201038A1DFBF28200E8128E /* API.swift */; };
1615
12A3242C1DFE56EC00D905E7 /* RepositoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12A3242B1DFE56EC00D905E7 /* RepositoryCell.swift */; };
1716
12A3242E1DFF499800D905E7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 12A3242D1DFF499800D905E7 /* Main.storyboard */; };
1817
12A324301E0215E400D905E7 /* RepositoryDetails.graphql in Resources */ = {isa = PBXBuildFile; fileRef = 12A3242F1E0215E400D905E7 /* RepositoryDetails.graphql */; };
1918
12F01AA41DFD05CD00EB0547 /* RepositoriesViewController.graphql in Resources */ = {isa = PBXBuildFile; fileRef = 12F01AA31DFD05CD00EB0547 /* RepositoriesViewController.graphql */; };
19+
DDF8A0B224D643AB0065A795 /* Apollo in Frameworks */ = {isa = PBXBuildFile; productRef = DDF8A0B124D643AB0065A795 /* Apollo */; };
2020
/* End PBXBuildFile section */
2121

2222
/* Begin PBXFileReference section */
@@ -26,7 +26,6 @@
2626
1201037A1DFBE26E00E8128E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2727
1201037D1DFBE26E00E8128E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
2828
1201037F1DFBE26E00E8128E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
29-
120103861DFBF0AD00E8128E /* Apollo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Apollo.framework; path = Carthage/Build/iOS/Apollo.framework; sourceTree = "<group>"; };
3029
1201038A1DFBF28200E8128E /* API.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = "<group>"; };
3130
12A3242B1DFE56EC00D905E7 /* RepositoryCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RepositoryCell.swift; sourceTree = "<group>"; };
3231
12A3242D1DFF499800D905E7 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
@@ -39,7 +38,7 @@
3938
isa = PBXFrameworksBuildPhase;
4039
buildActionMask = 2147483647;
4140
files = (
42-
120103871DFBF0AD00E8128E /* Apollo.framework in Frameworks */,
41+
DDF8A0B224D643AB0065A795 /* Apollo in Frameworks */,
4342
);
4443
runOnlyForDeploymentPostprocessing = 0;
4544
};
@@ -83,7 +82,6 @@
8382
120103851DFBF0AD00E8128E /* Frameworks */ = {
8483
isa = PBXGroup;
8584
children = (
86-
120103861DFBF0AD00E8128E /* Apollo.framework */,
8785
);
8886
name = Frameworks;
8987
sourceTree = "<group>";
@@ -106,6 +104,9 @@
106104
dependencies = (
107105
);
108106
name = "GitHub-GraphQL-API-Example-iOS";
107+
packageProductDependencies = (
108+
DDF8A0B124D643AB0065A795 /* Apollo */,
109+
);
109110
productName = "GitHub-GraphQL-API-Example-iOS";
110111
productReference = 120103701DFBE26E00E8128E /* GitHub-GraphQL-API-Example-iOS.app */;
111112
productType = "com.apple.product-type.application";
@@ -132,10 +133,14 @@
132133
developmentRegion = English;
133134
hasScannedForEncodings = 0;
134135
knownRegions = (
136+
English,
135137
en,
136138
Base,
137139
);
138140
mainGroup = 120103671DFBE26E00E8128E;
141+
packageReferences = (
142+
DDF8A0B024D643AB0065A795 /* XCRemoteSwiftPackageReference "apollo-ios" */,
143+
);
139144
productRefGroup = 120103711DFBE26E00E8128E /* Products */;
140145
projectDirPath = "";
141146
projectRoot = "";
@@ -167,13 +172,13 @@
167172
files = (
168173
);
169174
inputPaths = (
170-
"$(SRCROOT)/Carthage/Build/iOS/Apollo.framework",
171175
);
172176
outputPaths = (
173177
);
174178
runOnlyForDeploymentPostprocessing = 0;
175179
shellPath = /bin/sh;
176-
shellScript = "/usr/local/bin/carthage copy-frameworks";
180+
shellScript = "
181+
";
177182
};
178183
120103891DFBF22000E8128E /* Generate Apollo GraphQL API */ = {
179184
isa = PBXShellScriptBuildPhase;
@@ -187,7 +192,7 @@
187192
);
188193
runOnlyForDeploymentPostprocessing = 0;
189194
shellPath = /bin/sh;
190-
shellScript = "APOLLO_FRAMEWORK_PATH=$(eval find $FRAMEWORK_SEARCH_PATHS -name \"Apollo.framework\" -maxdepth 1)\n\nif [ -z \"$APOLLO_FRAMEWORK_PATH\" ]; then\necho \"error: Couldn't find Apollo.framework in FRAMEWORK_SEARCH_PATHS; make sure to add the framework to your project.\"\nexit 1\nfi\n\ncd ${SRCROOT}/${TARGET_NAME}\n$APOLLO_FRAMEWORK_PATH/check-and-run-apollo-codegen.sh generate $(find . -name '*.graphql') --schema schema.json --output API.swift";
195+
shellScript = "# Go to the build root and search up the chain to find the Derived Data Path where the source packages are checked out.\nDERIVED_DATA_CANDIDATE=\"${BUILD_ROOT}\"\n\nwhile ! [ -d \"${DERIVED_DATA_CANDIDATE}/SourcePackages\" ]; do\n if [ \"${DERIVED_DATA_CANDIDATE}\" = / ]; then\n echo >&2 \"error: Unable to locate SourcePackages directory from BUILD_ROOT: '${BUILD_ROOT}'\"\n exit 1\n fi\n\n DERIVED_DATA_CANDIDATE=\"$(dirname \"${DERIVED_DATA_CANDIDATE}\")\"\ndone\n\n# Grab a reference to the directory where scripts are checked out\nSCRIPT_PATH=\"${DERIVED_DATA_CANDIDATE}/SourcePackages/checkouts/apollo-ios/scripts\"\n\nif [ -z \"${SCRIPT_PATH}\" ]; then\n echo >&2 \"error: Couldn't find the CLI script in your checked out SPM packages; make sure to add the framework to your project.\"\n exit 1\nfi\n\ncd \"${SRCROOT}/${TARGET_NAME}\"\n\"${SCRIPT_PATH}\"/run-bundled-codegen.sh codegen:generate --target=swift --includes=./**/*.graphql --localSchemaFile=\"schema.json\" API.swift\n";
191196
};
192197
/* End PBXShellScriptBuildPhase section */
193198

@@ -305,7 +310,8 @@
305310
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
306311
MTL_ENABLE_DEBUG_INFO = NO;
307312
SDKROOT = iphoneos;
308-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
313+
SWIFT_COMPILATION_MODE = wholemodule;
314+
SWIFT_OPTIMIZATION_LEVEL = "-O";
309315
SWIFT_VERSION = 4.0;
310316
TARGETED_DEVICE_FAMILY = "1,2";
311317
VALIDATE_PRODUCT = YES;
@@ -317,15 +323,15 @@
317323
buildSettings = {
318324
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
319325
DEVELOPMENT_TEAM = 9527BZ5WE5;
320-
FRAMEWORK_SEARCH_PATHS = (
326+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
327+
INFOPLIST_FILE = "GitHub-GraphQL-API-Example-iOS/Info.plist";
328+
LD_RUNPATH_SEARCH_PATHS = (
321329
"$(inherited)",
322-
"$(PROJECT_DIR)/Carthage/Build/iOS",
330+
"@executable_path/Frameworks",
323331
);
324-
INFOPLIST_FILE = "GitHub-GraphQL-API-Example-iOS/Info.plist";
325-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
326332
PRODUCT_BUNDLE_IDENTIFIER = "com.shingt.GitHub-GraphQL-API-Example-iOS";
327333
PRODUCT_NAME = "$(TARGET_NAME)";
328-
SWIFT_VERSION = 3.0;
334+
SWIFT_VERSION = 5.0;
329335
};
330336
name = Debug;
331337
};
@@ -334,15 +340,15 @@
334340
buildSettings = {
335341
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
336342
DEVELOPMENT_TEAM = 9527BZ5WE5;
337-
FRAMEWORK_SEARCH_PATHS = (
343+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
344+
INFOPLIST_FILE = "GitHub-GraphQL-API-Example-iOS/Info.plist";
345+
LD_RUNPATH_SEARCH_PATHS = (
338346
"$(inherited)",
339-
"$(PROJECT_DIR)/Carthage/Build/iOS",
347+
"@executable_path/Frameworks",
340348
);
341-
INFOPLIST_FILE = "GitHub-GraphQL-API-Example-iOS/Info.plist";
342-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
343349
PRODUCT_BUNDLE_IDENTIFIER = "com.shingt.GitHub-GraphQL-API-Example-iOS";
344350
PRODUCT_NAME = "$(TARGET_NAME)";
345-
SWIFT_VERSION = 3.0;
351+
SWIFT_VERSION = 5.0;
346352
};
347353
name = Release;
348354
};
@@ -368,6 +374,25 @@
368374
defaultConfigurationName = Release;
369375
};
370376
/* End XCConfigurationList section */
377+
378+
/* Begin XCRemoteSwiftPackageReference section */
379+
DDF8A0B024D643AB0065A795 /* XCRemoteSwiftPackageReference "apollo-ios" */ = {
380+
isa = XCRemoteSwiftPackageReference;
381+
repositoryURL = "https://github.com/apollographql/apollo-ios.git";
382+
requirement = {
383+
kind = upToNextMinorVersion;
384+
minimumVersion = 0.30.0;
385+
};
386+
};
387+
/* End XCRemoteSwiftPackageReference section */
388+
389+
/* Begin XCSwiftPackageProductDependency section */
390+
DDF8A0B124D643AB0065A795 /* Apollo */ = {
391+
isa = XCSwiftPackageProductDependency;
392+
package = DDF8A0B024D643AB0065A795 /* XCRemoteSwiftPackageReference "apollo-ios" */;
393+
productName = Apollo;
394+
};
395+
/* End XCSwiftPackageProductDependency section */
371396
};
372397
rootObject = 120103681DFBE26E00E8128E /* Project object */;
373398
}
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>

GitHub-GraphQL-API-Example-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 70 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)