Skip to content

Commit 37d0c76

Browse files
DavinAhnDavinAhn
committed
Migration to swift 4.2 and change demo project settings based on cocoapods 1.6
1 parent 3544038 commit 37d0c76

File tree

4 files changed

+39
-44
lines changed

4 files changed

+39
-44
lines changed

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.2

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Calling native code from Javascript in iOS likes JavascriptInterface in Android.
66
[![License](https://img.shields.io/cocoapods/l/WKJavaScriptController.svg?style=flat)](https://cocoadocs.org/docsets/WKJavaScriptController)
77

88
## Requirements
9-
- Xcode 9.0+
10-
- Swift 3
9+
- Xcode 10.0+
10+
- Swift 4.2
1111
- iOS8+
1212

1313
(based on WKJavaScriptController 1.1.9+)

‎WKJavaScriptController-Demo/WKJavaScriptController-Demo.xcodeproj/project.pbxproj‎

Lines changed: 35 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
83FA35931E2C5C6900A6B171 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 83FA35911E2C5C6900A6B171 /* Main.storyboard */; };
1515
83FA35951E2C5C6900A6B171 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 83FA35941E2C5C6900A6B171 /* Assets.xcassets */; };
1616
83FA35981E2C5C6900A6B171 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 83FA35961E2C5C6900A6B171 /* LaunchScreen.storyboard */; };
17-
CB0AD65C008BA48F9210E557 /* Pods_WKJavaScriptController_Demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08B55A682F3D041AC8429F2E /* Pods_WKJavaScriptController_Demo.framework */; };
17+
9C30B52454ECA3F3E3AEDF4E /* Pods_WKJavaScriptController_Demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 272FAEE1CFFC059EDAA9D22F /* Pods_WKJavaScriptController_Demo.framework */; };
1818
/* End PBXBuildFile section */
1919

2020
/* Begin PBXFileReference section */
21-
08B55A682F3D041AC8429F2E /* Pods_WKJavaScriptController_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WKJavaScriptController_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
21+
272FAEE1CFFC059EDAA9D22F /* Pods_WKJavaScriptController_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WKJavaScriptController_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
22+
2CC90156977464A015EF3DCC /* Pods-WKJavaScriptController-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WKJavaScriptController-Demo.debug.xcconfig"; path = "Target Support Files/Pods-WKJavaScriptController-Demo/Pods-WKJavaScriptController-Demo.debug.xcconfig"; sourceTree = "<group>"; };
2223
83D5383F1E2C960D00E42B6A /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = "<group>"; };
2324
83D538411E2C978000E42B6A /* index.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = index.js; sourceTree = "<group>"; };
2425
83FA358A1E2C5C6900A6B171 /* WKJavaScriptController-Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "WKJavaScriptController-Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -28,16 +29,15 @@
2829
83FA35941E2C5C6900A6B171 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2930
83FA35971E2C5C6900A6B171 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
3031
83FA35991E2C5C6900A6B171 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
31-
DC337D3435A2F775557BE49E /* Pods-WKJavaScriptController-Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WKJavaScriptController-Demo.release.xcconfig"; path = "Pods/Target Support Files/Pods-WKJavaScriptController-Demo/Pods-WKJavaScriptController-Demo.release.xcconfig"; sourceTree = "<group>"; };
32-
E0122CF4DC708DB72576311F /* Pods-WKJavaScriptController-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WKJavaScriptController-Demo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WKJavaScriptController-Demo/Pods-WKJavaScriptController-Demo.debug.xcconfig"; sourceTree = "<group>"; };
32+
FB0AE82DFFE17201B9503726 /* Pods-WKJavaScriptController-Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WKJavaScriptController-Demo.release.xcconfig"; path = "Target Support Files/Pods-WKJavaScriptController-Demo/Pods-WKJavaScriptController-Demo.release.xcconfig"; sourceTree = "<group>"; };
3333
/* End PBXFileReference section */
3434

3535
/* Begin PBXFrameworksBuildPhase section */
3636
83FA35871E2C5C6900A6B171 /* Frameworks */ = {
3737
isa = PBXFrameworksBuildPhase;
3838
buildActionMask = 2147483647;
3939
files = (
40-
CB0AD65C008BA48F9210E557 /* Pods_WKJavaScriptController_Demo.framework in Frameworks */,
40+
9C30B52454ECA3F3E3AEDF4E /* Pods_WKJavaScriptController_Demo.framework in Frameworks */,
4141
);
4242
runOnlyForDeploymentPostprocessing = 0;
4343
};
@@ -49,8 +49,8 @@
4949
children = (
5050
83FA358C1E2C5C6900A6B171 /* WKJavaScriptController-Demo */,
5151
83FA358B1E2C5C6900A6B171 /* Products */,
52-
DA75C6286C5FC176C41F598E /* Pods */,
53-
C2FD788F1BCC126338B37784 /* Frameworks */,
52+
C601BA64EDC03710DF43F3A0 /* Pods */,
53+
C71904662FF5A905B66EB106 /* Frameworks */,
5454
);
5555
sourceTree = "<group>";
5656
};
@@ -77,21 +77,22 @@
7777
path = "WKJavaScriptController-Demo";
7878
sourceTree = "<group>";
7979
};
80-
C2FD788F1BCC126338B37784 /* Frameworks */ = {
80+
C601BA64EDC03710DF43F3A0 /* Pods */ = {
8181
isa = PBXGroup;
8282
children = (
83-
08B55A682F3D041AC8429F2E /* Pods_WKJavaScriptController_Demo.framework */,
83+
2CC90156977464A015EF3DCC /* Pods-WKJavaScriptController-Demo.debug.xcconfig */,
84+
FB0AE82DFFE17201B9503726 /* Pods-WKJavaScriptController-Demo.release.xcconfig */,
8485
);
85-
name = Frameworks;
86+
name = Pods;
87+
path = Pods;
8688
sourceTree = "<group>";
8789
};
88-
DA75C6286C5FC176C41F598E /* Pods */ = {
90+
C71904662FF5A905B66EB106 /* Frameworks */ = {
8991
isa = PBXGroup;
9092
children = (
91-
E0122CF4DC708DB72576311F /* Pods-WKJavaScriptController-Demo.debug.xcconfig */,
92-
DC337D3435A2F775557BE49E /* Pods-WKJavaScriptController-Demo.release.xcconfig */,
93+
272FAEE1CFFC059EDAA9D22F /* Pods_WKJavaScriptController_Demo.framework */,
9394
);
94-
name = Pods;
95+
name = Frameworks;
9596
sourceTree = "<group>";
9697
};
9798
/* End PBXGroup section */
@@ -101,13 +102,12 @@
101102
isa = PBXNativeTarget;
102103
buildConfigurationList = 83FA359C1E2C5C6900A6B171 /* Build configuration list for PBXNativeTarget "WKJavaScriptController-Demo" */;
103104
buildPhases = (
104-
7C3475A598746FB73315144A /* [CP] Check Pods Manifest.lock */,
105+
16F30D6D14CA9CB2B5D05932 /* [CP] Check Pods Manifest.lock */,
105106
83054A791F0C76460001C4B0 /* SwiftLint Script */,
106107
83FA35861E2C5C6900A6B171 /* Sources */,
107108
83FA35871E2C5C6900A6B171 /* Frameworks */,
108109
83FA35881E2C5C6900A6B171 /* Resources */,
109-
FAD7856FCA59270D07D9FB11 /* [CP] Embed Pods Frameworks */,
110-
1B866D096118D00BDF3BDEE0 /* [CP] Copy Pods Resources */,
110+
F74DCF0DFEA075B1393A95B5 /* [CP] Embed Pods Frameworks */,
111111
);
112112
buildRules = (
113113
);
@@ -130,7 +130,7 @@
130130
TargetAttributes = {
131131
83FA35891E2C5C6900A6B171 = {
132132
CreatedOnToolsVersion = 8.2.1;
133-
LastSwiftMigration = 0820;
133+
LastSwiftMigration = 1010;
134134
ProvisioningStyle = Automatic;
135135
};
136136
};
@@ -169,31 +169,20 @@
169169
/* End PBXResourcesBuildPhase section */
170170

171171
/* Begin PBXShellScriptBuildPhase section */
172-
1B866D096118D00BDF3BDEE0 /* [CP] Copy Pods Resources */ = {
172+
16F30D6D14CA9CB2B5D05932 /* [CP] Check Pods Manifest.lock */ = {
173173
isa = PBXShellScriptBuildPhase;
174174
buildActionMask = 2147483647;
175175
files = (
176176
);
177-
inputPaths = (
178-
);
179-
name = "[CP] Copy Pods Resources";
180-
outputPaths = (
181-
);
182-
runOnlyForDeploymentPostprocessing = 0;
183-
shellPath = /bin/sh;
184-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WKJavaScriptController-Demo/Pods-WKJavaScriptController-Demo-resources.sh\"\n";
185-
showEnvVarsInLog = 0;
186-
};
187-
7C3475A598746FB73315144A /* [CP] Check Pods Manifest.lock */ = {
188-
isa = PBXShellScriptBuildPhase;
189-
buildActionMask = 2147483647;
190-
files = (
177+
inputFileListPaths = (
191178
);
192179
inputPaths = (
193180
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
194181
"${PODS_ROOT}/Manifest.lock",
195182
);
196183
name = "[CP] Check Pods Manifest.lock";
184+
outputFileListPaths = (
185+
);
197186
outputPaths = (
198187
"$(DERIVED_FILE_DIR)/Pods-WKJavaScriptController-Demo-checkManifestLockResult.txt",
199188
);
@@ -216,22 +205,26 @@
216205
shellPath = /bin/sh;
217206
shellScript = "function toVersion { echo -e \"$@\" | awk -F. '{ printf(\"%d%03d%03d%03d\\n\", $1,$2,$3,$4); }'; }\nif which swiftlint >/dev/null; then\n current=$(swiftlint version)\n require=\"0.26.0\"\n if [ $(toVersion \"$current\") -ge $(toVersion \"$require\") ]; then\n cd \"${PROJECT_DIR}/../\"\n swiftlint\n else\n echo \"SwiftLint requires a SwiftLint version of >= $require. You are on $current.\"\n echo \"Please update using 'brew upgrade swiftlint'.\"\n exit 101\n fi\nelse\n echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\n exit 100\nfi";
218207
};
219-
FAD7856FCA59270D07D9FB11 /* [CP] Embed Pods Frameworks */ = {
208+
F74DCF0DFEA075B1393A95B5 /* [CP] Embed Pods Frameworks */ = {
220209
isa = PBXShellScriptBuildPhase;
221210
buildActionMask = 2147483647;
222211
files = (
223212
);
213+
inputFileListPaths = (
214+
);
224215
inputPaths = (
225-
"${SRCROOT}/Pods/Target Support Files/Pods-WKJavaScriptController-Demo/Pods-WKJavaScriptController-Demo-frameworks.sh",
216+
"${PODS_ROOT}/Target Support Files/Pods-WKJavaScriptController-Demo/Pods-WKJavaScriptController-Demo-frameworks.sh",
226217
"${BUILT_PRODUCTS_DIR}/WKJavaScriptController/WKJavaScriptController.framework",
227218
);
228219
name = "[CP] Embed Pods Frameworks";
220+
outputFileListPaths = (
221+
);
229222
outputPaths = (
230223
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WKJavaScriptController.framework",
231224
);
232225
runOnlyForDeploymentPostprocessing = 0;
233226
shellPath = /bin/sh;
234-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WKJavaScriptController-Demo/Pods-WKJavaScriptController-Demo-frameworks.sh\"\n";
227+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WKJavaScriptController-Demo/Pods-WKJavaScriptController-Demo-frameworks.sh\"\n";
235228
showEnvVarsInLog = 0;
236229
};
237230
/* End PBXShellScriptBuildPhase section */
@@ -377,30 +370,32 @@
377370
};
378371
83FA359D1E2C5C6900A6B171 /* Debug */ = {
379372
isa = XCBuildConfiguration;
380-
baseConfigurationReference = E0122CF4DC708DB72576311F /* Pods-WKJavaScriptController-Demo.debug.xcconfig */;
373+
baseConfigurationReference = 2CC90156977464A015EF3DCC /* Pods-WKJavaScriptController-Demo.debug.xcconfig */;
381374
buildSettings = {
382375
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
383376
INFOPLIST_FILE = "WKJavaScriptController-Demo/Info.plist";
384377
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
385378
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
386379
PRODUCT_BUNDLE_IDENTIFIER = "com.davin.WKJavaScriptController-Demo";
387380
PRODUCT_NAME = "$(TARGET_NAME)";
388-
SWIFT_VERSION = 3.0;
381+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
382+
SWIFT_VERSION = 4.2;
389383
TARGETED_DEVICE_FAMILY = 1;
390384
};
391385
name = Debug;
392386
};
393387
83FA359E1E2C5C6900A6B171 /* Release */ = {
394388
isa = XCBuildConfiguration;
395-
baseConfigurationReference = DC337D3435A2F775557BE49E /* Pods-WKJavaScriptController-Demo.release.xcconfig */;
389+
baseConfigurationReference = FB0AE82DFFE17201B9503726 /* Pods-WKJavaScriptController-Demo.release.xcconfig */;
396390
buildSettings = {
397391
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
398392
INFOPLIST_FILE = "WKJavaScriptController-Demo/Info.plist";
399393
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
400394
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
401395
PRODUCT_BUNDLE_IDENTIFIER = "com.davin.WKJavaScriptController-Demo";
402396
PRODUCT_NAME = "$(TARGET_NAME)";
403-
SWIFT_VERSION = 3.0;
397+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
398+
SWIFT_VERSION = 4.2;
404399
TARGETED_DEVICE_FAMILY = 1;
405400
};
406401
name = Release;

‎WKJavaScriptController-Demo/WKJavaScriptController-Demo/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import UIKit
44
class AppDelegate: UIResponder, UIApplicationDelegate {
55
var window: UIWindow?
66

7-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
7+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
88
// Override point for customization after application launch.
99
return true
1010
}

0 commit comments

Comments
 (0)