Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
*~
Expand Down
8 changes: 8 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -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
}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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" */;
Expand Down Expand Up @@ -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",
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand Down Expand Up @@ -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;
};
Expand All @@ -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;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.appcelerator.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion iphone/titanium.xcconfig → ios/titanium.xcconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down