Index: iOS/AddSiteController.m ================================================================== --- iOS/AddSiteController.m +++ iOS/AddSiteController.m @@ -18,11 +18,11 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -@import ObjFW_Bridge; +#import #import "AddSiteController.h" static void showAlert(UIViewController *controller, NSString *title, NSString *message) Index: iOS/Info.plist ================================================================== --- iOS/Info.plist +++ iOS/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString 1.0 CFBundleVersion - 1 + 8 LSRequiresIPhoneOS UILaunchStoryboardName LaunchScreen UIMainStoryboardFile Index: iOS/MainViewController.m ================================================================== --- iOS/MainViewController.m +++ iOS/MainViewController.m @@ -18,11 +18,11 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -@import ObjFW_Bridge; +#import #import "MainViewController.h" #import "AddSiteController.h" #import "ShowDetailsController.h" Index: iOS/ShowDetailsController.m ================================================================== --- iOS/ShowDetailsController.m +++ iOS/ShowDetailsController.m @@ -18,12 +18,12 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -@import ObjFW; -@import ObjFW_Bridge; +#import +#import #import "ShowDetailsController.h" #import "SiteStorage.h" #import "PasswordGenerator.h" Index: iOS/SiteStorage.h ================================================================== --- iOS/SiteStorage.h +++ iOS/SiteStorage.h @@ -18,11 +18,11 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -@import ObjFW; +#import @interface SiteStorage: OFObject { OFString *_path; OFMutableDictionary *> Index: iOS/SiteStorage.m ================================================================== --- iOS/SiteStorage.m +++ iOS/SiteStorage.m @@ -18,11 +18,11 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -@import ObjFW; +#import /* For literals and boxing. */ @compatibility_alias NSDictionary OFDictionary; @compatibility_alias NSNumber OFNumber; Index: iOS/main.m ================================================================== --- iOS/main.m +++ iOS/main.m @@ -18,11 +18,11 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -@import ObjFW; +#import @import UIKit; #import "AppDelegate.h" @interface OFAppDelegate: OFObject Index: iOS/scrypt-pwgen.xcodeproj/project.pbxproj ================================================================== --- iOS/scrypt-pwgen.xcodeproj/project.pbxproj +++ iOS/scrypt-pwgen.xcodeproj/project.pbxproj @@ -12,80 +12,21 @@ 4B2E52E41DA942840040D091 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B2E52E31DA942840040D091 /* AppDelegate.m */; }; 4B2E52E71DA942840040D091 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B2E52E61DA942840040D091 /* MainViewController.m */; }; 4B2E52EA1DA942840040D091 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4B2E52E81DA942840040D091 /* Main.storyboard */; }; 4B2E52EC1DA942840040D091 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B2E52EB1DA942840040D091 /* Assets.xcassets */; }; 4B2E52EF1DA942840040D091 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4B2E52ED1DA942840040D091 /* LaunchScreen.storyboard */; }; + 4B7D94E71F93C30C00A54081 /* libobjfw.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B7D94E51F93C30C00A54081 /* libobjfw.a */; }; + 4B7D94E81F93C32900A54081 /* libobjfw_brige.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B7D94E41F93C30C00A54081 /* libobjfw_brige.a */; }; 4B82D1151DAAAFCE00F32B2F /* AboutController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B82D1141DAAAFCE00F32B2F /* AboutController.m */; }; 4BA115D21DA9432D007ED4EA /* LegacyPasswordGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BA115CE1DA9432D007ED4EA /* LegacyPasswordGenerator.m */; settings = {COMPILER_FLAGS = "-fconstant-string-class=OFConstantString -fno-constant-cfstrings"; }; }; 4BA115D31DA9432D007ED4EA /* NewPasswordGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BA115D01DA9432D007ED4EA /* NewPasswordGenerator.m */; settings = {COMPILER_FLAGS = "-fconstant-string-class=OFConstantString -fno-constant-cfstrings"; }; }; 4BA115D61DA94390007ED4EA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA115D51DA94390007ED4EA /* UIKit.framework */; }; 4BB3CDFD1DA9764300FEE5ED /* AddSiteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB3CDFC1DA9764300FEE5ED /* AddSiteController.m */; }; - 4BEE2FE61F938B3300669DB8 /* ObjFW_Bridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BEE2FE11F938B1700669DB8 /* ObjFW_Bridge.framework */; }; - 4BEE2FE71F938B3300669DB8 /* ObjFW.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BEE2FDD1F938B1700669DB8 /* ObjFW.framework */; }; 4BF4ADEA1DA9A3DB0073B995 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF4ADE91DA9A3DB0073B995 /* Foundation.framework */; }; 4BF4ADED1DA9A6B00073B995 /* SiteStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF4ADEC1DA9A6B00073B995 /* SiteStorage.m */; settings = {COMPILER_FLAGS = "-fconstant-string-class=OFConstantString -fno-constant-cfstrings"; }; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 4BEE2FD61F938B1700669DB8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BEE2FC81F938B1700669DB8 /* ObjFW.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4BF33AF0133807310059CEF7; - remoteInfo = "Tests (Mac)"; - }; - 4BEE2FD81F938B1700669DB8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BEE2FC81F938B1700669DB8 /* ObjFW.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4B76F4751DA2C2BB00CFF831; - remoteInfo = "Tests (iOS)"; - }; - 4BEE2FDA1F938B1700669DB8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BEE2FC81F938B1700669DB8 /* ObjFW.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4B3D23761337FBC800DD29B8; - remoteInfo = "ObjFW (Mac)"; - }; - 4BEE2FDC1F938B1700669DB8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BEE2FC81F938B1700669DB8 /* ObjFW.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4B2C22B01DA292BE00735907; - remoteInfo = "ObjFW (iOS)"; - }; - 4BEE2FDE1F938B1700669DB8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BEE2FC81F938B1700669DB8 /* ObjFW.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4B187E0E163EA29F0049A832; - remoteInfo = "ObjFW_Bridge (Mac)"; - }; - 4BEE2FE01F938B1700669DB8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BEE2FC81F938B1700669DB8 /* ObjFW.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4B0E298B1DA2A8A400323A76; - remoteInfo = "ObjFW_Bridge (iOS)"; - }; - 4BEE2FE21F938B1700669DB8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BEE2FC81F938B1700669DB8 /* ObjFW.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4B23CA8A133811610047A1D9; - remoteInfo = "TestPlugin (Mac)"; - }; - 4BEE2FE41F938B1700669DB8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4BEE2FC81F938B1700669DB8 /* ObjFW.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4B5D70751DA2F87A00B3B2D7; - remoteInfo = "TestPlugin (iOS)"; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 4BB3CDF61DA967C100FEE5ED /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; @@ -108,10 +49,12 @@ 4B2E52E61DA942840040D091 /* MainViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = ""; }; 4B2E52E91DA942840040D091 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 4B2E52EB1DA942840040D091 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 4B2E52EE1DA942840040D091 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 4B2E52F01DA942840040D091 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 4B7D94E41F93C30C00A54081 /* libobjfw_brige.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfw_brige.a; path = ObjFW/lib/libobjfw_brige.a; sourceTree = ""; }; + 4B7D94E51F93C30C00A54081 /* libobjfw.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libobjfw.a; path = ObjFW/lib/libobjfw.a; sourceTree = ""; }; 4B82D1131DAAAFCE00F32B2F /* AboutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutController.h; sourceTree = ""; }; 4B82D1141DAAAFCE00F32B2F /* AboutController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutController.m; sourceTree = ""; }; 4BA115CD1DA9432D007ED4EA /* LegacyPasswordGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LegacyPasswordGenerator.h; path = ../LegacyPasswordGenerator.h; sourceTree = ""; }; 4BA115CE1DA9432D007ED4EA /* LegacyPasswordGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LegacyPasswordGenerator.m; path = ../LegacyPasswordGenerator.m; sourceTree = ""; }; 4BA115CF1DA9432D007ED4EA /* NewPasswordGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NewPasswordGenerator.h; path = ../NewPasswordGenerator.h; sourceTree = ""; }; @@ -118,11 +61,10 @@ 4BA115D01DA9432D007ED4EA /* NewPasswordGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NewPasswordGenerator.m; path = ../NewPasswordGenerator.m; sourceTree = ""; }; 4BA115D11DA9432D007ED4EA /* PasswordGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PasswordGenerator.h; path = ../PasswordGenerator.h; sourceTree = ""; }; 4BA115D51DA94390007ED4EA /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 4BB3CDFB1DA9764300FEE5ED /* AddSiteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSiteController.h; sourceTree = ""; }; 4BB3CDFC1DA9764300FEE5ED /* AddSiteController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddSiteController.m; sourceTree = ""; }; - 4BEE2FC81F938B1700669DB8 /* ObjFW.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ObjFW.xcodeproj; path = ../../ObjFW/ObjFW.xcodeproj; sourceTree = ""; }; 4BF4ADE91DA9A3DB0073B995 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 4BF4ADEB1DA9A6B00073B995 /* SiteStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SiteStorage.h; sourceTree = ""; }; 4BF4ADEC1DA9A6B00073B995 /* SiteStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SiteStorage.m; sourceTree = ""; }; /* End PBXFileReference section */ @@ -129,12 +71,12 @@ /* Begin PBXFrameworksBuildPhase section */ 4B2E52D91DA942840040D091 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4BEE2FE71F938B3300669DB8 /* ObjFW.framework in Frameworks */, - 4BEE2FE61F938B3300669DB8 /* ObjFW_Bridge.framework in Frameworks */, + 4B7D94E71F93C30C00A54081 /* libobjfw.a in Frameworks */, + 4B7D94E81F93C32900A54081 /* libobjfw_brige.a in Frameworks */, 4BF4ADEA1DA9A3DB0073B995 /* Foundation.framework in Frameworks */, 4BA115D61DA94390007ED4EA /* UIKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -196,30 +138,16 @@ sourceTree = ""; }; 4BA115D41DA94390007ED4EA /* Frameworks */ = { isa = PBXGroup; children = ( - 4BEE2FC81F938B1700669DB8 /* ObjFW.xcodeproj */, + 4B7D94E51F93C30C00A54081 /* libobjfw.a */, + 4B7D94E41F93C30C00A54081 /* libobjfw_brige.a */, 4BF4ADE91DA9A3DB0073B995 /* Foundation.framework */, 4BA115D51DA94390007ED4EA /* UIKit.framework */, ); name = Frameworks; - sourceTree = ""; - }; - 4BEE2FC91F938B1700669DB8 /* Products */ = { - isa = PBXGroup; - children = ( - 4BEE2FD71F938B1700669DB8 /* Tests */, - 4BEE2FD91F938B1700669DB8 /* Tests (iOS).app */, - 4BEE2FDB1F938B1700669DB8 /* ObjFW.framework */, - 4BEE2FDD1F938B1700669DB8 /* ObjFW.framework */, - 4BEE2FDF1F938B1700669DB8 /* ObjFW_Bridge.framework */, - 4BEE2FE11F938B1700669DB8 /* ObjFW_Bridge.framework */, - 4BEE2FE31F938B1700669DB8 /* TestPlugin.bundle */, - 4BEE2FE51F938B1700669DB8 /* TestPlugin.bundle */, - ); - name = Products; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -266,82 +194,17 @@ Base, ); mainGroup = 4B2E52D31DA942840040D091; productRefGroup = 4B2E52DD1DA942840040D091 /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 4BEE2FC91F938B1700669DB8 /* Products */; - ProjectRef = 4BEE2FC81F938B1700669DB8 /* ObjFW.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 4B2E52DB1DA942840040D091 /* scrypt-pwgen */, ); }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 4BEE2FD71F938B1700669DB8 /* Tests */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = Tests; - remoteRef = 4BEE2FD61F938B1700669DB8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4BEE2FD91F938B1700669DB8 /* Tests (iOS).app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = "Tests (iOS).app"; - remoteRef = 4BEE2FD81F938B1700669DB8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4BEE2FDB1F938B1700669DB8 /* ObjFW.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ObjFW.framework; - remoteRef = 4BEE2FDA1F938B1700669DB8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4BEE2FDD1F938B1700669DB8 /* ObjFW.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ObjFW.framework; - remoteRef = 4BEE2FDC1F938B1700669DB8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4BEE2FDF1F938B1700669DB8 /* ObjFW_Bridge.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ObjFW_Bridge.framework; - remoteRef = 4BEE2FDE1F938B1700669DB8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4BEE2FE11F938B1700669DB8 /* ObjFW_Bridge.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = ObjFW_Bridge.framework; - remoteRef = 4BEE2FE01F938B1700669DB8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4BEE2FE31F938B1700669DB8 /* TestPlugin.bundle */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.dylib"; - path = TestPlugin.bundle; - remoteRef = 4BEE2FE21F938B1700669DB8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 4BEE2FE51F938B1700669DB8 /* TestPlugin.bundle */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.dylib"; - path = TestPlugin.bundle; - remoteRef = 4BEE2FE41F938B1700669DB8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 4B2E52DA1DA942840040D091 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -487,16 +350,17 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_ARC = NO; DEVELOPMENT_TEAM = MXKNFCKFL6; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)", - ); + HEADER_SEARCH_PATHS = ObjFW/include; INFOPLIST_FILE = Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/ObjFW/lib", + ); PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen.ios"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; @@ -505,16 +369,17 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_ARC = NO; DEVELOPMENT_TEAM = MXKNFCKFL6; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)", - ); + HEADER_SEARCH_PATHS = ObjFW/include; INFOPLIST_FILE = Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/ObjFW/lib", + ); PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen.ios"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; };