Skip to content

Commit

Permalink
Updates for 64bit iOS. Depends on 3.5.0.GA
Browse files Browse the repository at this point in the history
  • Loading branch information
astjohn committed Jan 14, 2015
1 parent 87e802f commit 78084f8
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 42 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log
All notable changes to this project will be documented in this file.

## Android-3.0.0 - iOS-3.0.0 <>
### Added
- The module now depends on Titanium 3.5.0.GA
- 64bit capability for iOS. If you are updating your application from a lower version than 3.5.0.GA and you are having compiling issues, try removing the files in the `build` and `Resources` folders.

## Android-2.2.0 - iOS-2.1.0 <> 2014-12-13
### Fixed
- Changed moduleid so that new users of the module will not receive unlicensed module if they haven't downloaded the legacy version through the Titanium Marketplace.
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

Connects to Google Analytics for app event tracking in a Titanium Appcelerator Application. The 2.x release of this module is targeted for the [Google Analytics SDK for iOS v3](https://developers.google.com/analytics/devguides/collection/ios/v3/) and [Google Analytics SDK v4 for Android](https://developers.google.com/analytics/devguides/collection/android/v4/).

## 64bit Capability

Version 3.0.0 of this module depends on version 3.5.0.GA (or greater) of the titanium SDK, which provides 64bit support on the iOS platform. If you are upgrading your application to use this new version and you are experiencing build problems, try clearing out your `build` and `Resources` folders and then recompile.

## Set up Google Analytics

First step: you have to create a new app property in your Google Analytics-account. Refer to [this page](http://support.google.com/analytics/bin/answer.py?hl=en&answer=2587086&topic=2587085&ctx=topic) for more information.
Expand Down
Binary file not shown.
Binary file removed mobile/android/dist/analytics.google-android-2.0.zip
Binary file not shown.
Binary file not shown.
5 changes: 3 additions & 2 deletions mobile/android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 2.2.0
version: 3.0.0
apiversion: 2
architectures: armeabi armeabi-v7a x86
description: Google Analytics for Titanium Appcelerator
author: Matt Tuttle
license: MIT
Expand All @@ -15,4 +16,4 @@ name: googleAnalytics
moduleid: analytics.google
guid: 6bdae9d9-4154-4d21-aacf-c0f95b193dae
platform: android
minsdk: 3.0.2.GA
minsdk: 3.5.0.GA
Binary file removed mobile/ios/analytics.google-iphone-1.0.zip
Binary file not shown.
Binary file removed mobile/ios/analytics.google-iphone-2.0.zip
Binary file not shown.
Binary file added mobile/ios/analytics.google-iphone-3.0.0.zip
Binary file not shown.
54 changes: 16 additions & 38 deletions mobile/ios/google-analytics.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0450;
LastUpgradeCheck = 0610;
};
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "google-analytics" */;
compatibilityVersion = "Xcode 3.2";
Expand Down Expand Up @@ -315,15 +315,9 @@
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)";
CLANG_ENABLE_OBJC_ARC = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand Down Expand Up @@ -369,15 +363,9 @@
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
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)";
CLANG_ENABLE_OBJC_ARC = NO;
DSTROOT = /tmp/AnalyticsGoogle.dst;
GCC_C_LANGUAGE_STANDARD = c99;
Expand Down Expand Up @@ -416,15 +404,9 @@
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)";
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand All @@ -446,6 +428,8 @@
GCC_WARN_UNUSED_VALUE = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"-DDEBUG",
"-DTI_POST_1_2",
Expand All @@ -465,15 +449,9 @@
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
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)";
CLANG_ENABLE_OBJC_ARC = YES;
DSTROOT = /tmp/AnalyticsGoogle.dst;
GCC_C_LANGUAGE_STANDARD = c99;
Expand All @@ -493,7 +471,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 = AnalyticsGoogle;
Expand Down
5 changes: 3 additions & 2 deletions mobile/ios/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 2.1.0
version: 3.0.0
apiversion: 2
architectures: armv7 arm64 i386 x86_64
description: Google Analytics for Titanium Appcelerator
author: Matt Tuttle
license: MIT
Expand All @@ -15,4 +16,4 @@ name: google-analytics
moduleid: analytics.google
guid: 6bdae9d9-4154-4d21-aacf-c0f95b193dae
platform: iphone
minsdk: 3.0.2.GA
minsdk: 3.5.0.GA

0 comments on commit 78084f8

Please sign in to comment.