Merge pull request #46 from hansemannn/MOD-2182-PATCH

[MOD-2182-PATCH] Fix copying framework as asset
tidev · Feb 1, 2016 · 2bfd1ad · 2bfd1ad
2 parents 7370f60 + bec1b3a
commit 2bfd1ad
Show file tree

Hide file tree

Showing 65 changed files with 11 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,5 @@ build/*
 xcuserdata
 profile
 *.moved-aside
-DerivedData
+DerivedData
+ios/admob.xcodeproj/project.xcworkspace/xcuserdata/*
diff --git a/ios/admob.xcodeproj/project.pbxproj b/ios/admob.xcodeproj/project.pbxproj
@@ -13,7 +13,7 @@
 		249BE67411B47B3800AF41CF /* TiAdmobView.m in Sources */ = {isa = PBXBuildFile; fileRef = 249BE67211B47B3800AF41CF /* TiAdmobView.m */; };
 		24DD6CF91134B3F500162E58 /* TiAdmobModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 24DD6CF71134B3F500162E58 /* TiAdmobModule.h */; };
 		24DD6CFA1134B3F500162E58 /* TiAdmobModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DD6CF81134B3F500162E58 /* TiAdmobModule.m */; };
-		3A1034741C217B0A00F16663 /* GoogleMobileAds.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A1034731C217B0A00F16663 /* GoogleMobileAds.framework */; };
+		3AEA89BF1C5F727300FBA64B /* GoogleMobileAds.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AEA89BD1C5F71A100FBA64B /* GoogleMobileAds.framework */; };
 		3AF5B7731C233383002E3DC7 /* TiAdmobTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AF5B7711C233383002E3DC7 /* TiAdmobTypes.h */; };
 		AA747D9F0F9514B9006C5449 /* TiAdmob_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* TiAdmob_Prefix.pch */; };
 		AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
@@ -35,7 +35,7 @@
 		24DD6CF71134B3F500162E58 /* TiAdmobModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TiAdmobModule.h; path = Classes/TiAdmobModule.h; sourceTree = "<group>"; };
 		24DD6CF81134B3F500162E58 /* TiAdmobModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TiAdmobModule.m; path = Classes/TiAdmobModule.m; sourceTree = "<group>"; };
 		24DD6D1B1134B66800162E58 /* titanium.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = titanium.xcconfig; sourceTree = "<group>"; };
-		3A1034731C217B0A00F16663 /* GoogleMobileAds.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleMobileAds.framework; path = platform/ios/GoogleMobileAds.framework; sourceTree = SOURCE_ROOT; };
+		3AEA89BD1C5F71A100FBA64B /* GoogleMobileAds.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleMobileAds.framework; path = platform/GoogleMobileAds.framework; sourceTree = SOURCE_ROOT; };
 		3AF5B7711C233383002E3DC7 /* TiAdmobTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TiAdmobTypes.h; path = Classes/TiAdmobTypes.h; sourceTree = "<group>"; };
 		AA747D9E0F9514B9006C5449 /* TiAdmob_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TiAdmob_Prefix.pch; sourceTree = SOURCE_ROOT; };
 		AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -56,7 +56,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3A1034741C217B0A00F16663 /* GoogleMobileAds.framework in Frameworks */,
+				3AEA89BF1C5F727300FBA64B /* GoogleMobileAds.framework in Frameworks */,
 				CE6C17A01982D1170017C788 /* AdSupport.framework in Frameworks */,
 				DAD5D7CF12527E11009CF986 /* AudioToolbox.framework in Frameworks */,
 				CE6C17A21982D12D0017C788 /* AVFoundation.framework in Frameworks */,
@@ -135,7 +135,7 @@
 		CE6C17AB1982D1C90017C788 /* AdMob iOS SDK */ = {
 			isa = PBXGroup;
 			children = (
-				3A1034731C217B0A00F16663 /* GoogleMobileAds.framework */,
+				3AEA89BD1C5F71A100FBA64B /* GoogleMobileAds.framework */,
 			);
 			name = "AdMob iOS SDK";
 			path = GoogleMobileAdsSdkiOS;
@@ -226,6 +226,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/GoogleMobileAdsSdkiOS",
 					"$(PROJECT_DIR)/platform/ios",
+					"$(PROJECT_DIR)/platform",
 				);
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -279,6 +280,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/GoogleMobileAdsSdkiOS",
 					"$(PROJECT_DIR)/platform/ios",
+					"$(PROJECT_DIR)/platform",
 				);
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_MODEL_TUNING = G5;

diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/hans.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/hans.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ios/manifest b/ios/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.0.0
+version: 2.0.1
 architectures:  armv7 i386 x86_64 arm64
 description: AdMob module for ad delivery via AdMob
 author: Jeff Haynie, Stephen Tramer, Jasper Kennis, Jon Alter and Hans Knoechel

diff --git a/ios/module.xcconfig b/ios/module.xcconfig
@@ -2,6 +2,6 @@
 // PLACE ANY BUILD DEFINITIONS IN THIS FILE AND THEY WILL BE 
 // PICKED UP DURING THE APP BUILD FOR YOUR MODULE
 //
-FRAMEWORK_SEARCH_PATHS=$(SRCROOT)/../../modules/iphone/ti.admob/2.0.0/platform/ios "~/Library/Application\ Support/Titanium/modules/iphone/ti.admob/2.0.0/platform/ios"
+FRAMEWORK_SEARCH_PATHS=$(SRCROOT)/../../modules/iphone/ti.admob/2.0.1/platform "~/Library/Application\ Support/Titanium/modules/iphone/ti.admob/2.0.1/platform"
 
 OTHER_LDFLAGS=$(inherited) -framework AdSupport -framework AudioToolbox -framework AVFoundation -framework CoreGraphics -framework CoreTelephony -framework MessageUI -framework StoreKit -framework SystemConfiguration -framework GoogleMobileAds
diff --git a/...GoogleMobileAds.framework/GoogleMobileAds → ...GoogleMobileAds.framework/GoogleMobileAds b/...GoogleMobileAds.framework/GoogleMobileAds → ...GoogleMobileAds.framework/GoogleMobileAds
diff --git a/...orm/ios/GoogleMobileAds.framework/Headers → ...latform/GoogleMobileAds.framework/Headers b/...orm/ios/GoogleMobileAds.framework/Headers → ...latform/GoogleMobileAds.framework/Headers
diff --git a/...ileAds.framework/Modules/module.modulemap → ...ileAds.framework/Modules/module.modulemap b/...ileAds.framework/Modules/module.modulemap → ...ileAds.framework/Modules/module.modulemap
diff --git a/...eAds.framework/Versions/A/GoogleMobileAds → ...eAds.framework/Versions/A/GoogleMobileAds b/...eAds.framework/Versions/A/GoogleMobileAds → ...eAds.framework/Versions/A/GoogleMobileAds
diff --git a/...mework/Versions/A/Headers/DFPBannerView.h → ...mework/Versions/A/Headers/DFPBannerView.h b/...mework/Versions/A/Headers/DFPBannerView.h → ...mework/Versions/A/Headers/DFPBannerView.h
diff --git a/.../Versions/A/Headers/DFPCustomRenderedAd.h → .../Versions/A/Headers/DFPCustomRenderedAd.h b/.../Versions/A/Headers/DFPCustomRenderedAd.h → .../Versions/A/Headers/DFPCustomRenderedAd.h
diff --git a/...ers/DFPCustomRenderedBannerViewDelegate.h → ...ers/DFPCustomRenderedBannerViewDelegate.h b/...ers/DFPCustomRenderedBannerViewDelegate.h → ...ers/DFPCustomRenderedBannerViewDelegate.h
diff --git a/...s/DFPCustomRenderedInterstitialDelegate.h → ...s/DFPCustomRenderedInterstitialDelegate.h b/...s/DFPCustomRenderedInterstitialDelegate.h → ...s/DFPCustomRenderedInterstitialDelegate.h
diff --git a/...work/Versions/A/Headers/DFPInterstitial.h → ...work/Versions/A/Headers/DFPInterstitial.h b/...work/Versions/A/Headers/DFPInterstitial.h → ...work/Versions/A/Headers/DFPInterstitial.h
diff --git a/...framework/Versions/A/Headers/DFPRequest.h → ...framework/Versions/A/Headers/DFPRequest.h b/...framework/Versions/A/Headers/DFPRequest.h → ...framework/Versions/A/Headers/DFPRequest.h
diff --git a/...mework/Versions/A/Headers/GADAdDelegate.h → ...mework/Versions/A/Headers/GADAdDelegate.h b/...mework/Versions/A/Headers/GADAdDelegate.h → ...mework/Versions/A/Headers/GADAdDelegate.h
diff --git a/...ramework/Versions/A/Headers/GADAdLoader.h → ...ramework/Versions/A/Headers/GADAdLoader.h b/...ramework/Versions/A/Headers/GADAdLoader.h → ...ramework/Versions/A/Headers/GADAdLoader.h
diff --git a/...k/Versions/A/Headers/GADAdLoaderAdTypes.h → ...k/Versions/A/Headers/GADAdLoaderAdTypes.h b/...k/Versions/A/Headers/GADAdLoaderAdTypes.h → ...k/Versions/A/Headers/GADAdLoaderAdTypes.h
diff --git a/.../Versions/A/Headers/GADAdLoaderDelegate.h → .../Versions/A/Headers/GADAdLoaderDelegate.h b/.../Versions/A/Headers/GADAdLoaderDelegate.h → .../Versions/A/Headers/GADAdLoaderDelegate.h
diff --git a/...k/Versions/A/Headers/GADAdNetworkExtras.h → ...k/Versions/A/Headers/GADAdNetworkExtras.h b/...k/Versions/A/Headers/GADAdNetworkExtras.h → ...k/Versions/A/Headers/GADAdNetworkExtras.h
diff --git a/...ramework/Versions/A/Headers/GADAdReward.h → ...ramework/Versions/A/Headers/GADAdReward.h b/...ramework/Versions/A/Headers/GADAdReward.h → ...ramework/Versions/A/Headers/GADAdReward.h
diff --git a/....framework/Versions/A/Headers/GADAdSize.h → ....framework/Versions/A/Headers/GADAdSize.h b/....framework/Versions/A/Headers/GADAdSize.h → ....framework/Versions/A/Headers/GADAdSize.h
diff --git a/...rk/Versions/A/Headers/GADAdSizeDelegate.h → ...rk/Versions/A/Headers/GADAdSizeDelegate.h b/...rk/Versions/A/Headers/GADAdSizeDelegate.h → ...rk/Versions/A/Headers/GADAdSizeDelegate.h
diff --git a/.../Versions/A/Headers/GADAppEventDelegate.h → .../Versions/A/Headers/GADAppEventDelegate.h b/.../Versions/A/Headers/GADAppEventDelegate.h → .../Versions/A/Headers/GADAppEventDelegate.h
diff --git a/...mework/Versions/A/Headers/GADBannerView.h → ...mework/Versions/A/Headers/GADBannerView.h b/...mework/Versions/A/Headers/GADBannerView.h → ...mework/Versions/A/Headers/GADBannerView.h
diff --git a/...ersions/A/Headers/GADBannerViewDelegate.h → ...ersions/A/Headers/GADBannerViewDelegate.h b/...ersions/A/Headers/GADBannerViewDelegate.h → ...ersions/A/Headers/GADBannerViewDelegate.h
diff --git a/...mework/Versions/A/Headers/GADCorrelator.h → ...mework/Versions/A/Headers/GADCorrelator.h b/...mework/Versions/A/Headers/GADCorrelator.h → ...mework/Versions/A/Headers/GADCorrelator.h
diff --git a/.../A/Headers/GADCorrelatorAdLoaderOptions.h → .../A/Headers/GADCorrelatorAdLoaderOptions.h b/.../A/Headers/GADCorrelatorAdLoaderOptions.h → .../A/Headers/GADCorrelatorAdLoaderOptions.h
diff --git a/...Versions/A/Headers/GADCustomEventBanner.h → ...Versions/A/Headers/GADCustomEventBanner.h b/...Versions/A/Headers/GADCustomEventBanner.h → ...Versions/A/Headers/GADCustomEventBanner.h
diff --git a/.../A/Headers/GADCustomEventBannerDelegate.h → .../A/Headers/GADCustomEventBannerDelegate.h b/.../A/Headers/GADCustomEventBannerDelegate.h → .../A/Headers/GADCustomEventBannerDelegate.h
diff --git a/...Versions/A/Headers/GADCustomEventExtras.h → ...Versions/A/Headers/GADCustomEventExtras.h b/...Versions/A/Headers/GADCustomEventExtras.h → ...Versions/A/Headers/GADCustomEventExtras.h
diff --git a/...ns/A/Headers/GADCustomEventInterstitial.h → ...ns/A/Headers/GADCustomEventInterstitial.h b/...ns/A/Headers/GADCustomEventInterstitial.h → ...ns/A/Headers/GADCustomEventInterstitial.h
diff --git a/...ders/GADCustomEventInterstitialDelegate.h → ...ders/GADCustomEventInterstitialDelegate.h b/...ders/GADCustomEventInterstitialDelegate.h → ...ders/GADCustomEventInterstitialDelegate.h
diff --git a/...rsions/A/Headers/GADCustomEventNativeAd.h → ...rsions/A/Headers/GADCustomEventNativeAd.h b/...rsions/A/Headers/GADCustomEventNativeAd.h → ...rsions/A/Headers/GADCustomEventNativeAd.h
diff --git a/.../Headers/GADCustomEventNativeAdDelegate.h → .../Headers/GADCustomEventNativeAdDelegate.h b/.../Headers/GADCustomEventNativeAdDelegate.h → .../Headers/GADCustomEventNativeAdDelegate.h
diff --git a/...ersions/A/Headers/GADCustomEventRequest.h → ...ersions/A/Headers/GADCustomEventRequest.h b/...ersions/A/Headers/GADCustomEventRequest.h → ...ersions/A/Headers/GADCustomEventRequest.h
diff --git a/....framework/Versions/A/Headers/GADExtras.h → ....framework/Versions/A/Headers/GADExtras.h b/....framework/Versions/A/Headers/GADExtras.h → ....framework/Versions/A/Headers/GADExtras.h
diff --git a/...ork/Versions/A/Headers/GADInAppPurchase.h → ...ork/Versions/A/Headers/GADInAppPurchase.h b/...ork/Versions/A/Headers/GADInAppPurchase.h → ...ork/Versions/A/Headers/GADInAppPurchase.h
diff --git a/...ions/A/Headers/GADInAppPurchaseDelegate.h → ...ions/A/Headers/GADInAppPurchaseDelegate.h b/...ions/A/Headers/GADInAppPurchaseDelegate.h → ...ions/A/Headers/GADInAppPurchaseDelegate.h
diff --git a/...work/Versions/A/Headers/GADInterstitial.h → ...work/Versions/A/Headers/GADInterstitial.h b/...work/Versions/A/Headers/GADInterstitial.h → ...work/Versions/A/Headers/GADInterstitial.h
diff --git a/...sions/A/Headers/GADInterstitialDelegate.h → ...sions/A/Headers/GADInterstitialDelegate.h b/...sions/A/Headers/GADInterstitialDelegate.h → ...sions/A/Headers/GADInterstitialDelegate.h
diff --git a/.../Versions/A/Headers/GADMediatedNativeAd.h → .../Versions/A/Headers/GADMediatedNativeAd.h b/.../Versions/A/Headers/GADMediatedNativeAd.h → .../Versions/A/Headers/GADMediatedNativeAd.h
diff --git a/...s/A/Headers/GADMediatedNativeAdDelegate.h → ...s/A/Headers/GADMediatedNativeAdDelegate.h b/...s/A/Headers/GADMediatedNativeAdDelegate.h → ...s/A/Headers/GADMediatedNativeAdDelegate.h
diff --git a/...s/GADMediatedNativeAdNotificationSource.h → ...s/GADMediatedNativeAdNotificationSource.h b/...s/GADMediatedNativeAdNotificationSource.h → ...s/GADMediatedNativeAdNotificationSource.h
diff --git a/...A/Headers/GADMediatedNativeAppInstallAd.h → ...A/Headers/GADMediatedNativeAppInstallAd.h b/...A/Headers/GADMediatedNativeAppInstallAd.h → ...A/Headers/GADMediatedNativeAppInstallAd.h
diff --git a/...ns/A/Headers/GADMediatedNativeContentAd.h → ...ns/A/Headers/GADMediatedNativeContentAd.h b/...ns/A/Headers/GADMediatedNativeContentAd.h → ...ns/A/Headers/GADMediatedNativeContentAd.h
diff --git a/...amework/Versions/A/Headers/GADMobileAds.h → ...amework/Versions/A/Headers/GADMobileAds.h b/...amework/Versions/A/Headers/GADMobileAds.h → ...amework/Versions/A/Headers/GADMobileAds.h
diff --git a/...ramework/Versions/A/Headers/GADNativeAd.h → ...ramework/Versions/A/Headers/GADNativeAd.h b/...ramework/Versions/A/Headers/GADNativeAd.h → ...ramework/Versions/A/Headers/GADNativeAd.h
diff --git a/.../Versions/A/Headers/GADNativeAdDelegate.h → .../Versions/A/Headers/GADNativeAdDelegate.h b/.../Versions/A/Headers/GADNativeAdDelegate.h → .../Versions/A/Headers/GADNativeAdDelegate.h
diff --git a/...ns/A/Headers/GADNativeAdImage+Mediation.h → ...ns/A/Headers/GADNativeAdImage+Mediation.h b/...ns/A/Headers/GADNativeAdImage+Mediation.h → ...ns/A/Headers/GADNativeAdImage+Mediation.h
diff --git a/...ork/Versions/A/Headers/GADNativeAdImage.h → ...ork/Versions/A/Headers/GADNativeAdImage.h b/...ork/Versions/A/Headers/GADNativeAdImage.h → ...ork/Versions/A/Headers/GADNativeAdImage.h
diff --git a/...Headers/GADNativeAdImageAdLoaderOptions.h → ...Headers/GADNativeAdImageAdLoaderOptions.h b/...Headers/GADNativeAdImageAdLoaderOptions.h → ...Headers/GADNativeAdImageAdLoaderOptions.h
diff --git a/...ersions/A/Headers/GADNativeAppInstallAd.h → ...ersions/A/Headers/GADNativeAppInstallAd.h b/...ersions/A/Headers/GADNativeAppInstallAd.h → ...ersions/A/Headers/GADNativeAppInstallAd.h
diff --git a/...k/Versions/A/Headers/GADNativeContentAd.h → ...k/Versions/A/Headers/GADNativeContentAd.h b/...k/Versions/A/Headers/GADNativeContentAd.h → ...k/Versions/A/Headers/GADNativeContentAd.h
diff --git a/...ons/A/Headers/GADNativeCustomTemplateAd.h → ...ons/A/Headers/GADNativeCustomTemplateAd.h b/...ons/A/Headers/GADNativeCustomTemplateAd.h → ...ons/A/Headers/GADNativeCustomTemplateAd.h
diff --git a/...framework/Versions/A/Headers/GADRequest.h → ...framework/Versions/A/Headers/GADRequest.h b/...framework/Versions/A/Headers/GADRequest.h → ...framework/Versions/A/Headers/GADRequest.h
diff --git a/...work/Versions/A/Headers/GADRequestError.h → ...work/Versions/A/Headers/GADRequestError.h b/...work/Versions/A/Headers/GADRequestError.h → ...work/Versions/A/Headers/GADRequestError.h
diff --git a/...ersions/A/Headers/GADRewardBasedVideoAd.h → ...ersions/A/Headers/GADRewardBasedVideoAd.h b/...ersions/A/Headers/GADRewardBasedVideoAd.h → ...ersions/A/Headers/GADRewardBasedVideoAd.h
diff --git a/...A/Headers/GADRewardBasedVideoAdDelegate.h → ...A/Headers/GADRewardBasedVideoAdDelegate.h b/...A/Headers/GADRewardBasedVideoAdDelegate.h → ...A/Headers/GADRewardBasedVideoAdDelegate.h
diff --git a/.../Versions/A/Headers/GADSearchBannerView.h → .../Versions/A/Headers/GADSearchBannerView.h b/.../Versions/A/Headers/GADSearchBannerView.h → .../Versions/A/Headers/GADSearchBannerView.h
diff --git a/...ork/Versions/A/Headers/GADSearchRequest.h → ...ork/Versions/A/Headers/GADSearchRequest.h b/...ork/Versions/A/Headers/GADSearchRequest.h → ...ork/Versions/A/Headers/GADSearchRequest.h
diff --git a/...work/Versions/A/Headers/GoogleMobileAds.h → ...work/Versions/A/Headers/GoogleMobileAds.h b/...work/Versions/A/Headers/GoogleMobileAds.h → ...work/Versions/A/Headers/GoogleMobileAds.h
diff --git a/...rsions/A/Headers/GoogleMobileAdsDefines.h → ...rsions/A/Headers/GoogleMobileAdsDefines.h b/...rsions/A/Headers/GoogleMobileAdsDefines.h → ...rsions/A/Headers/GoogleMobileAdsDefines.h
diff --git a/...oogleMobileAds.framework/Versions/Current → ...oogleMobileAds.framework/Versions/Current b/...oogleMobileAds.framework/Versions/Current → ...oogleMobileAds.framework/Versions/Current
diff --git a/ios/titanium.xcconfig b/ios/titanium.xcconfig
@@ -4,7 +4,7 @@
 // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
 //
 //
-TITANIUM_SDK_VERSION = 5.1.1.GA
+TITANIUM_SDK_VERSION = 5.1.2.GA
 
 
 //
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
     //
     //
-    TITANIUM_SDK_VERSION = 5.1.1.GA
+    TITANIUM_SDK_VERSION = 5.1.2.GA
     //
@@ Expand Down @@