From 9d6723311fcb3da14847443f86b6b9a97dac893b Mon Sep 17 00:00:00 2001 From: Stephen Feather Date: Thu, 27 Nov 2014 10:00:40 -0500 Subject: [PATCH 1/3] TIMOB-18092 added 64bit support for iOS --- ios/manifest | 7 +-- ios/newsstand.xcodeproj/project.pbxproj | 66 ++++++++++--------------- ios/titanium.xcconfig | 2 +- 3 files changed, 30 insertions(+), 45 deletions(-) diff --git a/ios/manifest b/ios/manifest index 87f8012..af04268 100644 --- a/ios/manifest +++ b/ios/manifest @@ -2,12 +2,13 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 1.0.3 +version: 1.0.4 apiversion: 2 +architectures: armv7 i386 x86_64 arm64 description: Apple NewsKit module for Newsstand apps author: Jon Alter license: Apache License, Version 2.0 -copyright: Copyright (c) 2013 by Appcelerator, Inc. +copyright: Copyright (c) 2013-2014 by Appcelerator, Inc. # these should not be edited @@ -15,4 +16,4 @@ name: newsstand moduleid: ti.newsstand guid: 21c03409-3f8c-41db-bf41-d45eaa784f17 platform: iphone -minsdk: 2.1.3.GA +minsdk: 3.4.1.GA diff --git a/ios/newsstand.xcodeproj/project.pbxproj b/ios/newsstand.xcodeproj/project.pbxproj index 89b1976..25c19e2 100644 --- a/ios/newsstand.xcodeproj/project.pbxproj +++ b/ios/newsstand.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXAggregateTarget section */ @@ -155,8 +155,11 @@ /* Begin PBXProject section */ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0610; + }; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "newsstand" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -218,15 +221,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DSTROOT = /tmp/TiNewsstand.dst; @@ -235,6 +231,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = TiNewsstand_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)"; + GCC_THUMB_SUPPORT = NO; GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = NO; @@ -246,7 +243,7 @@ GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = ( "-DDEBUG", @@ -267,21 +264,15 @@ baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; DSTROOT = /tmp/TiNewsstand.dst; GCC_C_LANGUAGE_STANDARD = c99; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = TiNewsstand_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)"; + GCC_THUMB_SUPPORT = NO; GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = NO; @@ -293,7 +284,8 @@ GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; + "IPHONEOS_DEPLOYMENT_TARGET[sdk=iphoneos*]" = 6.0; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = "-DTI_POST_1_2"; OTHER_LDFLAGS = "-ObjC"; @@ -308,15 +300,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DSTROOT = /tmp/TiNewsstand.dst; @@ -325,6 +310,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = TiNewsstand_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)"; + GCC_THUMB_SUPPORT = NO; GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = NO; @@ -336,6 +322,8 @@ GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; + ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "-DDEBUG", "-DTI_POST_1_2", @@ -355,21 +343,15 @@ baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; DSTROOT = /tmp/TiNewsstand.dst; GCC_C_LANGUAGE_STANDARD = c99; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = TiNewsstand_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)"; + GCC_THUMB_SUPPORT = NO; GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = NO; @@ -381,7 +363,7 @@ GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; OTHER_CFLAGS = "-DTI_POST_1_2"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = TiNewsstand; @@ -398,6 +380,7 @@ COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; + GCC_THUMB_SUPPORT = NO; PRODUCT_NAME = "Build & test"; }; name = Debug; @@ -409,6 +392,7 @@ COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_THUMB_SUPPORT = NO; PRODUCT_NAME = "Build & test"; ZERO_LINK = NO; }; diff --git a/ios/titanium.xcconfig b/ios/titanium.xcconfig index 37f19ca..d43542b 100644 --- a/ios/titanium.xcconfig +++ b/ios/titanium.xcconfig @@ -4,7 +4,7 @@ // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR // // -TITANIUM_SDK_VERSION = 2.1.3.GA +TITANIUM_SDK_VERSION = 3.4.1.GA // From d4717dc0b2fc01c8f5d8f202d5a62879de28f62e Mon Sep 17 00:00:00 2001 From: Stephen Feather Date: Mon, 1 Dec 2014 19:50:56 -0500 Subject: [PATCH 2/3] bumping minor version instead of patch --- ios/manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/manifest b/ios/manifest index af04268..0da9752 100644 --- a/ios/manifest +++ b/ios/manifest @@ -2,7 +2,7 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 1.0.4 +version: 1.1.0 apiversion: 2 architectures: armv7 i386 x86_64 arm64 description: Apple NewsKit module for Newsstand apps From d11284762a21da5d720b364fbfe552ad411e9239 Mon Sep 17 00:00:00 2001 From: Stephen Feather Date: Mon, 1 Dec 2014 20:46:11 -0500 Subject: [PATCH 3/3] updating changelog --- ios/documentation/changelog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/documentation/changelog.md b/ios/documentation/changelog.md index caed3cf..53ebd4b 100644 --- a/ios/documentation/changelog.md +++ b/ios/documentation/changelog.md @@ -1,5 +1,7 @@ # Change Log 
+v1.1.0  [TIMOB-18092] Updated to build for 64bit
+
 v1.0.3  Added a new Alloy example app [MOD-1343]
 	
 v1.0.2  Converted documentation to YAML [MOD-1344]