diff --git a/ChangeLog.txt b/ChangeLog.txt index 34f076f4a..ac65edb04 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,17 @@ Google Mobile Ads Unity Plugin Change Log +************* +Version 3.7.0 +************* + +- Updated dependency specification for JarResolver to use new XML format. +- Resolved JarResolver incompatibility issues when using Firebase Unity plugins. + +Built and tested with: +- Google Play services 11.2.0 +- Google Mobile Ads iOS SDK 7.23.0 +- Unity Jar Resolver 1.2.48.0 + ************* Version 3.6.3 ************* diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7372f72e4..12a08711a 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 354f76394..ee050b283 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Feb 13 16:09:10 GMT 2017 +#Wed Jul 12 16:58:21 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip diff --git a/gradlew b/gradlew index 4453ccea3..cccdd3d51 100644 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/source/android-library/app/build.gradle b/source/android-library/app/build.gradle index 7481e0f63..5c49f7f2b 100644 --- a/source/android-library/app/build.gradle +++ b/source/android-library/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 + compileSdkVersion 26 buildToolsVersion "22.0.1" defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" } @@ -24,8 +24,8 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.google.android.gms:play-services-ads:11.0.4' + compile 'com.android.support:appcompat-v7:26.0.0' + compile 'com.google.android.gms:play-services-ads:11.2.0' } task clearJar(type: Delete) { diff --git a/source/android-library/build.gradle b/source/android-library/build.gradle index b1932998a..f1aded488 100644 --- a/source/android-library/build.gradle +++ b/source/android-library/build.gradle @@ -15,5 +15,8 @@ buildscript { allprojects { repositories { jcenter() + maven { + url 'https://maven.google.com' + } } } diff --git a/source/android-library/gradle/wrapper/gradle-wrapper.jar b/source/android-library/gradle/wrapper/gradle-wrapper.jar index 7372f72e4..12a08711a 100644 Binary files a/source/android-library/gradle/wrapper/gradle-wrapper.jar and b/source/android-library/gradle/wrapper/gradle-wrapper.jar differ diff --git a/source/android-library/gradle/wrapper/gradle-wrapper.properties b/source/android-library/gradle/wrapper/gradle-wrapper.properties index 354f76394..ee050b283 100644 --- a/source/android-library/gradle/wrapper/gradle-wrapper.properties +++ b/source/android-library/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Feb 13 16:09:10 GMT 2017 +#Wed Jul 12 16:58:21 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip diff --git a/source/android-library/gradlew b/source/android-library/gradlew index 91a7e269e..9d82f7891 100644 --- a/source/android-library/gradlew +++ b/source/android-library/gradlew @@ -42,11 +42,6 @@ case "`uname`" in ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/source/plugin/Assets/GoogleMobileAds/Api/AdRequest.cs b/source/plugin/Assets/GoogleMobileAds/Api/AdRequest.cs index bae5a5685..f00bbdefa 100644 --- a/source/plugin/Assets/GoogleMobileAds/Api/AdRequest.cs +++ b/source/plugin/Assets/GoogleMobileAds/Api/AdRequest.cs @@ -21,7 +21,7 @@ namespace GoogleMobileAds.Api { public class AdRequest { - public const string Version = "3.6.3"; + public const string Version = "3.7.0"; public const string TestDeviceSimulator = "SIMULATOR"; private AdRequest(Builder builder) diff --git a/source/plugin/Assets/GoogleMobileAds/Editor/AdMobDependencies.cs b/source/plugin/Assets/GoogleMobileAds/Editor/AdMobDependencies.cs deleted file mode 100644 index a8598f055..000000000 --- a/source/plugin/Assets/GoogleMobileAds/Editor/AdMobDependencies.cs +++ /dev/null @@ -1,81 +0,0 @@ -// Copyright (C) 2016 Google, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -using System; -using System.Collections.Generic; -using UnityEditor; - -/// AdMob dependencies file. -[InitializeOnLoad] -public class AdMobDependencies : AssetPostprocessor -{ - /// Initializes static members of the class. - static AdMobDependencies() { SetupDeps(); } - - static void SetupDeps() { -#if UNITY_ANDROID - // Setup the resolver using reflection as the module may not be - // available at compile time. - Type playServicesSupport = Google.VersionHandler.FindClass( - "Google.JarResolver", "Google.JarResolver.PlayServicesSupport"); - if (playServicesSupport == null) { - return; - } - object svcSupport = Google.VersionHandler.InvokeStaticMethod( - playServicesSupport, "CreateInstance", - new object[] { - "AdMobUnity", - EditorPrefs.GetString("AndroidSdkRoot"), - "ProjectSettings" - }); - - Google.VersionHandler.InvokeInstanceMethod( - svcSupport, "DependOn", - new object[] { "com.google.android.gms", "play-services-ads", - "LATEST" }, - namedArgs: new Dictionary() { - {"packageIds", new string[] { - "extra-google-m2repository", - "extra-android-m2repository"} }, - {"repositories", null } - }); -#elif UNITY_IOS - Type iosResolver = Google.VersionHandler.FindClass( - "Google.IOSResolver", "Google.IOSResolver"); - if (iosResolver == null) { - return; - } - Google.VersionHandler.InvokeStaticMethod( - iosResolver, "AddPod", - new object[] { "Google-Mobile-Ads-SDK" }, - namedArgs: new Dictionary() { - { "version", "7.13+" } - }); -#endif // UNITY_IOS - } - - // Handle delayed loading of the dependency resolvers. - private static void OnPostprocessAllAssets( - string[] importedAssets, string[] deletedAssets, - string[] movedAssets, string[] movedFromPath) { - foreach (string asset in importedAssets) { - if (asset.Contains("IOSResolver") || - asset.Contains("JarResolver")) { - SetupDeps(); - break; - } - } - } -} - diff --git a/source/plugin/Assets/GoogleMobileAds/Editor/AdMobDependencies.cs.meta b/source/plugin/Assets/GoogleMobileAds/Editor/AdMobDependencies.cs.meta deleted file mode 100644 index 06bc49048..000000000 --- a/source/plugin/Assets/GoogleMobileAds/Editor/AdMobDependencies.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 9c0688026893740a8a9ea5586ee25228 -timeCreated: 1452209314 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/source/plugin/Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml b/source/plugin/Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml new file mode 100644 index 000000000..1e70f8496 --- /dev/null +++ b/source/plugin/Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml @@ -0,0 +1,18 @@ + + + + + https://maven.google.com + + + + + + + + https://github.com/CocoaPods/Specs + + + + + diff --git a/source/plugin/Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml.meta b/source/plugin/Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml.meta new file mode 100644 index 000000000..5879e1b76 --- /dev/null +++ b/source/plugin/Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c9357ed17521401bb7b6733145ebcd9 +timeCreated: 1504855478 +licenseType: Pro +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: