diff --git a/.gitignore b/.gitignore index 902988e..9dba1c0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,17 +6,17 @@ android/build.properties # Titanium module build artifacts -iphone/appcelerator.https-iphone-*.zip -iphone/build -iphone/metadata.json +ios/appcelerator.https-iphone-*.zip +ios/build +ios/metadata.json android/dist android/libs # These eight are symlinks -iphone/LICENSE -iphone/assets -iphone/documentation -iphone/example +ios/LICENSE +ios/assets +ios/documentation +ios/example android/LICENSE android/assets android/documentation @@ -28,8 +28,8 @@ example/modules/ # User-specific Xcode settings. -iphone/appcelerator.https.xcodeproj/xcuserdata -iphone/appcelerator.https.xcodeproj/project.xcworkspace/xcuserdata +ios/appcelerator.https.xcodeproj/xcuserdata +ios/appcelerator.https.xcodeproj/project.xcworkspace/xcuserdata # Emacs backup files *~ diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..91c35ae --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,8 @@ +@Library('pipeline-library') _ + +buildModule { + // defaults: + //nodeVersion = '4.7.3' // Must have version set up on Jenkins master before it can be changed + //sdkVersion = '6.0.3.GA' + //androidAPILevel = '23' // if changed, must install on build nodes +} diff --git a/iphone/README.md b/ios/README.md similarity index 100% rename from iphone/README.md rename to ios/README.md diff --git a/iphone/appcelerator.https.xcodeproj/project.pbxproj b/ios/appcelerator.https.xcodeproj/project.pbxproj similarity index 97% rename from iphone/appcelerator.https.xcodeproj/project.pbxproj rename to ios/appcelerator.https.xcodeproj/project.pbxproj index 0aca27b..5262f4f 100644 --- a/iphone/appcelerator.https.xcodeproj/project.pbxproj +++ b/ios/appcelerator.https.xcodeproj/project.pbxproj @@ -259,7 +259,7 @@ C9078CFC192E4E1400B7BDDE /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0600; + LastUpgradeCheck = 0820; ORGANIZATIONNAME = Appcelerator; }; buildConfigurationList = C9078CFF192E4E1400B7BDDE /* Build configuration list for PBXProject "appcelerator.https" */; @@ -359,12 +359,18 @@ 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_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 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", @@ -378,7 +384,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -398,19 +404,24 @@ 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_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 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; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; @@ -451,6 +462,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "appcelerator.https/appcelerator.https-Prefix.pch"; INFOPLIST_FILE = "appcelerator.httpsTests/appcelerator.httpsTests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.appcelerator.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = xctest; }; @@ -467,6 +479,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "appcelerator.https/appcelerator.https-Prefix.pch"; INFOPLIST_FILE = "appcelerator.httpsTests/appcelerator.httpsTests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "com.appcelerator.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = xctest; }; diff --git a/iphone/appcelerator.https.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/appcelerator.https.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from iphone/appcelerator.https.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to ios/appcelerator.https.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/iphone/appcelerator.https/AppceleratorHttps.h b/ios/appcelerator.https/AppceleratorHttps.h similarity index 100% rename from iphone/appcelerator.https/AppceleratorHttps.h rename to ios/appcelerator.https/AppceleratorHttps.h diff --git a/iphone/appcelerator.https/AppceleratorHttpsModule.h b/ios/appcelerator.https/AppceleratorHttpsModule.h similarity index 100% rename from iphone/appcelerator.https/AppceleratorHttpsModule.h rename to ios/appcelerator.https/AppceleratorHttpsModule.h diff --git a/iphone/appcelerator.https/AppceleratorHttpsModule.m b/ios/appcelerator.https/AppceleratorHttpsModule.m similarity index 100% rename from iphone/appcelerator.https/AppceleratorHttpsModule.m rename to ios/appcelerator.https/AppceleratorHttpsModule.m diff --git a/iphone/appcelerator.https/AppceleratorHttpsModuleAssets.h b/ios/appcelerator.https/AppceleratorHttpsModuleAssets.h similarity index 100% rename from iphone/appcelerator.https/AppceleratorHttpsModuleAssets.h rename to ios/appcelerator.https/AppceleratorHttpsModuleAssets.h diff --git a/iphone/appcelerator.https/AppceleratorHttpsModuleAssets.m b/ios/appcelerator.https/AppceleratorHttpsModuleAssets.m similarity index 100% rename from iphone/appcelerator.https/AppceleratorHttpsModuleAssets.m rename to ios/appcelerator.https/AppceleratorHttpsModuleAssets.m diff --git a/iphone/appcelerator.https/AppceleratorHttpsUtils.h b/ios/appcelerator.https/AppceleratorHttpsUtils.h similarity index 100% rename from iphone/appcelerator.https/AppceleratorHttpsUtils.h rename to ios/appcelerator.https/AppceleratorHttpsUtils.h diff --git a/iphone/appcelerator.https/AppceleratorHttpsUtils.m b/ios/appcelerator.https/AppceleratorHttpsUtils.m similarity index 100% rename from iphone/appcelerator.https/AppceleratorHttpsUtils.m rename to ios/appcelerator.https/AppceleratorHttpsUtils.m diff --git a/iphone/appcelerator.https/PinnedURL.h b/ios/appcelerator.https/PinnedURL.h similarity index 100% rename from iphone/appcelerator.https/PinnedURL.h rename to ios/appcelerator.https/PinnedURL.h diff --git a/iphone/appcelerator.https/PinnedURL.m b/ios/appcelerator.https/PinnedURL.m similarity index 100% rename from iphone/appcelerator.https/PinnedURL.m rename to ios/appcelerator.https/PinnedURL.m diff --git a/iphone/appcelerator.https/PublicKey.h b/ios/appcelerator.https/PublicKey.h similarity index 100% rename from iphone/appcelerator.https/PublicKey.h rename to ios/appcelerator.https/PublicKey.h diff --git a/iphone/appcelerator.https/PublicKey.m b/ios/appcelerator.https/PublicKey.m similarity index 100% rename from iphone/appcelerator.https/PublicKey.m rename to ios/appcelerator.https/PublicKey.m diff --git a/iphone/appcelerator.https/SecurityManager.h b/ios/appcelerator.https/SecurityManager.h similarity index 100% rename from iphone/appcelerator.https/SecurityManager.h rename to ios/appcelerator.https/SecurityManager.h diff --git a/iphone/appcelerator.https/SecurityManager.m b/ios/appcelerator.https/SecurityManager.m similarity index 100% rename from iphone/appcelerator.https/SecurityManager.m rename to ios/appcelerator.https/SecurityManager.m diff --git a/iphone/appcelerator.https/X509Certificate.h b/ios/appcelerator.https/X509Certificate.h similarity index 100% rename from iphone/appcelerator.https/X509Certificate.h rename to ios/appcelerator.https/X509Certificate.h diff --git a/iphone/appcelerator.https/X509Certificate.m b/ios/appcelerator.https/X509Certificate.m similarity index 100% rename from iphone/appcelerator.https/X509Certificate.m rename to ios/appcelerator.https/X509Certificate.m diff --git a/iphone/appcelerator.https/X509CertificatePinningSecurityManagerProxy.h b/ios/appcelerator.https/X509CertificatePinningSecurityManagerProxy.h similarity index 100% rename from iphone/appcelerator.https/X509CertificatePinningSecurityManagerProxy.h rename to ios/appcelerator.https/X509CertificatePinningSecurityManagerProxy.h diff --git a/iphone/appcelerator.https/X509CertificatePinningSecurityManagerProxy.m b/ios/appcelerator.https/X509CertificatePinningSecurityManagerProxy.m similarity index 100% rename from iphone/appcelerator.https/X509CertificatePinningSecurityManagerProxy.m rename to ios/appcelerator.https/X509CertificatePinningSecurityManagerProxy.m diff --git a/iphone/appcelerator.https/appcelerator.https-Prefix.pch b/ios/appcelerator.https/appcelerator.https-Prefix.pch similarity index 100% rename from iphone/appcelerator.https/appcelerator.https-Prefix.pch rename to ios/appcelerator.https/appcelerator.https-Prefix.pch diff --git a/iphone/appcelerator.https/appcelerator.https.xcodeproj/project.pbxproj b/ios/appcelerator.https/appcelerator.https.xcodeproj/project.pbxproj similarity index 100% rename from iphone/appcelerator.https/appcelerator.https.xcodeproj/project.pbxproj rename to ios/appcelerator.https/appcelerator.https.xcodeproj/project.pbxproj diff --git a/iphone/appcelerator.https/appcelerator.https.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/appcelerator.https/appcelerator.https.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from iphone/appcelerator.https/appcelerator.https.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to ios/appcelerator.https/appcelerator.https.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/iphone/appcelerator.https/appcelerator.https.xcodeproj/project.xcworkspace/xcuserdata/matt.xcuserdatad/UserInterfaceState.xcuserstate b/ios/appcelerator.https/appcelerator.https.xcodeproj/project.xcworkspace/xcuserdata/matt.xcuserdatad/UserInterfaceState.xcuserstate similarity index 100% rename from iphone/appcelerator.https/appcelerator.https.xcodeproj/project.xcworkspace/xcuserdata/matt.xcuserdatad/UserInterfaceState.xcuserstate rename to ios/appcelerator.https/appcelerator.https.xcodeproj/project.xcworkspace/xcuserdata/matt.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/iphone/appcelerator.https/appcelerator.https.xcodeproj/xcuserdata/matt.xcuserdatad/xcschemes/appcelerator.https.xcscheme b/ios/appcelerator.https/appcelerator.https.xcodeproj/xcuserdata/matt.xcuserdatad/xcschemes/appcelerator.https.xcscheme similarity index 100% rename from iphone/appcelerator.https/appcelerator.https.xcodeproj/xcuserdata/matt.xcuserdatad/xcschemes/appcelerator.https.xcscheme rename to ios/appcelerator.https/appcelerator.https.xcodeproj/xcuserdata/matt.xcuserdatad/xcschemes/appcelerator.https.xcscheme diff --git a/iphone/appcelerator.https/appcelerator.https.xcodeproj/xcuserdata/matt.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/appcelerator.https/appcelerator.https.xcodeproj/xcuserdata/matt.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from iphone/appcelerator.https/appcelerator.https.xcodeproj/xcuserdata/matt.xcuserdatad/xcschemes/xcschememanagement.plist rename to ios/appcelerator.https/appcelerator.https.xcodeproj/xcuserdata/matt.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/iphone/appcelerator.https/appcelerator.https/appcelerator.https-Prefix.pch b/ios/appcelerator.https/appcelerator.https/appcelerator.https-Prefix.pch similarity index 100% rename from iphone/appcelerator.https/appcelerator.https/appcelerator.https-Prefix.pch rename to ios/appcelerator.https/appcelerator.https/appcelerator.https-Prefix.pch diff --git a/iphone/appcelerator.https/appcelerator.https/appcelerator_https.h b/ios/appcelerator.https/appcelerator.https/appcelerator_https.h similarity index 100% rename from iphone/appcelerator.https/appcelerator.https/appcelerator_https.h rename to ios/appcelerator.https/appcelerator.https/appcelerator_https.h diff --git a/iphone/appcelerator.https/appcelerator.https/appcelerator_https.m b/ios/appcelerator.https/appcelerator.https/appcelerator_https.m similarity index 100% rename from iphone/appcelerator.https/appcelerator.https/appcelerator_https.m rename to ios/appcelerator.https/appcelerator.https/appcelerator_https.m diff --git a/iphone/appcelerator.https/appcelerator.httpsTests/appcelerator.httpsTests-Info.plist b/ios/appcelerator.https/appcelerator.httpsTests/appcelerator.httpsTests-Info.plist similarity index 100% rename from iphone/appcelerator.https/appcelerator.httpsTests/appcelerator.httpsTests-Info.plist rename to ios/appcelerator.https/appcelerator.httpsTests/appcelerator.httpsTests-Info.plist diff --git a/iphone/appcelerator.https/appcelerator.httpsTests/appcelerator_httpsTests.m b/ios/appcelerator.https/appcelerator.httpsTests/appcelerator_httpsTests.m similarity index 100% rename from iphone/appcelerator.https/appcelerator.httpsTests/appcelerator_httpsTests.m rename to ios/appcelerator.https/appcelerator.httpsTests/appcelerator_httpsTests.m diff --git a/iphone/appcelerator.https/appcelerator.httpsTests/en.lproj/InfoPlist.strings b/ios/appcelerator.https/appcelerator.httpsTests/en.lproj/InfoPlist.strings similarity index 100% rename from iphone/appcelerator.https/appcelerator.httpsTests/en.lproj/InfoPlist.strings rename to ios/appcelerator.https/appcelerator.httpsTests/en.lproj/InfoPlist.strings diff --git a/iphone/appcelerator.httpsTests/*.prod.ace.appcelerator.com-1.cer b/ios/appcelerator.httpsTests/*.prod.ace.appcelerator.com-1.cer similarity index 100% rename from iphone/appcelerator.httpsTests/*.prod.ace.appcelerator.com-1.cer rename to ios/appcelerator.httpsTests/*.prod.ace.appcelerator.com-1.cer diff --git a/iphone/appcelerator.httpsTests/*.prod.ace.appcelerator.com-2.cer b/ios/appcelerator.httpsTests/*.prod.ace.appcelerator.com-2.cer similarity index 100% rename from iphone/appcelerator.httpsTests/*.prod.ace.appcelerator.com-2.cer rename to ios/appcelerator.httpsTests/*.prod.ace.appcelerator.com-2.cer diff --git a/iphone/appcelerator.httpsTests/AbstractBaseTest.h b/ios/appcelerator.httpsTests/AbstractBaseTest.h similarity index 100% rename from iphone/appcelerator.httpsTests/AbstractBaseTest.h rename to ios/appcelerator.httpsTests/AbstractBaseTest.h diff --git a/iphone/appcelerator.httpsTests/AbstractBaseTest.m b/ios/appcelerator.httpsTests/AbstractBaseTest.m similarity index 100% rename from iphone/appcelerator.httpsTests/AbstractBaseTest.m rename to ios/appcelerator.httpsTests/AbstractBaseTest.m diff --git a/iphone/appcelerator.httpsTests/PinnedURLTests.m b/ios/appcelerator.httpsTests/PinnedURLTests.m similarity index 100% rename from iphone/appcelerator.httpsTests/PinnedURLTests.m rename to ios/appcelerator.httpsTests/PinnedURLTests.m diff --git a/iphone/appcelerator.httpsTests/PublicKeyTests.m b/ios/appcelerator.httpsTests/PublicKeyTests.m similarity index 100% rename from iphone/appcelerator.httpsTests/PublicKeyTests.m rename to ios/appcelerator.httpsTests/PublicKeyTests.m diff --git a/iphone/appcelerator.httpsTests/SecurityManagerTests.m b/ios/appcelerator.httpsTests/SecurityManagerTests.m similarity index 100% rename from iphone/appcelerator.httpsTests/SecurityManagerTests.m rename to ios/appcelerator.httpsTests/SecurityManagerTests.m diff --git a/iphone/appcelerator.httpsTests/X509CertificateTests.m b/ios/appcelerator.httpsTests/X509CertificateTests.m similarity index 100% rename from iphone/appcelerator.httpsTests/X509CertificateTests.m rename to ios/appcelerator.httpsTests/X509CertificateTests.m diff --git a/iphone/appcelerator.httpsTests/appcelerator.httpsTests-Info.plist b/ios/appcelerator.httpsTests/appcelerator.httpsTests-Info.plist similarity index 90% rename from iphone/appcelerator.httpsTests/appcelerator.httpsTests-Info.plist rename to ios/appcelerator.httpsTests/appcelerator.httpsTests-Info.plist index 2c9a3c4..169b6f7 100644 --- a/iphone/appcelerator.httpsTests/appcelerator.httpsTests-Info.plist +++ b/ios/appcelerator.httpsTests/appcelerator.httpsTests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.appcelerator.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/iphone/appcelerator.httpsTests/en.lproj/InfoPlist.strings b/ios/appcelerator.httpsTests/en.lproj/InfoPlist.strings similarity index 100% rename from iphone/appcelerator.httpsTests/en.lproj/InfoPlist.strings rename to ios/appcelerator.httpsTests/en.lproj/InfoPlist.strings diff --git a/iphone/appcelerator.httpsTests/random-org.der b/ios/appcelerator.httpsTests/random-org.der similarity index 100% rename from iphone/appcelerator.httpsTests/random-org.der rename to ios/appcelerator.httpsTests/random-org.der diff --git a/iphone/appcelerator.httpsTests/random-org2.der b/ios/appcelerator.httpsTests/random-org2.der similarity index 100% rename from iphone/appcelerator.httpsTests/random-org2.der rename to ios/appcelerator.httpsTests/random-org2.der diff --git a/iphone/build.py b/ios/build.py similarity index 100% rename from iphone/build.py rename to ios/build.py diff --git a/iphone/hooks/README b/ios/hooks/README similarity index 100% rename from iphone/hooks/README rename to ios/hooks/README diff --git a/iphone/hooks/add.py b/ios/hooks/add.py similarity index 100% rename from iphone/hooks/add.py rename to ios/hooks/add.py diff --git a/iphone/hooks/install.py b/ios/hooks/install.py similarity index 100% rename from iphone/hooks/install.py rename to ios/hooks/install.py diff --git a/iphone/hooks/remove.py b/ios/hooks/remove.py similarity index 100% rename from iphone/hooks/remove.py rename to ios/hooks/remove.py diff --git a/iphone/hooks/uninstall.py b/ios/hooks/uninstall.py similarity index 100% rename from iphone/hooks/uninstall.py rename to ios/hooks/uninstall.py diff --git a/iphone/manifest b/ios/manifest similarity index 100% rename from iphone/manifest rename to ios/manifest diff --git a/iphone/module.xcconfig b/ios/module.xcconfig similarity index 100% rename from iphone/module.xcconfig rename to ios/module.xcconfig diff --git a/iphone/timodule.xml b/ios/timodule.xml similarity index 100% rename from iphone/timodule.xml rename to ios/timodule.xml diff --git a/iphone/titanium.xcconfig b/ios/titanium.xcconfig similarity index 93% rename from iphone/titanium.xcconfig rename to ios/titanium.xcconfig index 9c89cb2..5e9106c 100644 --- a/iphone/titanium.xcconfig +++ b/ios/titanium.xcconfig @@ -1,5 +1,5 @@ //GCC_PREPROCESSOR_DEFINITIONS = USE_TI_NETWORK; -TITANIUM_SDK_VERSION = 6.0.0 +TITANIUM_SDK_VERSION = 6.0.3.GA TITANIUM_SDK_DIR = "~/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION)" TITANIUM_SDK_INCLUDE1 = $(TITANIUM_SDK_DIR)/iphone/include TITANIUM_SDK_INCLUDE2 = $(TITANIUM_SDK_DIR)/iphone/include/APSHTTPClient