Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-17928] Updated iOS module for 64-bit #7

Merged
merged 4 commits into from
Nov 20, 2014
Merged

[TIMOB-17928] Updated iOS module for 64-bit #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97546a1
[TIMOB-17928] Updated iOS module for 64-bit
pec1985 Nov 6, 2014
bf706b1
[TIMOB-17928] iOS - Removed old packaged module
pec1985 Nov 6, 2014
874f4e6
Merge branch 'master' of github.com:appcelerator-modules/ti.storekit …
pec1985 Nov 20, 2014
cbccf46
[TIMOB-17928] Updated travis.yml
pec1985 Nov 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ before_install:
install:
- cd $MODULE_ROOT
- curl -o install.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/install.sh
- source install.sh -s "3.1.3.GA"
- source install.sh -s "3.2.2.GA"
script:
- curl -o script.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/script.sh
- source script.sh
Expand Down
2 changes: 2 additions & 0 deletions ios/documentation/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Change Log
<pre>
v3.1.0 TIMOB-17928 Updated to build for 64-bit

v3.0.0 MOD-1491: Add support new iOS 7 receipt.
MOD-875: Add support for the download of Apple hosted IAP.
MOD-1570: Add an informative alert or popup when running on iOS7 simulator.
Expand Down
4 changes: 2 additions & 2 deletions ios/manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 3.0.0
version: 3.1.0
apiversion: 2
description: Apple StoreKit module for in application purchases
author: Jeff Haynie, Jeff English, & Jon Alter
Expand All @@ -15,4 +15,4 @@ name: storekit
moduleid: ti.storekit
guid: 67fdca33-590b-498d-bd4e-1fc3a8be0f37
platform: iphone
minsdk: 3.1.3.GA
minsdk: 3.2.2.GA
44 changes: 5 additions & 39 deletions ios/storekit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 45;
objectVersion = 46;
objects = {

/* Begin PBXAggregateTarget section */
Expand Down Expand Up @@ -558,9 +558,10 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0600;
};
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "storekit" */;
compatibilityVersion = "Xcode 3.1";
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
Expand Down Expand Up @@ -630,15 +631,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
buildSettings = {
ARCHS = (
armv6,
armv7,
);
"ARCHS[sdk=iphoneos*]" = (
armv6,
armv7,
);
"ARCHS[sdk=iphonesimulator*]" = i386;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DSTROOT = /tmp/TiStorekit.dst;
Expand Down Expand Up @@ -682,15 +674,6 @@
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
armv6,
armv7,
);
"ARCHS[sdk=iphoneos*]" = (
armv6,
armv7,
);
"ARCHS[sdk=iphonesimulator*]" = i386;
DSTROOT = /tmp/TiStorekit.dst;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_MODEL_TUNING = G5;
Expand Down Expand Up @@ -726,15 +709,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
buildSettings = {
ARCHS = (
armv6,
armv7,
);
"ARCHS[sdk=iphoneos*]" = (
armv6,
armv7,
);
"ARCHS[sdk=iphonesimulator*]" = i386;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DSTROOT = /tmp/TiStorekit.dst;
Expand All @@ -759,6 +733,7 @@
);
INSTALL_PATH = /usr/local/lib;
LIBRARY_SEARCH_PATHS = "";
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"-DDEBUG",
"-DTI_POST_1_2",
Expand All @@ -782,15 +757,6 @@
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
armv6,
armv7,
);
"ARCHS[sdk=iphoneos*]" = (
armv6,
armv7,
);
"ARCHS[sdk=iphonesimulator*]" = i386;
DSTROOT = /tmp/TiStorekit.dst;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_MODEL_TUNING = G5;
Expand All @@ -812,7 +778,7 @@
"$(TITANIUM_BASE_SDK2)",
);
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "-DTI_POST_1_2";
OTHER_LDFLAGS = (
Expand Down
Binary file removed ios/ti.storekit-iphone-3.0.0.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ios/titanium.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
//
//
TITANIUM_SDK_VERSION = 3.1.3.GA
TITANIUM_SDK_VERSION = 3.2.2.GA

//
// THESE SHOULD BE OK GENERALLY AS-IS
Expand Down