js/CryptoPassphrase
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

[iOS] Use modules

Browse source
This commit is contained in:
Jonathan Schleifer 2019-01-23 00:35:16 +01:00
parent 3221b97143
commit 6f94644e00
No known key found for this signature in database
GPG key ID: 79D21189A2D4708D
14 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
iOS/AboutController.h
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <UIKit/UIKit.h> @import UIKit;
@interface AboutController: UIViewController <UIWebViewDelegate> @interface AboutController: UIViewController <UIWebViewDelegate>
@property (nonatomic, retain) IBOutlet UIWebView *webView; @property (nonatomic, retain) IBOutlet UIWebView *webView;

2
iOS/AddSiteController.h
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <UIKit/UIKit.h> @import UIKit;
#import "MainViewController.h" #import "MainViewController.h"

2
iOS/AddSiteController.m
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <ObjFW_Bridge/ObjFW_Bridge.h> @import ObjFW_Bridge;
#import "AddSiteController.h" #import "AddSiteController.h"
#import "SelectKeyFileController.h" #import "SelectKeyFileController.h"

2
iOS/AppDelegate.h
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <UIKit/UIKit.h> @import UIKit;
@interface AppDelegate: UIResponder <UIApplicationDelegate> @interface AppDelegate: UIResponder <UIApplicationDelegate>
@property (nonatomic, strong) UIWindow *window; @property (nonatomic, strong) UIWindow *window;

2
iOS/HTTPServerDelegate.h
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <ObjFW/ObjFW.h> @import ObjFW;
@interface HTTPServerDelegate: OFObject <OFHTTPServerDelegate> @interface HTTPServerDelegate: OFObject <OFHTTPServerDelegate>
@end @end

2
iOS/MainViewController.h
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <UIKit/UIKit.h> @import UIKit;
#import "SiteStorage.h" #import "SiteStorage.h"

2
iOS/MainViewController.m
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <ObjFW_Bridge/ObjFW_Bridge.h> @import ObjFW_Bridge;
#import "MainViewController.h" #import "MainViewController.h"

4
iOS/SelectKeyFileController.h
View file

@ -20,8 +20,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <UIKit/UIKit.h> @import ObjFW;
#import <ObjFW/ObjFW.h> @import UIKit;
#import "AddSiteController.h" #import "AddSiteController.h"
#import "HTTPServerDelegate.h" #import "HTTPServerDelegate.h"

2
iOS/SelectKeyFileController.m
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <ObjFW_Bridge/ObjFW_Bridge.h> @import ObjFW_Bridge;
#import "HTTPServerDelegate.h" #import "HTTPServerDelegate.h"
#import "SelectKeyFileController.h" #import "SelectKeyFileController.h"

2
iOS/ShowDetailsController.h
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <UIKit/UIKit.h> @import UIKit;
#import "MainViewController.h" #import "MainViewController.h"

2
iOS/ShowDetailsController.m
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <ObjFW_Bridge/ObjFW_Bridge.h> @import ObjFW_Bridge;
#import "ShowDetailsController.h" #import "ShowDetailsController.h"

2
iOS/SiteStorage.h
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <ObjFW/ObjFW.h> @import ObjFW;
@interface SiteStorage: OFObject @interface SiteStorage: OFObject
{ {

12
iOS/SiteStorage.m
View file

@ -20,7 +20,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import <ObjFW/ObjFW.h> @import ObjFW;
#import "SiteStorage.h" #import "SiteStorage.h"
@ -33,9 +33,9 @@ static OFNumber *lengthField, *legacyField, *keyFileField;
@implementation SiteStorage @implementation SiteStorage
+ (void)initialize + (void)initialize
{ {
lengthField = [@(UINT8_C(0)) retain]; lengthField = [[OFNumber alloc] initWithUInt8: 0];
legacyField = [@(UINT8_C(1)) retain]; legacyField = [[OFNumber alloc] initWithUInt8: 1];
keyFileField = [@(UINT8_C(2)) retain]; keyFileField = [[OFNumber alloc] initWithUInt8: 2];
} }
- (instancetype)init - (instancetype)init
@ -155,8 +155,8 @@ static OFNumber *lengthField, *legacyField, *keyFileField;
OFMutableDictionary *siteDictionary = OFMutableDictionary *siteDictionary =
[OFMutableDictionary dictionary]; [OFMutableDictionary dictionary];
siteDictionary[lengthField] = @(length); siteDictionary[lengthField] = [OFNumber numberWithSize: length];
siteDictionary[legacyField] = @(legacy); siteDictionary[legacyField] = [OFNumber numberWithBool: legacy];
siteDictionary[keyFileField] = keyFile; siteDictionary[keyFileField] = keyFile;
[siteDictionary makeImmutable]; [siteDictionary makeImmutable];

2
iOS/scrypt-pwgen.xcodeproj/project.pbxproj
View file

@ -379,6 +379,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = NO; CLANG_ENABLE_OBJC_ARC = NO;
CLANG_ENABLE_OBJC_WEAK = YES; CLANG_ENABLE_OBJC_WEAK = YES;
DEVELOPMENT_TEAM = MXKNFCKFL6; DEVELOPMENT_TEAM = MXKNFCKFL6;
@ -399,6 +400,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = NO; CLANG_ENABLE_OBJC_ARC = NO;
CLANG_ENABLE_OBJC_WEAK = YES; CLANG_ENABLE_OBJC_WEAK = YES;
DEVELOPMENT_TEAM = MXKNFCKFL6; DEVELOPMENT_TEAM = MXKNFCKFL6;