diff --git a/.travis.yml b/.travis.yml index c33ab72..ecc0d5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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.2.2.GA + - source install.sh script: - curl -o script.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/script.sh - source script.sh diff --git a/ios/documentation/changelog.md b/ios/documentation/changelog.md index 54e2fd2..cceac15 100644 --- a/ios/documentation/changelog.md +++ b/ios/documentation/changelog.md @@ -1,5 +1,7 @@ # Change Log
+v1.5.0 Updated module to support 64-bit [TIMOB-18092] + v1.4 Fixed a bug that prevented several of the "error" events from firing while interacting with achievements or the leaderboard. [MOD-533] v1.3 Fixed reportScore's documentation and example to properly use its arguments (should be category, then score). [MOD-438] diff --git a/ios/gamekit.xcodeproj/project.pbxproj b/ios/gamekit.xcodeproj/project.pbxproj index 0de73e7..62bec13 100644 --- a/ios/gamekit.xcodeproj/project.pbxproj +++ b/ios/gamekit.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXAggregateTarget section */ @@ -173,8 +173,11 @@ /* Begin PBXProject section */ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0610; + }; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "gamekit" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -238,19 +241,18 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + ARCHS = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DSTROOT = /tmp/TiGamekit.dst; GCC_C_LANGUAGE_STANDARD = c99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = TiGamekit_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; @@ -261,22 +263,18 @@ GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "TiGamekit_Prefix.pch"; INSTALL_PATH = /usr/local/lib; - PRODUCT_NAME = "TiGamekit"; OTHER_CFLAGS = ( "-DDEBUG", "-DTI_POST_1_2", ); OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = TiGamekit; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; - DSTROOT = "/tmp/TiGamekit.dst"; }; name = Debug; }; @@ -284,17 +282,17 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; + DSTROOT = /tmp/TiGamekit.dst; GCC_C_LANGUAGE_STANDARD = c99; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = TiGamekit_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; @@ -305,21 +303,17 @@ GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "TiGamekit_Prefix.pch"; INSTALL_PATH = /usr/local/lib; - PRODUCT_NAME = "TiGamekit"; IPHONEOS_DEPLOYMENT_TARGET = 4.0; + "IPHONEOS_DEPLOYMENT_TARGET[sdk=iphoneos*]" = 5.1.1; OTHER_CFLAGS = "-DTI_POST_1_2"; OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = TiGamekit; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; - ALWAYS_SEARCH_USER_PATHS = NO; - DSTROOT = "/tmp/TiGamekit.dst"; }; name = Release; }; @@ -327,19 +321,18 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + ARCHS = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DSTROOT = /tmp/TiGamekit.dst; GCC_C_LANGUAGE_STANDARD = c99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = TiGamekit_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; @@ -350,22 +343,20 @@ GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "TiGamekit_Prefix.pch"; INSTALL_PATH = /usr/local/lib; - PRODUCT_NAME = "TiGamekit"; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-DDEBUG", "-DTI_POST_1_2", ); OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = TiGamekit; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; - DSTROOT = "/tmp/TiGamekit.dst"; }; name = Debug; }; @@ -373,17 +364,17 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */; buildSettings = { - ARCHS = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphoneos*]" = ( - armv6, - armv7, - ); - "ARCHS[sdk=iphonesimulator*]" = i386; + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)"; + "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; + DSTROOT = /tmp/TiGamekit.dst; GCC_C_LANGUAGE_STANDARD = c99; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = TiGamekit_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; @@ -394,21 +385,16 @@ GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "TiGamekit_Prefix.pch"; INSTALL_PATH = /usr/local/lib; - PRODUCT_NAME = "TiGamekit"; - IPHONEOS_DEPLOYMENT_TARGET = 4.0; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; OTHER_CFLAGS = "-DTI_POST_1_2"; OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = TiGamekit; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; - ALWAYS_SEARCH_USER_PATHS = NO; - DSTROOT = "/tmp/TiGamekit.dst"; }; name = Release; }; @@ -419,6 +405,7 @@ COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; + GCC_THUMB_SUPPORT = NO; PRODUCT_NAME = "Build & test"; }; name = Debug; @@ -430,6 +417,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/manifest b/ios/manifest index 48a983c..3cc45ca 100644 --- a/ios/manifest +++ b/ios/manifest @@ -2,7 +2,8 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 1.4 +version: 1.5.0 +architectures: armv7 i386 x86_64 arm64 description: Game Kit author: Appcelerator license: Appcelerator Commercial License @@ -14,4 +15,4 @@ name: gamekit moduleid: ti.gamekit guid: 634adffb-5b75-45a8-ab28-a835219adbf4 platform: iphone -minsdk: 2.1.3.GA +minsdk: 3.4.1.GA diff --git a/ios/titanium.xcconfig b/ios/titanium.xcconfig index 37f19ca..571a77b 100644 --- a/ios/titanium.xcconfig +++ b/ios/titanium.xcconfig @@ -4,13 +4,13 @@ // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR // // -TITANIUM_SDK_VERSION = 2.1.3.GA +TITANIUM_SDK_VERSION = 3.4.1.GA // // THESE SHOULD BE OK GENERALLY AS-IS // -TITANIUM_SDK = ~/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION) +TITANIUM_SDK = /Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION) TITANIUM_BASE_SDK = "$(TITANIUM_SDK)/iphone/include" TITANIUM_BASE_SDK2 = "$(TITANIUM_SDK)/iphone/include/TiCore" HEADER_SEARCH_PATHS= $(TITANIUM_BASE_SDK) $(TITANIUM_BASE_SDK2)