Skip to content

Commit 9eebac2

Browse files
committed
Fix Example
1 parent 5beecd2 commit 9eebac2

20 files changed

+442
-405
lines changed

.travis.yml

+17-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1-
language: swift
2-
xcode_workspace: Example/Example.xcworkspace
3-
xcode_scheme: Example
4-
xcode_sdk: iphonesimulator
5-
env: CODE_SIGN_IDENTITY=- CODE_SIGNING_REQUIRED=NO
6-
notifications:
7-
email: false
1+
language: objective-c
2+
osx_image: xcode10
3+
env:
4+
global:
5+
- LC_CTYPE=en_US.UTF-8
6+
- LANG=en_US.UTF-8
7+
- WORKSPACE="Example/Example.xcworkspace"
8+
- SCHEME="Example"
9+
matrix:
10+
- DESTINATION="OS=12.0,name=iPhone XS"
11+
- DESTINATION="OS=11.4,name=iPhone X"
12+
- DESTINATION="OS=10.3.1,name=iPhone 7"
13+
script:
14+
- set -o pipefail
15+
- xcodebuild -version
16+
- xcodebuild -showsdks
17+
- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug build | xcpretty

Example/Example.xcodeproj/project.pbxproj

+9-19
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@
109109
ABA197081DC620F20053F02E /* Frameworks */,
110110
ABA197091DC620F20053F02E /* Resources */,
111111
C8B02C13B7A314136E624C45 /* [CP] Embed Pods Frameworks */,
112-
270B71A6659175AEE4F28D14 /* [CP] Copy Pods Resources */,
113112
);
114113
buildRules = (
115114
);
@@ -177,28 +176,16 @@
177176
files = (
178177
);
179178
inputPaths = (
179+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
180+
"${PODS_ROOT}/Manifest.lock",
180181
);
181182
name = "[CP] Check Pods Manifest.lock";
182183
outputPaths = (
184+
"$(DERIVED_FILE_DIR)/Pods-Example-checkManifestLockResult.txt",
183185
);
184186
runOnlyForDeploymentPostprocessing = 0;
185187
shellPath = /bin/sh;
186-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
187-
showEnvVarsInLog = 0;
188-
};
189-
270B71A6659175AEE4F28D14 /* [CP] Copy Pods Resources */ = {
190-
isa = PBXShellScriptBuildPhase;
191-
buildActionMask = 2147483647;
192-
files = (
193-
);
194-
inputPaths = (
195-
);
196-
name = "[CP] Copy Pods Resources";
197-
outputPaths = (
198-
);
199-
runOnlyForDeploymentPostprocessing = 0;
200-
shellPath = /bin/sh;
201-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n";
188+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
202189
showEnvVarsInLog = 0;
203190
};
204191
C8B02C13B7A314136E624C45 /* [CP] Embed Pods Frameworks */ = {
@@ -207,9 +194,12 @@
207194
files = (
208195
);
209196
inputPaths = (
197+
"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
198+
"${BUILT_PRODUCTS_DIR}/JTTableViewController/JTTableViewController.framework",
210199
);
211200
name = "[CP] Embed Pods Frameworks";
212201
outputPaths = (
202+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JTTableViewController.framework",
213203
);
214204
runOnlyForDeploymentPostprocessing = 0;
215205
shellPath = /bin/sh;
@@ -344,7 +334,7 @@
344334
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
345335
PRODUCT_BUNDLE_IDENTIFIER = fr.eivo.Example;
346336
PRODUCT_NAME = "$(TARGET_NAME)";
347-
SWIFT_VERSION = 3.0;
337+
SWIFT_VERSION = 4.2;
348338
};
349339
name = Debug;
350340
};
@@ -358,7 +348,7 @@
358348
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
359349
PRODUCT_BUNDLE_IDENTIFIER = fr.eivo.Example;
360350
PRODUCT_NAME = "$(TARGET_NAME)";
361-
SWIFT_VERSION = 3.0;
351+
SWIFT_VERSION = 4.2;
362352
};
363353
name = Release;
364354
};
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>

Example/Example/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1313

1414
var window: UIWindow?
1515

16-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
16+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1717

1818
window = UIWindow(frame: UIScreen.main.bounds)
1919
window?.makeKeyAndVisible()

Example/Podfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
PODS:
2-
- JTTableViewController (2.0.11)
2+
- JTTableViewController (2.1.3)
33

44
DEPENDENCIES:
55
- JTTableViewController (from `..`)
66

77
EXTERNAL SOURCES:
88
JTTableViewController:
9-
:path: ..
9+
:path: ".."
1010

1111
SPEC CHECKSUMS:
12-
JTTableViewController: 6fe0c45ceeb043195ce84c4c2575cdbcc25301d7
12+
JTTableViewController: a9c2312b138984d9add6966592610f2732c06cd6
1313

1414
PODFILE CHECKSUM: d1393c69b80fdf59d735ab405993c4e9e338446b
1515

16-
COCOAPODS: 1.1.0.rc.2
16+
COCOAPODS: 1.5.3

Example/Pods/Local Podspecs/JTTableViewController.podspec.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)