From 8a381e1c6076d7e3683837c1aaf3524c391d4da5 Mon Sep 17 00:00:00 2001 From: Ivan Smolin Date: Mon, 25 Jan 2021 13:07:43 +0500 Subject: [PATCH] update project settings --- Podfile.lock | 21 +++++++++++---------- testapp.xcodeproj/project.pbxproj | 20 +++++++------------- testapp/Info.plist | 4 ++-- testapp/SceneDelegate.swift | 1 + 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 5e619d5..7df53cc 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -83,24 +83,25 @@ PODS: - GoogleToolboxForMac/Defines (= 2.3.0) - "GoogleToolboxForMac/NSData+zlib (2.3.0)": - GoogleToolboxForMac/Defines (= 2.3.0) - - GoogleUtilities/AppDelegateSwizzler (6.5.2): + - GoogleUtilities/AppDelegateSwizzler (6.7.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (6.5.2) + - GoogleUtilities/Environment (6.7.2): + - PromisesObjC (~> 1.2) - GoogleUtilities/ISASwizzler (6.7.2) - - GoogleUtilities/Logger (6.5.2): + - GoogleUtilities/Logger (6.7.2): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (6.5.2): + - GoogleUtilities/MethodSwizzler (6.7.2): - GoogleUtilities/Logger - - GoogleUtilities/Network (6.5.2): + - GoogleUtilities/Network (6.7.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (6.5.2)" - - GoogleUtilities/Reachability (6.5.2): + - "GoogleUtilities/NSData+zlib (6.7.2)" + - GoogleUtilities/Reachability (6.7.2): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (6.5.2): + - GoogleUtilities/UserDefaults (6.7.2): - GoogleUtilities/Logger - GTMSessionFetcher/Core (1.5.0) - LicensePlist (3.0.5) @@ -131,7 +132,6 @@ SPEC REPOS: - FirebaseInstallations - GoogleDataTransport - GoogleDataTransportCCTSupport - - GoogleUtilities - nanopb - PromisesObjC trunk: @@ -141,6 +141,7 @@ SPEC REPOS: - FirebaseRemoteConfig - GoogleAppMeasurement - GoogleToolboxForMac + - GoogleUtilities - GTMSessionFetcher - LicensePlist - Protobuf @@ -162,7 +163,7 @@ SPEC CHECKSUMS: GoogleDataTransport: b29a21d813e906014ca16c00897827e40e4a24ab GoogleDataTransportCCTSupport: 6f15a89b0ca35d6fa523e1f752ef818588885988 GoogleToolboxForMac: 1350d40e86a76f7863928d63bcb0b89c84c521c5 - GoogleUtilities: ad0f3b691c67909d03a3327cc205222ab8f42e0e + GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3 GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52 LicensePlist: 11c638fa9dc22ddb5771cdf910242ae1ba2684da nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd diff --git a/testapp.xcodeproj/project.pbxproj b/testapp.xcodeproj/project.pbxproj index c668bb7..359890e 100644 --- a/testapp.xcodeproj/project.pbxproj +++ b/testapp.xcodeproj/project.pbxproj @@ -189,7 +189,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1130; - LastUpgradeCheck = 1130; + LastUpgradeCheck = 1220; ORGANIZATIONNAME = touchin; TargetAttributes = { 4CEDA815243116E2009937F6 = { @@ -350,6 +350,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -410,6 +411,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -440,17 +442,14 @@ }; 4CEDA82B243116E4009937F6 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D84BC60B89033587ECDE53FF /* Pods-testapp.debug.xcconfig */; + baseConfigurationReference = 78D67F4825BEB1AC00701E3B /* testappStandardTouchinDevWithoutSSLPinningDebug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - GOOGLE_SERVICE_INFO_PLIST_PATH = "/Users/vladsuhomlinov/TestApp/testapp/testapp/Resources/GoogleService-Info.plist"; INFOPLIST_FILE = testapp/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = ru.touchin.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; @@ -459,17 +458,14 @@ }; 4CEDA82C243116E4009937F6 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 850F47AFCB96FB78E12B45A6 /* Pods-testapp.release.xcconfig */; + baseConfigurationReference = 78D67F4E25BEB1AC00701E3B /* testappEnterpriseTouchinStageWithSSLPinningRelease.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - GOOGLE_SERVICE_INFO_PLIST_PATH = "/Users/vladsuhomlinov/TestApp/testapp/testapp/Resources/GoogleService-Info.plist"; INFOPLIST_FILE = testapp/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = ru.touchin.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; @@ -502,6 +498,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -532,17 +529,14 @@ }; 78D67F6E25BEB1F300701E3B /* AppStore */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1A298113541BC1F2C4C002E5 /* Pods-testapp.appstore.xcconfig */; + baseConfigurationReference = 78D67F4925BEB1AC00701E3B /* testappAppStoreTouchinProdWithSSLPinningRelease.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - GOOGLE_SERVICE_INFO_PLIST_PATH = "/Users/vladsuhomlinov/TestApp/testapp/testapp/Resources/GoogleService-Info.plist"; INFOPLIST_FILE = testapp/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = ru.touchin.testapp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; diff --git a/testapp/Info.plist b/testapp/Info.plist index 2a3483c..acb5a99 100644 --- a/testapp/Info.plist +++ b/testapp/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + 2.0 CFBundleVersion - 1 + 4 LSRequiresIPhoneOS UIApplicationSceneManifest diff --git a/testapp/SceneDelegate.swift b/testapp/SceneDelegate.swift index 32a4b90..65a3568 100644 --- a/testapp/SceneDelegate.swift +++ b/testapp/SceneDelegate.swift @@ -8,6 +8,7 @@ import UIKit +@available(iOS 13.0, *) class SceneDelegate: UIResponder, UIWindowSceneDelegate { var window: UIWindow?