diff --git a/ios/Classes/TiWebdialogAuthenticationSessionProxy.h b/ios/Classes/TiWebdialogAuthenticationSessionProxy.h index 42d514f..e0412b1 100644 --- a/ios/Classes/TiWebdialogAuthenticationSessionProxy.h +++ b/ios/Classes/TiWebdialogAuthenticationSessionProxy.h @@ -6,16 +6,12 @@ * Please see the LICENSE included with this distribution for details. */ -#import "TiProxy.h" +#import #import -#if IS_IOS_13 @interface TiWebdialogAuthenticationSessionProxy : TiProxy -#else -@interface TiWebdialogAuthenticationSessionProxy : TiProxy -#endif { - id _authSession; + ASWebAuthenticationSession *_authSession; } #pragma mark Public API's diff --git a/ios/Classes/TiWebdialogAuthenticationSessionProxy.m b/ios/Classes/TiWebdialogAuthenticationSessionProxy.m index 5199015..2bdf2bc 100644 --- a/ios/Classes/TiWebdialogAuthenticationSessionProxy.m +++ b/ios/Classes/TiWebdialogAuthenticationSessionProxy.m @@ -7,35 +7,23 @@ */ #import "TiWebdialogAuthenticationSessionProxy.h" -#import "TiUtils.h" #import @implementation TiWebdialogAuthenticationSessionProxy -- (id)authSession +- (ASWebAuthenticationSession *)authSession { if (_authSession == nil) { NSString *url = [TiUtils stringValue:[self valueForKey:@"url"]]; NSString *scheme = [TiUtils stringValue:[self valueForKey:@"scheme"]]; - if ([TiUtils isIOSVersionOrGreater:@"12.0"]) { - _authSession = [[ASWebAuthenticationSession alloc] initWithURL:[TiUtils toURL:url proxy:self] - callbackURLScheme:scheme - completionHandler:^(NSURL *_Nullable callbackURL, NSError *_Nullable error) { - [self fireEventWithCallbackUrl:callbackURL andError:error]; - }]; -#if IS_IOS_13 - if ([TiUtils isIOSVersionOrGreater:@"13.0"]) { - ((ASWebAuthenticationSession *)_authSession).presentationContextProvider = self; - } -#endif - } else { - _authSession = [[SFAuthenticationSession alloc] initWithURL:[TiUtils toURL:url proxy:self] - callbackURLScheme:scheme - completionHandler:^(NSURL *callbackURL, NSError *error) { - [self fireEventWithCallbackUrl:callbackURL andError:error]; - }]; - } + _authSession = [[ASWebAuthenticationSession alloc] initWithURL:[TiUtils toURL:url proxy:self] + callbackURLScheme:scheme + completionHandler:^(NSURL *_Nullable callbackURL, NSError *_Nullable error) { + [self fireEventWithCallbackUrl:callbackURL andError:error]; + }]; + + _authSession.presentationContextProvider = self; } return _authSession; @@ -71,12 +59,7 @@ - (ASPresentationAnchor)presentationAnchorForWebAuthenticationSession:(ASWebAuth - (void)start:(id)unused { - id session = [self authSession]; - if ([session isKindOfClass:[SFAuthenticationSession class]]) { - [(SFAuthenticationSession *)session start]; - } else if ([session isKindOfClass:[ASWebAuthenticationSession class]]) { - [(ASWebAuthenticationSession *)session start]; - } + [[self authSession] start]; } - (void)cancel:(id)unused @@ -86,7 +69,7 @@ - (void)cancel:(id)unused - (NSNumber *)isSupported:(id)unused { - return NUMBOOL([TiUtils isIOSVersionOrGreater:@"11.0"]); + return @(YES); } @end diff --git a/ios/Classes/TiWebdialogModule.h b/ios/Classes/TiWebdialogModule.h index 8c35e4c..05e797d 100644 --- a/ios/Classes/TiWebdialogModule.h +++ b/ios/Classes/TiWebdialogModule.h @@ -6,7 +6,7 @@ * Please see the LICENSE included with this distribution for details. */ -#import "TiModule.h" +#import #import @interface TiWebdialogModule : TiModule { diff --git a/ios/Classes/TiWebdialogModule.m b/ios/Classes/TiWebdialogModule.m index 3cf4787..51699ca 100644 --- a/ios/Classes/TiWebdialogModule.m +++ b/ios/Classes/TiWebdialogModule.m @@ -7,10 +7,6 @@ */ #import "TiWebdialogModule.h" -#import "TiApp.h" -#import "TiBase.h" -#import "TiHost.h" -#import "TiUtils.h" @implementation TiWebdialogModule @@ -65,17 +61,12 @@ - (SFSafariViewController *)safariController:(NSString *)url withEntersReaderIfA NSString *encodedURL = [url stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet]; NSURL *safariURL = [NSURL URLWithString:encodedURL]; - if (@available(iOS 11.0, *)) { - SFSafariViewControllerConfiguration *config = [[SFSafariViewControllerConfiguration alloc] init]; - config.entersReaderIfAvailable = entersReaderIfAvailable; - config.barCollapsingEnabled = barCollapsingEnabled; + SFSafariViewControllerConfiguration *config = [[SFSafariViewControllerConfiguration alloc] init]; + config.entersReaderIfAvailable = entersReaderIfAvailable; + config.barCollapsingEnabled = barCollapsingEnabled; - _safariController = [[SFSafariViewController alloc] initWithURL:safariURL - configuration:config]; - } else { - _safariController = [[SFSafariViewController alloc] initWithURL:safariURL - entersReaderIfAvailable:entersReaderIfAvailable]; - } + _safariController = [[SFSafariViewController alloc] initWithURL:safariURL + configuration:config]; [_safariController setDelegate:self]; } @@ -160,11 +151,7 @@ - (void)open:(id)args } if ([args objectForKey:@"dismissButtonStyle"]) { - if (@available(iOS 11.0, *)) { - [safari setDismissButtonStyle:[TiUtils intValue:@"dismissButtonStyle" properties:args def:SFSafariViewControllerDismissButtonStyleDone]]; - } else { - NSLog(@"[ERROR] Ti.WebDialog: The dismissButtonStyle property is only available in iOS 11 and later"); - } + [safari setDismissButtonStyle:[TiUtils intValue:@"dismissButtonStyle" properties:args def:SFSafariViewControllerDismissButtonStyleDone]]; } [[TiApp app] showModalController:safari diff --git a/ios/manifest b/ios/manifest index 9e03ce2..57a9912 100644 --- a/ios/manifest +++ b/ios/manifest @@ -2,17 +2,18 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 3.0.2 +version: 4.0.0 apiversion: 2 -architectures: armv7 arm64 i386 x86_64 +architectures: arm64 x86_64 description: titanium-web-dialog author: Hans Knoechel license: Apache 2.0 -copyright: Copyright (c) 2017-present by Axway Appcelerator +mac: false +copyright: Copyright (c) 2017-present by TiDev # these should not be edited name: titanium-web-dialog moduleid: ti.webdialog guid: 1f19cce1-0ad7-4e25-ab3b-0666f54a0a49 platform: iphone -minsdk: 9.2.0 +minsdk: 12.0.0 diff --git a/ios/titanium-web-dialog.xcodeproj/project.pbxproj b/ios/titanium-web-dialog.xcodeproj/project.pbxproj index 331a55a..75c064f 100644 --- a/ios/titanium-web-dialog.xcodeproj/project.pbxproj +++ b/ios/titanium-web-dialog.xcodeproj/project.pbxproj @@ -3,51 +3,28 @@ archiveVersion = 1; classes = { }; - objectVersion = 48; + objectVersion = 54; objects = { -/* Begin PBXAggregateTarget section */ - 24416B8111C4CA220047AFDD /* Build & Test */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 24416B8A11C4CA520047AFDD /* Build configuration list for PBXAggregateTarget "Build & Test" */; - buildPhases = ( - 24416B8011C4CA220047AFDD /* ShellScript */, - ); - dependencies = ( - 24416B8511C4CA280047AFDD /* PBXTargetDependency */, - ); - name = "Build & Test"; - productName = "Build & test"; - }; -/* End PBXAggregateTarget section */ - /* Begin PBXBuildFile section */ 24DD6CF91134B3F500162E58 /* TiWebdialogModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 24DD6CF71134B3F500162E58 /* TiWebdialogModule.h */; }; 24DD6CFA1134B3F500162E58 /* TiWebdialogModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DD6CF81134B3F500162E58 /* TiWebdialogModule.m */; }; 24DE9E1111C5FE74003F90F6 /* TiWebdialogModuleAssets.h in Headers */ = {isa = PBXBuildFile; fileRef = 24DE9E0F11C5FE74003F90F6 /* TiWebdialogModuleAssets.h */; }; 24DE9E1211C5FE74003F90F6 /* TiWebdialogModuleAssets.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DE9E1011C5FE74003F90F6 /* TiWebdialogModuleAssets.m */; }; + 3A5BB0432EBBE70800191F9E /* TitaniumKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A5BB0422EBBE70800191F9E /* TitaniumKit.xcframework */; }; AA747D9F0F9514B9006C5449 /* TiWebdialog_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* TiWebdialog_Prefix.pch */; }; AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; }; DB529B8A1FD5589E003A23FD /* TiWebdialogAuthenticationSessionProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = DB529B881FD5589E003A23FD /* TiWebdialogAuthenticationSessionProxy.h */; }; DB529B8B1FD5589E003A23FD /* TiWebdialogAuthenticationSessionProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = DB529B891FD5589E003A23FD /* TiWebdialogAuthenticationSessionProxy.m */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 24416B8411C4CA280047AFDD /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = D2AAC07D0554694100DB518D; - remoteInfo = "titanium-web-dialog"; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 24DD6CF71134B3F500162E58 /* TiWebdialogModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TiWebdialogModule.h; path = Classes/TiWebdialogModule.h; sourceTree = ""; }; 24DD6CF81134B3F500162E58 /* TiWebdialogModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TiWebdialogModule.m; path = Classes/TiWebdialogModule.m; sourceTree = ""; }; 24DD6D1B1134B66800162E58 /* titanium.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = titanium.xcconfig; sourceTree = ""; }; 24DE9E0F11C5FE74003F90F6 /* TiWebdialogModuleAssets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TiWebdialogModuleAssets.h; path = Classes/TiWebdialogModuleAssets.h; sourceTree = ""; }; 24DE9E1011C5FE74003F90F6 /* TiWebdialogModuleAssets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TiWebdialogModuleAssets.m; path = Classes/TiWebdialogModuleAssets.m; sourceTree = ""; }; + 3A5BB0422EBBE70800191F9E /* TitaniumKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = TitaniumKit.xcframework; path = "$(TITANIUM_SDK)/iphone/Frameworks/TitaniumKit.xcframework"; sourceTree = ""; }; AA747D9E0F9514B9006C5449 /* TiWebdialog_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TiWebdialog_Prefix.pch; sourceTree = SOURCE_ROOT; }; AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; D2AAC07E0554694100DB518D /* libti.webdialog.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libti.webdialog.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -61,6 +38,7 @@ buildActionMask = 2147483647; files = ( AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */, + 3A5BB0432EBBE70800191F9E /* TitaniumKit.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -89,6 +67,7 @@ 0867D69AFE84028FC02AAC07 /* Frameworks */ = { isa = PBXGroup; children = ( + 3A5BB0422EBBE70800191F9E /* TitaniumKit.xcframework */, AACBBE490F95108600F1A2B1 /* Foundation.framework */, ); name = Frameworks; @@ -156,17 +135,16 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0800; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1620; }; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "titanium-web-dialog" */; compatibilityVersion = "Xcode 8.0"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 1; knownRegions = ( - English, - Japanese, - French, - German, + en, + Base, ); mainGroup = 0867D691FE84028FC02AAC07 /* titanium-web-dialog */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; @@ -174,27 +152,10 @@ projectRoot = ""; targets = ( D2AAC07D0554694100DB518D /* titanium-web-dialog */, - 24416B8111C4CA220047AFDD /* Build & Test */, ); }; /* End PBXProject section */ -/* Begin PBXShellScriptBuildPhase section */ - 24416B8011C4CA220047AFDD /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# shell script goes here\n\nappc run --project-dir \"${PROJECT_DIR}\"\nexit $?\n"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ D2AAC07B0554694100DB518D /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -208,14 +169,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 24416B8511C4CA280047AFDD /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = D2AAC07D0554694100DB518D /* titanium-web-dialog */; - targetProxy = 24416B8411C4CA280047AFDD /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 1DEB921F08733DC00010E9CD /* Debug */ = { isa = XCBuildConfiguration; @@ -223,6 +176,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; CLANG_WARN_UNGUARDED_AVAILABILITY = NO; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -243,7 +197,7 @@ GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = ( "-DDEBUG", @@ -267,6 +221,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; CLANG_WARN_UNGUARDED_AVAILABILITY = NO; DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /tmp/TiWebdialog.dst; @@ -289,7 +244,7 @@ GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = "-DTI_POST_1_2"; OTHER_LDFLAGS = "-ObjC"; @@ -305,26 +260,53 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { - CLANG_CXX_LIBRARY = "libstdc++"; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_CXX_LIBRARY = "compiler-default"; + 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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; + 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; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DSTROOT = /tmp/TiWebdialog.dst; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = c99; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = TiWebdialog_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)"; GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = NO; GCC_WARN_MISSING_PARENTHESES = NO; GCC_WARN_SHADOW = NO; GCC_WARN_STRICT_SELECTOR_MATCH = NO; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-DDEBUG", @@ -345,25 +327,50 @@ baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LIBRARY = "libstdc++"; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_CXX_LIBRARY = "compiler-default"; + 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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; + 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; DSTROOT = /tmp/TiWebdialog.dst; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = c99; GCC_MODEL_TUNING = G5; + GCC_NO_COMMON_BLOCKS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = TiWebdialog_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)"; GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_VERSION = ""; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = NO; GCC_WARN_MISSING_PARENTHESES = NO; GCC_WARN_SHADOW = NO; GCC_WARN_STRICT_SELECTOR_MATCH = NO; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; OTHER_CFLAGS = "-DTI_POST_1_2"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = ti.webdialog; @@ -373,29 +380,6 @@ }; name = Release; }; - 24416B8211C4CA220047AFDD /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - PRODUCT_NAME = "Build & test"; - }; - name = Debug; - }; - 24416B8311C4CA220047AFDD /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; - buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PRODUCT_NAME = "Build & test"; - ZERO_LINK = NO; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -417,15 +401,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 24416B8A11C4CA520047AFDD /* Build configuration list for PBXAggregateTarget "Build & Test" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 24416B8211C4CA220047AFDD /* Debug */, - 24416B8311C4CA220047AFDD /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 0867D690FE84028FC02AAC07 /* Project object */; diff --git a/ios/titanium.xcconfig b/ios/titanium.xcconfig index 8dcd471..f5fe6d3 100644 --- a/ios/titanium.xcconfig +++ b/ios/titanium.xcconfig @@ -4,7 +4,7 @@ // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR // // -TITANIUM_SDK_VERSION = 9.3.2.GA +TITANIUM_SDK_VERSION = 13.0.1.GA // // THESE SHOULD BE OK GENERALLY AS-IS @@ -12,5 +12,3 @@ TITANIUM_SDK_VERSION = 9.3.2.GA TITANIUM_SDK = /Users/$(USER)/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION) HEADER_SEARCH_PATHS = $(inherited) "$(TITANIUM_SDK)/iphone/include" FRAMEWORK_SEARCH_PATHS = $(inherited) "$(TITANIUM_SDK)/iphone/Frameworks/**" - -