This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-ios.git
The following commit(s) were added to refs/heads/master by this push:
new bfc463c refactor: applied various xcode recommended update (#802)
bfc463c is described below
commit bfc463c98dcd98d17cb67bf3fc849c2f2384eebb
Author: エリス <[email protected]>
AuthorDate: Sun Mar 1 07:15:54 2020 +0900
refactor: applied various xcode recommended update (#802)
* refactor: perform xcode recommended update
* refactor: migrate localization & enabled base
---
.../xcshareddata/xcschemes/Cordova.xcscheme | 6 +--
.../CordovaLibApp/CordovaLibApp-Info.plist | 2 +-
tests/CordovaLibTests/CordovaLibTests-Info.plist | 6 +--
.../CordovaLibTests.xcodeproj/project.pbxproj | 45 +++++++++++++++++++---
.../xcschemes/CordovaFrameworkApp.xcscheme | 24 +++++-------
.../xcshareddata/xcschemes/CordovaLib.xcscheme | 6 +--
.../xcshareddata/xcschemes/CordovaLibApp.xcscheme | 24 +++++-------
.../xcschemes/CordovaLibTests.xcscheme | 24 +++++-------
8 files changed, 75 insertions(+), 62 deletions(-)
diff --git
a/CordovaLib/CordovaLib.xcodeproj/xcshareddata/xcschemes/Cordova.xcscheme
b/CordovaLib/CordovaLib.xcodeproj/xcshareddata/xcschemes/Cordova.xcscheme
index b6b4bb0..946c6dd 100644
--- a/CordovaLib/CordovaLib.xcodeproj/xcshareddata/xcschemes/Cordova.xcscheme
+++ b/CordovaLib/CordovaLib.xcodeproj/xcshareddata/xcschemes/Cordova.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "1010"
+ LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
- <AdditionalOptions>
- </AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
ReferencedContainer = "container:CordovaLib.xcodeproj">
</BuildableReference>
</MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
diff --git a/tests/CordovaLibTests/CordovaLibApp/CordovaLibApp-Info.plist
b/tests/CordovaLibTests/CordovaLibApp/CordovaLibApp-Info.plist
index 6c21097..6a012bd 100644
--- a/tests/CordovaLibTests/CordovaLibApp/CordovaLibApp-Info.plist
+++ b/tests/CordovaLibTests/CordovaLibApp/CordovaLibApp-Info.plist
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
-
<string>org.apache.cordova.cordovalibapptests.${PRODUCT_NAME:rfc1034identifier}</string>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
diff --git a/tests/CordovaLibTests/CordovaLibTests-Info.plist
b/tests/CordovaLibTests/CordovaLibTests-Info.plist
index a57a78d..6c76a33 100644
--- a/tests/CordovaLibTests/CordovaLibTests-Info.plist
+++ b/tests/CordovaLibTests/CordovaLibTests-Info.plist
@@ -8,9 +8,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,7 +27,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
- <string>org.apache.cordova.${PRODUCT_NAME:rfc1034identifier}</string>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
diff --git a/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
b/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
index 7a654fe..f29b3cf 100644
--- a/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
+++ b/tests/CordovaLibTests/CordovaLibTests.xcodeproj/project.pbxproj
@@ -310,7 +310,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0600;
+ LastUpgradeCheck = 1130;
TargetAttributes = {
C0FA7CB11E4BBBBE0077B045 = {
TestTargetID =
C0FA7C991E4BB6420077B045;
@@ -319,14 +319,14 @@
};
buildConfigurationList = 1DEB922208733DC00010E9CD /*
Build configuration list for PBXProject "CordovaLibTests" */;
compatibilityVersion = "Xcode 11.0";
- developmentRegion = English;
+ developmentRegion = en;
hasScannedForEncodings = 1;
knownRegions = (
- English,
- Japanese,
- French,
- German,
en,
+ ja,
+ fr,
+ Base,
+ de,
);
mainGroup = 0867D691FE84028FC02AAC07 /* CordovaLib */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products
*/;
@@ -507,16 +507,29 @@
1DEB922308733DC00010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED =
YES;
CLANG_ENABLE_MODULES = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS =
YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = "";
GCC_THUMB_SUPPORT = NO;
@@ -550,16 +563,28 @@
1DEB922408733DC00010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED =
YES;
CLANG_ENABLE_MODULES = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS =
YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = "";
GCC_THUMB_SUPPORT = NO;
GCC_VERSION =
com.apple.compilers.llvm.clang.1_0;
@@ -609,6 +634,7 @@
INFOPLIST_FILE =
"CordovaLibApp/CordovaLibApp-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
+ PRODUCT_BUNDLE_IDENTIFIER =
"org.apache.cordova.cordovalibapptests.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS =
"$(SRCROOT)/../../CordovaLib/Classes/Private/**";
@@ -633,6 +659,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
+ PRODUCT_BUNDLE_IDENTIFIER =
"org.apache.cordova.cordovalibapptests.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS =
"$(SRCROOT)/../../CordovaLib/Classes/Private/**";
@@ -668,6 +695,7 @@
"-all_load",
"-ObjC",
);
+ PRODUCT_BUNDLE_IDENTIFIER =
"org.apache.cordova.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUNDLE_LOADER)";
USER_HEADER_SEARCH_PATHS =
"$(SRCROOT)/../../CordovaLib/Classes/Private/**";
@@ -699,6 +727,7 @@
"-all_load",
"-ObjC",
);
+ PRODUCT_BUNDLE_IDENTIFIER =
"org.apache.cordova.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUNDLE_LOADER)";
USER_HEADER_SEARCH_PATHS =
"$(SRCROOT)/../../CordovaLib/Classes/Private/**";
@@ -730,6 +759,7 @@
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
+ PRODUCT_BUNDLE_IDENTIFIER =
"org.apache.cordova.cordovalibapptests.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS =
"$(SRCROOT)/../../CordovaLib/Classes/Private/**";
@@ -758,6 +788,7 @@
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
+ PRODUCT_BUNDLE_IDENTIFIER =
"org.apache.cordova.cordovalibapptests.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS =
"$(SRCROOT)/../../CordovaLib/Classes/Private/**";
@@ -793,6 +824,7 @@
"-all_load",
"-ObjC",
);
+ PRODUCT_BUNDLE_IDENTIFIER =
"org.apache.cordova.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST =
"$(BUILT_PRODUCTS_DIR)/CordovaFrameworkApp.app/CordovaFrameworkApp";
USER_HEADER_SEARCH_PATHS =
"$(SRCROOT)/../../CordovaLib/Classes/Private/**";
@@ -824,6 +856,7 @@
"-all_load",
"-ObjC",
);
+ PRODUCT_BUNDLE_IDENTIFIER =
"org.apache.cordova.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST =
"$(BUILT_PRODUCTS_DIR)/CordovaFrameworkApp.app/CordovaFrameworkApp";
USER_HEADER_SEARCH_PATHS =
"$(SRCROOT)/../../CordovaLib/Classes/Private/**";
diff --git
a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaFrameworkApp.xcscheme
b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaFrameworkApp.xcscheme
index b12b3e7..990a1f2 100644
---
a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaFrameworkApp.xcscheme
+++
b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaFrameworkApp.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "1010"
+ LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -55,6 +55,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "C0FA7C991E4BB6420077B045"
+ BuildableName = "CordovaFrameworkApp.app"
+ BlueprintName = "CordovaFrameworkApp"
+ ReferencedContainer =
"container:CordovaLibTests/CordovaLibTests.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
@@ -67,17 +76,6 @@
</BuildableReference>
</TestableReference>
</Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "C0FA7C991E4BB6420077B045"
- BuildableName = "CordovaFrameworkApp.app"
- BlueprintName = "CordovaFrameworkApp"
- ReferencedContainer =
"container:CordovaLibTests/CordovaLibTests.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@@ -99,8 +97,6 @@
ReferencedContainer =
"container:CordovaLibTests/CordovaLibTests.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
diff --git
a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme
b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme
index 9371655..98aab17 100644
--- a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme
+++ b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "1010"
+ LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
- <AdditionalOptions>
- </AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
ReferencedContainer =
"container:../CordovaLib/CordovaLib.xcodeproj">
</BuildableReference>
</MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
diff --git
a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibApp.xcscheme
b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibApp.xcscheme
index de2d31c..7d6f65f 100644
---
a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibApp.xcscheme
+++
b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibApp.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "1010"
+ LastUpgradeVersion = "1130"
version = "1.7">
<BuildAction
parallelizeBuildables = "NO"
@@ -55,6 +55,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "303A4067152124BB00182201"
+ BuildableName = "CordovaLibApp.app"
+ BlueprintName = "CordovaLibApp"
+ ReferencedContainer =
"container:CordovaLibTests/CordovaLibTests.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
@@ -71,17 +80,6 @@
</LocationScenarioReference>
</TestableReference>
</Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "303A4067152124BB00182201"
- BuildableName = "CordovaLibApp.app"
- BlueprintName = "CordovaLibApp"
- ReferencedContainer =
"container:CordovaLibTests/CordovaLibTests.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@@ -103,8 +101,6 @@
ReferencedContainer =
"container:CordovaLibTests/CordovaLibTests.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
diff --git
a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibTests.xcscheme
b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibTests.xcscheme
index a619d86..54f0e1b 100644
---
a/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibTests.xcscheme
+++
b/tests/cordova-ios.xcworkspace/xcshareddata/xcschemes/CordovaLibTests.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "1010"
+ LastUpgradeVersion = "1130"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
@@ -41,6 +41,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "686357A8141002F100DF4CF2"
+ BuildableName = "CordovaLibTests.xctest"
+ BlueprintName = "CordovaLibTests"
+ ReferencedContainer =
"container:CordovaLibTests/CordovaLibTests.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
@@ -53,17 +62,6 @@
</BuildableReference>
</TestableReference>
</Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "686357A8141002F100DF4CF2"
- BuildableName = "CordovaLibTests.xctest"
- BlueprintName = "CordovaLibTests"
- ReferencedContainer =
"container:CordovaLibTests/CordovaLibTests.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@@ -84,8 +82,6 @@
ReferencedContainer =
"container:CordovaLibTests/CordovaLibTests.xcodeproj">
</BuildableReference>
</MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
