From db60b4340ec06de0be8b784dd765ea9008fab5b4 Mon Sep 17 00:00:00 2001 From: Britt Mullen Date: Wed, 9 Nov 2016 14:03:50 -0800 Subject: [PATCH 001/176] 3.0.5 --- Demos/InstantFeedDemo/.idea/misc.xml | 5 ++- Demos/InstantFeedDemo/app/app.iml | 32 +++++++++--------- Demos/InstantFeedDemo/app/build.gradle | 4 +-- Demos/InstantFeedDemo/build.gradle | 2 +- Demos/InterstitialDemo/.idea/misc.xml | 5 ++- Demos/InterstitialDemo/app/build.gradle | 4 +-- Demos/InterstitialDemo/build.gradle | 2 +- Demos/RewardedInterstitialDemo/.idea/misc.xml | 3 -- .../RewardedInterstitialDemo/app/build.gradle | 4 +-- Demos/RewardedInterstitialDemo/build.gradle | 2 +- Library/adcolony.jar | Bin 575290 -> 574899 bytes README.md | 9 +++-- 12 files changed, 40 insertions(+), 32 deletions(-) diff --git a/Demos/InstantFeedDemo/.idea/misc.xml b/Demos/InstantFeedDemo/.idea/misc.xml index 1d77643..5d19981 100644 --- a/Demos/InstantFeedDemo/.idea/misc.xml +++ b/Demos/InstantFeedDemo/.idea/misc.xml @@ -1,5 +1,8 @@ + + + - + diff --git a/Demos/InstantFeedDemo/app/app.iml b/Demos/InstantFeedDemo/app/app.iml index 1660290..a1285b0 100644 --- a/Demos/InstantFeedDemo/app/app.iml +++ b/Demos/InstantFeedDemo/app/app.iml @@ -86,7 +86,7 @@ - + @@ -96,13 +96,13 @@ - - - - - - - + + + + + + + @@ -128,19 +128,19 @@ + - - - - - + + + - - - + + + + \ No newline at end of file diff --git a/Demos/InstantFeedDemo/app/build.gradle b/Demos/InstantFeedDemo/app/build.gradle index ae3f349..f57cda6 100644 --- a/Demos/InstantFeedDemo/app/build.gradle +++ b/Demos/InstantFeedDemo/app/build.gradle @@ -20,7 +20,7 @@ android { } dependencies { - compile 'com.adcolony:sdk:3.0.4' + compile 'com.adcolony:sdk:3.0.5' compile 'com.android.support:appcompat-v7:24.2.1' - compile 'com.google.android.gms:play-services-ads:9.4.0' + compile 'com.google.android.gms:play-services-ads:9.8.0' } diff --git a/Demos/InstantFeedDemo/build.gradle b/Demos/InstantFeedDemo/build.gradle index 557f499..2d86bbd 100644 --- a/Demos/InstantFeedDemo/build.gradle +++ b/Demos/InstantFeedDemo/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:2.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/Demos/InterstitialDemo/.idea/misc.xml b/Demos/InterstitialDemo/.idea/misc.xml index 1d77643..5d19981 100644 --- a/Demos/InterstitialDemo/.idea/misc.xml +++ b/Demos/InterstitialDemo/.idea/misc.xml @@ -1,5 +1,8 @@ + + + - + diff --git a/Demos/InterstitialDemo/app/build.gradle b/Demos/InterstitialDemo/app/build.gradle index 3b5abb6..a67b134 100644 --- a/Demos/InterstitialDemo/app/build.gradle +++ b/Demos/InterstitialDemo/app/build.gradle @@ -21,6 +21,6 @@ android { dependencies { compile 'com.android.support:appcompat-v7:24.2.1' - compile 'com.adcolony:sdk:3.0.4' - compile 'com.google.android.gms:play-services-ads:9.4.0' + compile 'com.adcolony:sdk:3.0.5' + compile 'com.google.android.gms:play-services-ads:9.8.0' } diff --git a/Demos/InterstitialDemo/build.gradle b/Demos/InterstitialDemo/build.gradle index 9daee43..4302dcb 100644 --- a/Demos/InterstitialDemo/build.gradle +++ b/Demos/InterstitialDemo/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:2.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/Demos/RewardedInterstitialDemo/.idea/misc.xml b/Demos/RewardedInterstitialDemo/.idea/misc.xml index 5d19981..7c1371c 100644 --- a/Demos/RewardedInterstitialDemo/.idea/misc.xml +++ b/Demos/RewardedInterstitialDemo/.idea/misc.xml @@ -1,8 +1,5 @@ - - -