Skip to content

Commit

Permalink
Revert "deprecation Google pod"
Browse files Browse the repository at this point in the history
This reverts commit 9b97bfb.
  • Loading branch information
ulukaya committed Jun 12, 2017
1 parent a3aa263 commit eb6ef95
Show file tree
Hide file tree
Showing 38 changed files with 3,026 additions and 19 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ env: SAMPLE=Analytics

matrix:
include:
- podfile: ios/gcm/Podfile
env: SAMPLE=Gcm
- podfile: ios/signin/Podfile
env: SAMPLE=SignIn

Expand All @@ -19,6 +21,8 @@ before_install:
- gem install xcpretty
- cd ios/$SAMPLE
- pod install --repo-update
- cp ../mock-GoogleService-Info.plist ./GoogleService-Info.plist
- sed -i '' '/<key>BUNDLE_ID</{n;s/id/com.google.samples.quickstart.'$SAMPLE'Example/;}' GoogleService-Info.plist
- sed -i '' 's/YOUR_REVERSED_CLIENT_ID/com.googleusercontent.apps.123456789000-hjugbg6ud799v4c49dim8ce2usclthar/' "$SAMPLE"Example/Info.plist
- gem install xcodeproj
- ruby ../info_script.rb $SAMPLE
Expand Down
3 changes: 1 addition & 2 deletions ios/analytics/AnalyticsExample/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

#import "AppDelegate.h"


#import <GoogleAnalytics/GAI.h>
#import <Google/Analytics.h>

@implementation AppDelegate

Expand Down
3 changes: 1 addition & 2 deletions ios/analytics/AnalyticsExample/PatternTabBarController.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

#import "PatternTabBarController.h"

#import <GoogleAnalytics/GAI.h>
#import <GoogleAnalytics/GAIDictionaryBuilder.h>
#import <Google/Analytics.h>

@implementation PatternTabBarController

Expand Down
5 changes: 1 addition & 4 deletions ios/analytics/AnalyticsExample/ViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@

#import "ViewController.h"

#import <GoogleAnalytics/GAI.h>
#import <GoogleAnalytics/GAIDictionaryBuilder.h>
#import <GoogleAnalytics/GAIFields.h>

#import <Google/Analytics.h>

@implementation ViewController

Expand Down
4 changes: 1 addition & 3 deletions ios/analytics/AnalyticsExampleSwift/BridgingHeader.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@
// Use this file to import your target's public headers that you would like to expose to Swift.
//

#import <GoogleAnalytics/GAI.h>
#import <GoogleAnalytics/GAIDictionaryBuilder.h>
#import <GoogleAnalytics/GAIFields.h>
#import <Google/Analytics.h>
4 changes: 2 additions & 2 deletions ios/analytics/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

use_frameworks!
platform :ios, '7.0'
pod 'GoogleAnalytics'
pod 'Google/Analytics'

target 'AnalyticsExample' do
end
target 'AnalyticsExampleSwift' do
end
target 'AnalyticsExampleTests' do
end
end
2 changes: 1 addition & 1 deletion ios/analytics/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Getting Started
- Swipe between images to register screen views.
- View collected analytics via [Google Analytics](https://www.google.com/analytics/web).

Note: You will need Swift 3.0 to run the Swift version of this quickstart.
Note: You will need Swift 2.0 to run the Swift version of this quickstart.

Screenshots
-----------
Expand Down
Loading

0 comments on commit eb6ef95

Please sign in to comment.