Merge pull request #59 from sgtcoolguy/TIMOB-23592

[TIMOB-23592] Android: Recompile ti.admob module against latest SDK

.gitignore

@@ -17,3 +17,8 @@ profile
 *.moved-aside
 DerivedData
 ios/admob.xcodeproj/project.xcworkspace/xcuserdata/*
+.DS_Store
+.project
+android/libs
+android/build.properties
+android/dist

.travis.yml

@@ -1,19 +1,26 @@
 language: objective-c
-osx_image: xcode7.1
+osx_image: xcode7.3
 env:
  global:
    - "ARTIFACTS_AWS_REGION=us-east-1"
    - "ARTIFACTS_S3_BUCKET=builds.appcelerator.com"
    - "MODULE_NAME=ti.admob"
+   - TRAVIS_NODE_VERSION="4"
 before_install:
     - MODULE_ROOT=$PWD
+    - brew update
+    - brew install nvm
+    - source $(brew --prefix nvm)/nvm.sh
+    - nvm install 4
+    - npm config delete prefix
+    - nvm use --delete-prefix v4.4.7 4
 install:
     - cd $MODULE_ROOT
-    - curl -o install.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/install.sh #change this to appcelerator-modules once PR has been merged
-    - source install.sh -s "--branch 5_1_X"
+    - curl -o install.sh https://raw.githubusercontent.com/sgtcoolguy/ci/v8/travis/install.sh
+    - source install.sh -s "--branch master"
 script:
-    - curl -o script.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/script.sh
+    - curl -o script.sh https://raw.githubusercontent.com/sgtcoolguy/ci/v8/travis/script.sh
     - source script.sh
 after_success: # and this only on success
-  - curl -o deploy.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/deploy.sh
-  - source deploy.sh
+    - curl -o deploy.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/deploy.sh
+    - source deploy.sh

android/manifest

@@ -2,9 +2,9 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.1.6
-apiversion: 2
-architectures: armeabi armeabi-v7a x86
+version: 3.0.0
+apiversion: 3
+architectures: armeabi-v7a x86
 description: Titanium Admob module for Android
 author: Brian Kurzius
 license: Apache License, Version 2.0
@@ -16,4 +16,4 @@ name: admob
 moduleid: ti.admob
 guid: 0d005e93-9980-4739-9e41-fd1129c8ff32
 platform: android
-minsdk: 3.2.3.GA
+minsdk: 6.0.0

android/src/ti/admob/ViewProxy.java

@@ -8,8 +8,9 @@
 
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
-import org.appcelerator.titanium.TiContext.OnLifecycleEvent;
+import org.appcelerator.titanium.TiLifecycle.OnLifecycleEvent;
 import org.appcelerator.titanium.proxy.TiViewProxy;
+import org.appcelerator.titanium.TiBaseActivity;
 import org.appcelerator.kroll.common.Log;
 import org.appcelerator.titanium.view.TiUIView;
 
@@ -34,6 +35,7 @@ protected KrollDict getLangConversionTable() {
 	@Override
 	public TiUIView createView(Activity activity) {
 		adMob = new View(this);
+		((TiBaseActivity)activity).addOnLifecycleEventListener(this);
 		return adMob;
 	}