Skip to content

Commit

Permalink
Update for Xcode 9...
Browse files Browse the repository at this point in the history
- update settings
- comp fixes
- update included libraries
  • Loading branch information
t0rst committed Jul 25, 2018
1 parent 32fcdea commit f67b0d0
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 36 deletions.
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "OpenBankProject/OBPKit-iOSX" "1.1.2"
github "OpenBankProject/OBPKit-iOSX" "1.1.3"
github "kishikawakatsumi/UICKeyChainStore" "v2.1.1"
github "nst/STHTTPRequest" "1.1.3"
github "nst/STHTTPRequest" "1.1.4"
github "t0rst/OAuthCore" "0.0.2"
27 changes: 26 additions & 1 deletion HelloOBP-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
7414C8DD1923B78200084BC3 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0720;
LastUpgradeCheck = 0940;
ORGANIZATIONNAME = TESOBE;
};
buildConfigurationList = 7414C8E01923B78200084BC3 /* Build configuration list for PBXProject "HelloOBP-iOS" */;
Expand Down Expand Up @@ -392,19 +392,31 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
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_OBJC_ROOT_CLASS = YES_ERROR;
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[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand All @@ -431,18 +443,31 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
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_OBJC_ROOT_CLASS = YES_ERROR;
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[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0940"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion HelloOBP-iOS/Main/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ - (void)applicationWillTerminate:(UIApplication *)application
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}

- (BOOL)application:(UIApplication*)a openURL:(NSURL*)u sourceApplication:(NSString*)s annotation:(id)n
- (BOOL)application:(UIApplication*)a openURL:(NSURL*)u options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options
{
return [OBPDefaultWebViewProvider handleCallbackURL: u];
}
Expand Down
17 changes: 0 additions & 17 deletions HelloOBP-iOS/UI/AboutViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -46,23 +46,6 @@ - (void)viewDidLoad
}
}

- (void)viewDidUnload
{
//[self setNameTextField:nil];
[super viewDidUnload];
// Release any retained subviews of the main view.
// e.g. self.myOutlet = nil;

}


/*- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
{
// Return YES for supported orientations
return (interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown);
}*/


/*
#pragma mark - Navigation
Expand Down
5 changes: 0 additions & 5 deletions HelloOBP-iOS/UI/LoginViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,6 @@ - (void)didReceiveMemoryWarning
// Dispose of any resources that can be recreated.
}

- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
{
return NO;
}

- (BOOL)webView:(UIWebView*)webView shouldStartLoadWithRequest:(NSURLRequest*)request
navigationType:(UIWebViewNavigationType)navigationType
{
Expand Down
13 changes: 4 additions & 9 deletions HelloOBP-iOS/UI/MainViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@ - (void)viewDidLoad
}
}

- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
{
return NO;
}

-(void) viewWillAppear:(BOOL)animated{

if (nil == (_session = [OBPSession currentSession]))
Expand Down Expand Up @@ -107,7 +102,7 @@ - (IBAction)connectToBankAPI:(id)sender {
[_session validate:
^(NSError * error)
{
BOOL connected = !error && _session.valid;
BOOL connected = !error && self->_session.valid;
if (connected)
[self fetchBanks];
self.navigationItem.rightBarButtonItem = connected ? self.rightNavButton : nil;
Expand All @@ -125,7 +120,7 @@ - (IBAction)connectToBankAPI:(id)sender {
[_session validate:
^(NSError * error)
{
BOOL connected = !error && _session.valid;
BOOL connected = !error && self->_session.valid;
if (connected)
[self fetchBanks];
self.navigationItem.rightBarButtonItem = connected ? self.rightNavButton : nil;
Expand Down Expand Up @@ -163,7 +158,7 @@ - (IBAction)logOut:(id)sender {
handler:
^(UIAlertAction* action)
{
[_session invalidate];
[self->_session invalidate];
self.navigationItem.rightBarButtonItem = nil;
[self.viewConnect setHidden:NO];
[self.viewLogin setHidden:YES];
Expand Down Expand Up @@ -220,7 +215,7 @@ - (void)fetchBanks
}
NSMutableDictionary* md = [banksDict mutableCopy];
md[@"banksByID"] = banksByID;
_banks = [md copy];
self->_banks = [md copy];
}
orErrorHandler: nil
];
Expand Down

0 comments on commit f67b0d0

Please sign in to comment.