diff --git a/README.md b/README.md index ff4860b6..8b3d604e 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ plugins { // Plugin settings: j2objcConfig { - // Xcode workspace directory (suggested directory name) + // Xcode project directory (suggested directory name) xcodeProjectDir '../ios' finalConfigure() // Must be last call to configuration diff --git a/systemTests/simple1/build.gradle b/systemTests/simple1/build.gradle index 030fe21f..013ebd26 100644 --- a/systemTests/simple1/build.gradle +++ b/systemTests/simple1/build.gradle @@ -42,5 +42,6 @@ dependencies { } j2objcConfig { + xcodeProjectDir = 'ios/IOS-SIMPLE1' finalConfigure() } diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1.xcodeproj/project.pbxproj b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1.xcodeproj/project.pbxproj new file mode 100644 index 00000000..c9f4f588 --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1.xcodeproj/project.pbxproj @@ -0,0 +1,511 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 3270C8E68D7A1B7DC7B1D47E /* libPods-IOS-SIMPLE1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D5D7FA092E06BAFDA71D2E8C /* libPods-IOS-SIMPLE1.a */; }; + 93B1034A1BCDD5AB0053FB5C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93B103491BCDD5AB0053FB5C /* AppDelegate.swift */; }; + 93B1034C1BCDD5AB0053FB5C /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93B1034B1BCDD5AB0053FB5C /* ViewController.swift */; }; + 93B1034F1BCDD5AB0053FB5C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 93B1034D1BCDD5AB0053FB5C /* Main.storyboard */; }; + 93B103511BCDD5AB0053FB5C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 93B103501BCDD5AB0053FB5C /* Assets.xcassets */; }; + 93B103541BCDD5AB0053FB5C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 93B103521BCDD5AB0053FB5C /* LaunchScreen.storyboard */; }; + 93B1035F1BCDD5AB0053FB5C /* IOS_SIMPLE1Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93B1035E1BCDD5AB0053FB5C /* IOS_SIMPLE1Tests.swift */; }; + F4BD2483A00994C756568F9C /* libPods-IOS-SIMPLE1Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E77A5C04DC41C77FEC5CCA3 /* libPods-IOS-SIMPLE1Tests.a */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 93B1035B1BCDD5AB0053FB5C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 93B1033E1BCDD5AB0053FB5C /* Project object */; + proxyType = 1; + remoteGlobalIDString = 93B103451BCDD5AB0053FB5C; + remoteInfo = "IOS-SIMPLE1"; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 41D4373D7D84D6D4E8F74F3B /* Pods-IOS-SIMPLE1Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IOS-SIMPLE1Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IOS-SIMPLE1Tests/Pods-IOS-SIMPLE1Tests.debug.xcconfig"; sourceTree = ""; }; + 889022777F02AD893A3C7BE1 /* Pods-IOS-SIMPLE1.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IOS-SIMPLE1.release.xcconfig"; path = "Pods/Target Support Files/Pods-IOS-SIMPLE1/Pods-IOS-SIMPLE1.release.xcconfig"; sourceTree = ""; }; + 93A05C1D1BCDDACC001D5A49 /* IOS-SIMPLE1-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "IOS-SIMPLE1-Bridging-Header.h"; sourceTree = ""; }; + 93B103461BCDD5AB0053FB5C /* IOS-SIMPLE1.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "IOS-SIMPLE1.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 93B103491BCDD5AB0053FB5C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 93B1034B1BCDD5AB0053FB5C /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 93B1034E1BCDD5AB0053FB5C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 93B103501BCDD5AB0053FB5C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 93B103531BCDD5AB0053FB5C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 93B103551BCDD5AB0053FB5C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 93B1035A1BCDD5AB0053FB5C /* IOS-SIMPLE1Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "IOS-SIMPLE1Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 93B1035E1BCDD5AB0053FB5C /* IOS_SIMPLE1Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IOS_SIMPLE1Tests.swift; sourceTree = ""; }; + 93B103601BCDD5AB0053FB5C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 9C0D3D1F7BA823060F1A0523 /* Pods-IOS-SIMPLE1Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IOS-SIMPLE1Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-IOS-SIMPLE1Tests/Pods-IOS-SIMPLE1Tests.release.xcconfig"; sourceTree = ""; }; + 9E77A5C04DC41C77FEC5CCA3 /* libPods-IOS-SIMPLE1Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-IOS-SIMPLE1Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A2151D77EAF7397C3A61292C /* Pods-IOS-SIMPLE1.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IOS-SIMPLE1.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IOS-SIMPLE1/Pods-IOS-SIMPLE1.debug.xcconfig"; sourceTree = ""; }; + D5D7FA092E06BAFDA71D2E8C /* libPods-IOS-SIMPLE1.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-IOS-SIMPLE1.a"; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 93B103431BCDD5AB0053FB5C /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 3270C8E68D7A1B7DC7B1D47E /* libPods-IOS-SIMPLE1.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 93B103571BCDD5AB0053FB5C /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + F4BD2483A00994C756568F9C /* libPods-IOS-SIMPLE1Tests.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 69F5BA15436529B83BA45CA6 /* Frameworks */ = { + isa = PBXGroup; + children = ( + D5D7FA092E06BAFDA71D2E8C /* libPods-IOS-SIMPLE1.a */, + 9E77A5C04DC41C77FEC5CCA3 /* libPods-IOS-SIMPLE1Tests.a */, + ); + name = Frameworks; + sourceTree = ""; + }; + 76506B1AC09E550B92E0687B /* Pods */ = { + isa = PBXGroup; + children = ( + A2151D77EAF7397C3A61292C /* Pods-IOS-SIMPLE1.debug.xcconfig */, + 889022777F02AD893A3C7BE1 /* Pods-IOS-SIMPLE1.release.xcconfig */, + 41D4373D7D84D6D4E8F74F3B /* Pods-IOS-SIMPLE1Tests.debug.xcconfig */, + 9C0D3D1F7BA823060F1A0523 /* Pods-IOS-SIMPLE1Tests.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; + 93B1033D1BCDD5AB0053FB5C = { + isa = PBXGroup; + children = ( + 93B103481BCDD5AB0053FB5C /* IOS-SIMPLE1 */, + 93B1035D1BCDD5AB0053FB5C /* IOS-SIMPLE1Tests */, + 93B103471BCDD5AB0053FB5C /* Products */, + 76506B1AC09E550B92E0687B /* Pods */, + 69F5BA15436529B83BA45CA6 /* Frameworks */, + ); + sourceTree = ""; + }; + 93B103471BCDD5AB0053FB5C /* Products */ = { + isa = PBXGroup; + children = ( + 93B103461BCDD5AB0053FB5C /* IOS-SIMPLE1.app */, + 93B1035A1BCDD5AB0053FB5C /* IOS-SIMPLE1Tests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 93B103481BCDD5AB0053FB5C /* IOS-SIMPLE1 */ = { + isa = PBXGroup; + children = ( + 93A05C1D1BCDDACC001D5A49 /* IOS-SIMPLE1-Bridging-Header.h */, + 93B103491BCDD5AB0053FB5C /* AppDelegate.swift */, + 93B1034B1BCDD5AB0053FB5C /* ViewController.swift */, + 93B1034D1BCDD5AB0053FB5C /* Main.storyboard */, + 93B103501BCDD5AB0053FB5C /* Assets.xcassets */, + 93B103521BCDD5AB0053FB5C /* LaunchScreen.storyboard */, + 93B103551BCDD5AB0053FB5C /* Info.plist */, + ); + path = "IOS-SIMPLE1"; + sourceTree = ""; + }; + 93B1035D1BCDD5AB0053FB5C /* IOS-SIMPLE1Tests */ = { + isa = PBXGroup; + children = ( + 93B1035E1BCDD5AB0053FB5C /* IOS_SIMPLE1Tests.swift */, + 93B103601BCDD5AB0053FB5C /* Info.plist */, + ); + path = "IOS-SIMPLE1Tests"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 93B103451BCDD5AB0053FB5C /* IOS-SIMPLE1 */ = { + isa = PBXNativeTarget; + buildConfigurationList = 93B103631BCDD5AB0053FB5C /* Build configuration list for PBXNativeTarget "IOS-SIMPLE1" */; + buildPhases = ( + FF813721D4FD069F235419B3 /* Check Pods Manifest.lock */, + 93B103421BCDD5AB0053FB5C /* Sources */, + 93B103431BCDD5AB0053FB5C /* Frameworks */, + 93B103441BCDD5AB0053FB5C /* Resources */, + 7519B8B16C423C3E1A2EDB6A /* Copy Pods Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "IOS-SIMPLE1"; + productName = "IOS-SIMPLE1"; + productReference = 93B103461BCDD5AB0053FB5C /* IOS-SIMPLE1.app */; + productType = "com.apple.product-type.application"; + }; + 93B103591BCDD5AB0053FB5C /* IOS-SIMPLE1Tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 93B103661BCDD5AB0053FB5C /* Build configuration list for PBXNativeTarget "IOS-SIMPLE1Tests" */; + buildPhases = ( + E6A5E5B4D3E98CD284C1D2A9 /* Check Pods Manifest.lock */, + 93B103561BCDD5AB0053FB5C /* Sources */, + 93B103571BCDD5AB0053FB5C /* Frameworks */, + 93B103581BCDD5AB0053FB5C /* Resources */, + CFCF0DCD860E603F2315E588 /* Copy Pods Resources */, + ); + buildRules = ( + ); + dependencies = ( + 93B1035C1BCDD5AB0053FB5C /* PBXTargetDependency */, + ); + name = "IOS-SIMPLE1Tests"; + productName = "IOS-SIMPLE1Tests"; + productReference = 93B1035A1BCDD5AB0053FB5C /* IOS-SIMPLE1Tests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 93B1033E1BCDD5AB0053FB5C /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0700; + ORGANIZATIONNAME = "J2ObjC Contrib"; + TargetAttributes = { + 93B103451BCDD5AB0053FB5C = { + CreatedOnToolsVersion = 7.0.1; + }; + 93B103591BCDD5AB0053FB5C = { + CreatedOnToolsVersion = 7.0.1; + TestTargetID = 93B103451BCDD5AB0053FB5C; + }; + }; + }; + buildConfigurationList = 93B103411BCDD5AB0053FB5C /* Build configuration list for PBXProject "IOS-SIMPLE1" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 93B1033D1BCDD5AB0053FB5C; + productRefGroup = 93B103471BCDD5AB0053FB5C /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 93B103451BCDD5AB0053FB5C /* IOS-SIMPLE1 */, + 93B103591BCDD5AB0053FB5C /* IOS-SIMPLE1Tests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 93B103441BCDD5AB0053FB5C /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 93B103541BCDD5AB0053FB5C /* LaunchScreen.storyboard in Resources */, + 93B103511BCDD5AB0053FB5C /* Assets.xcassets in Resources */, + 93B1034F1BCDD5AB0053FB5C /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 93B103581BCDD5AB0053FB5C /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 7519B8B16C423C3E1A2EDB6A /* Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-IOS-SIMPLE1/Pods-IOS-SIMPLE1-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + CFCF0DCD860E603F2315E588 /* Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-IOS-SIMPLE1Tests/Pods-IOS-SIMPLE1Tests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + E6A5E5B4D3E98CD284C1D2A9 /* Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Check Pods Manifest.lock"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; + FF813721D4FD069F235419B3 /* Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Check Pods Manifest.lock"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 93B103421BCDD5AB0053FB5C /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 93B1034C1BCDD5AB0053FB5C /* ViewController.swift in Sources */, + 93B1034A1BCDD5AB0053FB5C /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 93B103561BCDD5AB0053FB5C /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 93B1035F1BCDD5AB0053FB5C /* IOS_SIMPLE1Tests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 93B1035C1BCDD5AB0053FB5C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 93B103451BCDD5AB0053FB5C /* IOS-SIMPLE1 */; + targetProxy = 93B1035B1BCDD5AB0053FB5C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 93B1034D1BCDD5AB0053FB5C /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 93B1034E1BCDD5AB0053FB5C /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 93B103521BCDD5AB0053FB5C /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 93B103531BCDD5AB0053FB5C /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 93B103611BCDD5AB0053FB5C /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + 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", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_OBJC_BRIDGING_HEADER = "IOS-SIMPLE1/IOS-SIMPLE1-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 93B103621BCDD5AB0053FB5C /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + 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; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SWIFT_OBJC_BRIDGING_HEADER = "IOS-SIMPLE1/IOS-SIMPLE1-Bridging-Header.h"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 93B103641BCDD5AB0053FB5C /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = A2151D77EAF7397C3A61292C /* Pods-IOS-SIMPLE1.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = "IOS-SIMPLE1/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.github.j2objc-contrib.j2objc-gradle.IOS-SIMPLE1"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 93B103651BCDD5AB0053FB5C /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 889022777F02AD893A3C7BE1 /* Pods-IOS-SIMPLE1.release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = "IOS-SIMPLE1/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.github.j2objc-contrib.j2objc-gradle.IOS-SIMPLE1"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 93B103671BCDD5AB0053FB5C /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 41D4373D7D84D6D4E8F74F3B /* Pods-IOS-SIMPLE1Tests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + INFOPLIST_FILE = "IOS-SIMPLE1Tests/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.github.j2objc-contrib.j2objc-gradle.IOS-SIMPLE1Tests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/IOS-SIMPLE1.app/IOS-SIMPLE1"; + }; + name = Debug; + }; + 93B103681BCDD5AB0053FB5C /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9C0D3D1F7BA823060F1A0523 /* Pods-IOS-SIMPLE1Tests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + INFOPLIST_FILE = "IOS-SIMPLE1Tests/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.github.j2objc-contrib.j2objc-gradle.IOS-SIMPLE1Tests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/IOS-SIMPLE1.app/IOS-SIMPLE1"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 93B103411BCDD5AB0053FB5C /* Build configuration list for PBXProject "IOS-SIMPLE1" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 93B103611BCDD5AB0053FB5C /* Debug */, + 93B103621BCDD5AB0053FB5C /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 93B103631BCDD5AB0053FB5C /* Build configuration list for PBXNativeTarget "IOS-SIMPLE1" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 93B103641BCDD5AB0053FB5C /* Debug */, + 93B103651BCDD5AB0053FB5C /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 93B103661BCDD5AB0053FB5C /* Build configuration list for PBXNativeTarget "IOS-SIMPLE1Tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 93B103671BCDD5AB0053FB5C /* Debug */, + 93B103681BCDD5AB0053FB5C /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 93B1033E1BCDD5AB0053FB5C /* Project object */; +} diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..1f62bcc6 --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1.xcworkspace/contents.xcworkspacedata b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..cb536e39 --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/AppDelegate.swift b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/AppDelegate.swift new file mode 100644 index 00000000..cf4999a0 --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/AppDelegate.swift @@ -0,0 +1,54 @@ +/* +* Copyright (c) 2015 the authors of j2objc-gradle (see AUTHORS file) +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +import UIKit + +@UIApplicationMain +class AppDelegate: UIResponder, UIApplicationDelegate { + + var window: UIWindow? + + + func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { + // Override point for customization after application launch. + return true + } + + func applicationWillResignActive(application: UIApplication) { + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. + } + + func applicationDidEnterBackground(application: UIApplication) { + // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. + } + + func applicationWillEnterForeground(application: UIApplication) { + // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. + } + + func applicationDidBecomeActive(application: UIApplication) { + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. + } + + func applicationWillTerminate(application: UIApplication) { + // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. + } + + +} + diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/Assets.xcassets/AppIcon.appiconset/Contents.json b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..36d2c80d --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/Base.lproj/LaunchScreen.storyboard b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 00000000..2e721e18 --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/Base.lproj/Main.storyboard b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/Base.lproj/Main.storyboard new file mode 100644 index 00000000..5b114dac --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/Base.lproj/Main.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/IOS-SIMPLE1-Bridging-Header.h b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/IOS-SIMPLE1-Bridging-Header.h new file mode 100644 index 00000000..e3ed5643 --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/IOS-SIMPLE1-Bridging-Header.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2015 the authors of j2objc-gradle (see AUTHORS file) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef IOS_SIMPLE1_Bridging_Header_h +#define IOS_SIMPLE1_Bridging_Header_h + +#import "com/example/HelloWorld.h" + +#endif /* IOS_SIMPLE1_Bridging_Header_h */ diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/Info.plist b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/Info.plist new file mode 100644 index 00000000..40c6215d --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/Info.plist @@ -0,0 +1,47 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/ViewController.swift b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/ViewController.swift new file mode 100644 index 00000000..744878c3 --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1/ViewController.swift @@ -0,0 +1,39 @@ +/* +* Copyright (c) 2015 the authors of j2objc-gradle (see AUTHORS file) +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +import UIKit + +class ViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + // Do any additional setup after loading the view, typically from a nib. + ViewController.helloWorldLog() + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + static func helloWorldLog() -> String { + let helloWorld = ComExampleHelloWorld(NSString: "World") + let helloWorldStr = "\(helloWorld)" + assert (helloWorldStr == "Hello World - Java") + NSLog("J2Objc: \(helloWorldStr) - All OK!") + return helloWorldStr + } +} diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1Tests/IOS_SIMPLE1Tests.swift b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1Tests/IOS_SIMPLE1Tests.swift new file mode 100644 index 00000000..69cf1e28 --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1Tests/IOS_SIMPLE1Tests.swift @@ -0,0 +1,44 @@ +/* +* Copyright (c) 2015 the authors of j2objc-gradle (see AUTHORS file) +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +import XCTest +@testable import IOS_SIMPLE1 + +class IOS_SIMPLE1Tests: XCTestCase { + + override func setUp() { + super.setUp() + // Put setup code here. This method is called before the invocation of each test method in the class. + } + + override func tearDown() { + // Put teardown code here. This method is called after the invocation of each test method in the class. + super.tearDown() + } + + func testHelloWorldLog() { + let helloWorldStr = ViewController.helloWorldLog() + assert (helloWorldStr == "Hello World - Java") + } + + func testPerformanceExample() { + // This is an example of a performance test case. + self.measureBlock { + // Put the code you want to measure the time of here. + } + } + +} diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1Tests/Info.plist b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1Tests/Info.plist new file mode 100644 index 00000000..ba72822e --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/IOS-SIMPLE1Tests/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/Podfile b/systemTests/simple1/ios/IOS-SIMPLE1/Podfile new file mode 100644 index 00000000..2c6eb39d --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/Podfile @@ -0,0 +1,17 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '6.0' + +def j2objc_simple1 + pod 'j2objc-simple1-debug', :configuration => ['Debug'], :path => '../../build' + pod 'j2objc-simple1-release', :configuration => ['Release'], :path => '../../build' +end + +target 'IOS-SIMPLE1' do + + j2objc_simple1 +end + +target 'IOS-SIMPLE1Tests' do + + j2objc_simple1 +end diff --git a/systemTests/simple1/ios/IOS-SIMPLE1/Podfile.lock b/systemTests/simple1/ios/IOS-SIMPLE1/Podfile.lock new file mode 100644 index 00000000..2664ca85 --- /dev/null +++ b/systemTests/simple1/ios/IOS-SIMPLE1/Podfile.lock @@ -0,0 +1,19 @@ +PODS: + - j2objc-simple1-debug (1.0) + - j2objc-simple1-release (1.0) + +DEPENDENCIES: + - j2objc-simple1-debug (from `../../build`) + - j2objc-simple1-release (from `../../build`) + +EXTERNAL SOURCES: + j2objc-simple1-debug: + :path: ../../build + j2objc-simple1-release: + :path: ../../build + +SPEC CHECKSUMS: + j2objc-simple1-debug: 915b726b31e341b655232cb3a1a624f89ebddafe + j2objc-simple1-release: 85f10512b01629bdd23d37ad9bc09327ed8b9a02 + +COCOAPODS: 0.38.2 diff --git a/systemTests/simple1/ios/SIMPLE1.xcworkspace/contents.xcworkspacedata b/systemTests/simple1/ios/SIMPLE1.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..9d770bea --- /dev/null +++ b/systemTests/simple1/ios/SIMPLE1.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/systemTests/simple1/src/main/java/com/example/HelloWorld.java b/systemTests/simple1/src/main/java/com/example/HelloWorld.java index 93a33987..da3e9326 100644 --- a/systemTests/simple1/src/main/java/com/example/HelloWorld.java +++ b/systemTests/simple1/src/main/java/com/example/HelloWorld.java @@ -20,12 +20,15 @@ public class HelloWorld { private final String nameOfWorld; + public HelloWorld() { + this.nameOfWorld = "Simple"; + } public HelloWorld(String nameOfWorld) { this.nameOfWorld = nameOfWorld; } @Override public String toString() { - return "Hello " + nameOfWorld; + return "Hello " + nameOfWorld + " - Java"; } } diff --git a/systemTests/simple1/src/test/java/com/example/HelloWorldTest.java b/systemTests/simple1/src/test/java/com/example/HelloWorldTest.java index 7272554d..d43a3d2b 100644 --- a/systemTests/simple1/src/test/java/com/example/HelloWorldTest.java +++ b/systemTests/simple1/src/test/java/com/example/HelloWorldTest.java @@ -23,6 +23,6 @@ public class HelloWorldTest { @Test public void testToString() { - Assert.assertEquals("Hello Terra", new HelloWorld("Terra").toString()); + Assert.assertEquals("Hello World - Java", new HelloWorld("World").toString()); } }