Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
dda74a19
Unverified
Commit
dda74a19
authored
Oct 15, 2019
by
Jenn Magder
Committed by
GitHub
Oct 15, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase template Swift version from 4 to 5 (#41882)
parent
649cf820
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
31 additions
and
26 deletions
+31
-26
project.pbxproj
...n_tests/ios_host_app_swift/Host.xcodeproj/project.pbxproj
+3
-2
project.pbxproj
dev/manual_tests/macos/Runner.xcodeproj/project.pbxproj
+5
-5
project.pbxproj
examples/flutter_view/ios/Runner.xcodeproj/project.pbxproj
+0
-3
IDEWorkspaceChecks.plist
.../Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+8
-0
project.pbxproj
...atform_channel_swift/ios/Runner.xcodeproj/project.pbxproj
+4
-4
AppDelegate.swift
examples/platform_channel_swift/ios/Runner/AppDelegate.swift
+1
-1
project.pbxproj.tmpl
.../app/ios-swift.tmpl/Runner.xcodeproj/project.pbxproj.tmpl
+4
-5
project.pbxproj.tmpl
...ates/app/macos.tmpl/Runner.xcodeproj/project.pbxproj.tmpl
+4
-4
cocoapods_test.dart
...lutter_tools/test/general.shard/macos/cocoapods_test.dart
+1
-1
project_test.dart
packages/flutter_tools/test/general.shard/project_test.dart
+1
-1
No files found.
dev/integration_tests/ios_host_app_swift/Host.xcodeproj/project.pbxproj
View file @
dda74a19
...
...
@@ -127,6 +127,7 @@
TargetAttributes
=
{
F724F2BD2329B8CC0012DB29
=
{
CreatedOnToolsVersion
=
11.0
;
LastSwiftMigration
=
1100
;
};
};
};
...
...
@@ -379,7 +380,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER
=
io.flutter.add2app.Host
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_VERSION
=
4.2
;
SWIFT_VERSION
=
5.0
;
TARGETED_DEVICE_FAMILY
=
"1,2"
;
};
name
=
Debug
;
...
...
@@ -397,7 +398,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER
=
io.flutter.add2app.Host
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_VERSION
=
4.2
;
SWIFT_VERSION
=
5.0
;
TARGETED_DEVICE_FAMILY
=
"1,2"
;
};
name
=
Release
;
...
...
dev/manual_tests/macos/Runner.xcodeproj/project.pbxproj
View file @
dda74a19
...
...
@@ -60,7 +60,7 @@
/* Begin PBXFileReference section */
333000ED22D3DE5D00554162
/* Warnings.xcconfig */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
text.xcconfig
;
path
=
Warnings.xcconfig
;
sourceTree
=
"<group>"
;
};
335BBD1A22A9A15E00E9071D
/* GeneratedPluginRegistrant.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
GeneratedPluginRegistrant.swift
;
sourceTree
=
"<group>"
;
};
33CC10ED2044A3C60003C045
/* manual_tests.app */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.application
;
includeInIndex
=
0
;
path
=
"manual_tests.app"
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
33CC10ED2044A3C60003C045
/* manual_tests.app */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.application
;
includeInIndex
=
0
;
path
=
manual_tests.app
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
33CC10F02044A3C60003C045
/* AppDelegate.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
AppDelegate.swift
;
sourceTree
=
"<group>"
;
};
33CC10F22044A3C60003C045
/* Assets.xcassets */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
folder.assetcatalog
;
name
=
Assets.xcassets
;
path
=
Runner/Assets.xcassets
;
sourceTree
=
"<group>"
;
};
33CC10F52044A3C60003C045
/* Base */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
name
=
Base
;
path
=
Base.lproj/MainMenu.xib
;
sourceTree
=
"<group>"
;
};
...
...
@@ -199,7 +199,7 @@
TargetAttributes
=
{
33CC10EC2044A3C60003C045
=
{
CreatedOnToolsVersion
=
9.2
;
LastSwiftMigration
=
092
0
;
LastSwiftMigration
=
110
0
;
ProvisioningStyle
=
Automatic
;
SystemCapabilities
=
{
com.apple.Sandbox
=
{
...
...
@@ -383,7 +383,7 @@
"@executable_path/../Frameworks"
,
);
PROVISIONING_PROFILE_SPECIFIER
=
""
;
SWIFT_VERSION
=
4
.0
;
SWIFT_VERSION
=
5
.0
;
};
name
=
Profile
;
};
...
...
@@ -514,7 +514,7 @@
);
PROVISIONING_PROFILE_SPECIFIER
=
""
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Onone"
;
SWIFT_VERSION
=
4
.0
;
SWIFT_VERSION
=
5
.0
;
};
name
=
Debug
;
};
...
...
@@ -537,7 +537,7 @@
"@executable_path/../Frameworks"
,
);
PROVISIONING_PROFILE_SPECIFIER
=
""
;
SWIFT_VERSION
=
4
.0
;
SWIFT_VERSION
=
5
.0
;
};
name
=
Release
;
};
...
...
examples/flutter_view/ios/Runner.xcodeproj/project.pbxproj
View file @
dda74a19
...
...
@@ -394,7 +394,6 @@
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.yourcompany.flutterView
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_VERSION
=
4.0
;
};
name
=
Profile
;
};
...
...
@@ -522,7 +521,6 @@
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.yourcompany.flutterView
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_VERSION
=
4.0
;
};
name
=
Debug
;
};
...
...
@@ -544,7 +542,6 @@
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.yourcompany.flutterView
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_VERSION
=
4.0
;
};
name
=
Release
;
};
...
...
examples/flutter_view/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
0 → 100644
View file @
dda74a19
<
?xml
v
e
rsion="
1
.
0
"
e
n
c
o
d
ing="UT
F
-
8
"?
>
<
!
D
O
C
TYP
E
plist
PU
B
LI
C
"-//
A
ppl
e
//
D
T
D
PLIST
1
.
0
//
E
N"
"http://www.
a
ppl
e
.
c
om/
D
T
D
s/Prop
e
rtyList-
1
.
0
.
d
t
d
"
>
<
plist
v
e
rsion="
1
.
0
"
>
<
d
i
c
t
>
<
k
e
y
>
IDEDidComputeMac32BitWarning
<
/k
e
y
>
<
tru
e
/
>
<
/
d
i
c
t
>
<
/plist
>
examples/platform_channel_swift/ios/Runner.xcodeproj/project.pbxproj
View file @
dda74a19
...
...
@@ -160,7 +160,7 @@
TargetAttributes
=
{
97C146ED1CF9000F007C117D
=
{
CreatedOnToolsVersion
=
7.3.1
;
LastSwiftMigration
=
082
0
;
LastSwiftMigration
=
110
0
;
};
};
};
...
...
@@ -330,7 +330,7 @@
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_OBJC_BRIDGING_HEADER
=
"Runner/Runner-Bridging-Header.h"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Onone"
;
SWIFT_VERSION
=
4
.0
;
SWIFT_VERSION
=
5
.0
;
};
name
=
Profile
;
};
...
...
@@ -462,7 +462,7 @@
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_OBJC_BRIDGING_HEADER
=
"Runner/Runner-Bridging-Header.h"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Onone"
;
SWIFT_VERSION
=
4
.0
;
SWIFT_VERSION
=
5
.0
;
};
name
=
Debug
;
};
...
...
@@ -487,7 +487,7 @@
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_OBJC_BRIDGING_HEADER
=
"Runner/Runner-Bridging-Header.h"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Onone"
;
SWIFT_VERSION
=
4
.0
;
SWIFT_VERSION
=
5
.0
;
};
name
=
Release
;
};
...
...
examples/platform_channel_swift/ios/Runner/AppDelegate.swift
View file @
dda74a19
...
...
@@ -67,7 +67,7 @@ enum MyFlutterErrorCode {
NotificationCenter
.
default
.
addObserver
(
self
,
selector
:
#selector(
AppDelegate.onBatteryStateDidChange
)
,
name
:
NSNotification
.
Name
.
UIDeviceBatteryStateDidChange
,
name
:
UIDevice
.
batteryStateDidChangeNotification
,
object
:
nil
)
return
nil
}
...
...
packages/flutter_tools/templates/app/ios-swift.tmpl/Runner.xcodeproj/project.pbxproj.tmpl
View file @
dda74a19
...
...
@@ -152,7 +152,7 @@
TargetAttributes = {
97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration =
091
0;
LastSwiftMigration =
110
0;
};
};
};
...
...
@@ -323,7 +323,7 @@
PRODUCT_BUNDLE_IDENTIFIER = {{iosIdentifier}};
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION =
4
.0;
SWIFT_VERSION =
5
.0;
VERSIONING_SYSTEM = "apple-generic";
};
name = Profile;
...
...
@@ -458,7 +458,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION =
4
.0;
SWIFT_VERSION =
5
.0;
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
...
...
@@ -484,7 +484,7 @@
PRODUCT_BUNDLE_IDENTIFIER = {{iosIdentifier}};
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION =
4
.0;
SWIFT_VERSION =
5
.0;
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
...
...
@@ -513,7 +513,6 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 97C146E61CF9000F007C117D /* Project object */;
}
packages/flutter_tools/templates/app/macos.tmpl/Runner.xcodeproj/project.pbxproj.tmpl
View file @
dda74a19
...
...
@@ -199,7 +199,7 @@
TargetAttributes = {
33CC10EC2044A3C60003C045 = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration =
092
0;
LastSwiftMigration =
110
0;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.Sandbox = {
...
...
@@ -383,7 +383,7 @@
"@executable_path/../Frameworks",
);
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION =
4
.0;
SWIFT_VERSION =
5
.0;
};
name = Profile;
};
...
...
@@ -514,7 +514,7 @@
);
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION =
4
.0;
SWIFT_VERSION =
5
.0;
};
name = Debug;
};
...
...
@@ -537,7 +537,7 @@
"@executable_path/../Frameworks",
);
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION =
4
.0;
SWIFT_VERSION =
5
.0;
};
name = Release;
};
...
...
packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
View file @
dda74a19
...
...
@@ -186,7 +186,7 @@ void main() {
when
(
mockXcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
true
);
when
(
mockXcodeProjectInterpreter
.
getBuildSettings
(
any
,
any
))
.
thenAnswer
((
_
)
async
=>
<
String
,
String
>{
'SWIFT_VERSION'
:
'
4
.0'
,
'SWIFT_VERSION'
:
'
5
.0'
,
});
final
FlutterProject
project
=
FlutterProject
.
fromPath
(
'project'
);
...
...
packages/flutter_tools/test/general.shard/project_test.dart
View file @
dda74a19
...
...
@@ -314,7 +314,7 @@ void main() {
when
(
mockXcodeProjectInterpreter
.
getBuildSettings
(
any
,
any
)).
thenAnswer
(
(
_
)
{
return
Future
<
Map
<
String
,
String
>>.
value
(<
String
,
String
>{
'SWIFT_VERSION'
:
'
4
.0'
,
'SWIFT_VERSION'
:
'
5
.0'
,
});
});
addAndroidGradleFile
(
project
.
directory
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment