Skip to content

Commit 506972d

Browse files
rampararampara
committed
Version 3.14.0 of the Google Mobile Ads Unity plugin
1 parent 5a37dcd commit 506972d

File tree

37 files changed

+422
-240
lines changed

37 files changed

+422
-240
lines changed

‎ChangeLog.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
11
Google Mobile Ads Unity Plugin Change Log
22

3+
**************
4+
Version 3.14.0
5+
**************
6+
7+
Plugin:
8+
- Fixed Google Play dependencies version conflict with Firebase plugins.
9+
10+
Mediation packages:
11+
- Updated AdColony Unity package to v1.2.1.
12+
- Updated AppLovin Unity package to v3.0.2.
13+
- Updated Chartboost Unity package to v1.1.0.
14+
- Updated Facebook Unity package to v1.1.2.
15+
- Updated InMobi Unity package to v2.1.0.
16+
- Updated IronSource Unity package to v1.0.1.
17+
- Updated Maio Unity package to v1.1.0.
18+
- Updated MoPub Unity package to v2.1.0.
19+
- Updated MyTarget Unity package to v2.1.0.
20+
- Updated Nend Unity package to v1.0.2.
21+
- Updated Tapjoy Unity package to v1.1.1.
22+
- Updated UnityAds Unity package to v1.1.3.
23+
24+
Built and tested with:
25+
- Google Play services 15.0.1
26+
- Google Mobile Ads iOS SDK 7.31.0
27+
- Unity Jar Resolver 1.2.75.0
28+
329
**************
430
Version 3.13.1
531
**************

‎build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ project.ext {
3333
pluginBuildDir = file('temp/plugin-build-dir').absolutePath
3434
exportPath = file('GoogleMobileAds.unitypackage').absolutePath
3535

36-
buildPath = file('temp').absolutePath
37-
resolverDir = file("${buildPath}/jarresolver").absolutePath
36+
tempPath = file('temp').absolutePath
37+
resolverDir = file("${tempPath}/jarresolver").absolutePath
3838
}
3939

4040
// Delete existing android plugin jar file.
@@ -50,7 +50,7 @@ task buildAndroidPluginJar(type: GradleBuild) {
5050

5151
// Move android plugin jar to temporary build directory.
5252
task copyAndroidLibraryJar(type: Copy) {
53-
from("source/android-library/app/build/intermediates/bundles/release/")
53+
from("source/android-library/app/build/intermediates/intermediate-jars/release/")
5454
into("${pluginBuildDir}/Assets/Plugins/Android/GoogleMobileAdsPlugin/libs")
5555
include('classes.jar')
5656
rename('classes.jar', 'unity-plugin-library.jar')
@@ -114,7 +114,7 @@ task createTempBuildFolder(type: Copy) {
114114
}
115115

116116
task clearTempBuildFolder(type:Delete) {
117-
delete {"${buildPath}"}
117+
delete {"${tempPath}"}
118118
}
119119

120120
exportPackage.dependsOn(createTempBuildFolder, copyAndroidLibraryJar,

‎gradle/wrapper/gradle-wrapper.jar

84 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
54
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

‎gradlew.bat

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,84 @@
1-
@if "%DEBUG%" == "" @echo off
2-
@rem ##########################################################################
3-
@rem
4-
@rem Gradle startup script for Windows
5-
@rem
6-
@rem ##########################################################################
7-
8-
@rem Set local scope for the variables with windows NT shell
9-
if "%OS%"=="Windows_NT" setlocal
10-
11-
set DIRNAME=%~dp0
12-
if "%DIRNAME%" == "" set DIRNAME=.
13-
set APP_BASE_NAME=%~n0
14-
set APP_HOME=%DIRNAME%
15-
16-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
18-
19-
@rem Find java.exe
20-
if defined JAVA_HOME goto findJavaFromJavaHome
21-
22-
set JAVA_EXE=java.exe
23-
%JAVA_EXE% -version >NUL 2>&1
24-
if "%ERRORLEVEL%" == "0" goto init
25-
26-
echo.
27-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28-
echo.
29-
echo Please set the JAVA_HOME variable in your environment to match the
30-
echo location of your Java installation.
31-
32-
goto fail
33-
34-
:findJavaFromJavaHome
35-
set JAVA_HOME=%JAVA_HOME:"=%
36-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37-
38-
if exist "%JAVA_EXE%" goto init
39-
40-
echo.
41-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42-
echo.
43-
echo Please set the JAVA_HOME variable in your environment to match the
44-
echo location of your Java installation.
45-
46-
goto fail
47-
48-
:init
49-
@rem Get command-line arguments, handling Windows variants
50-
51-
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
53-
:win9xME_args
54-
@rem Slurp the command line arguments.
55-
set CMD_LINE_ARGS=
56-
set _SKIP=2
57-
58-
:win9xME_args_slurp
59-
if "x%~1" == "x" goto execute
60-
61-
set CMD_LINE_ARGS=%*
62-
63-
:execute
64-
@rem Setup the command line
65-
66-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
67-
68-
@rem Execute Gradle
69-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
70-
71-
:end
72-
@rem End local scope for the variables with windows NT shell
73-
if "%ERRORLEVEL%"=="0" goto mainEnd
74-
75-
:fail
76-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
77-
rem the _cmd.exe /c_ return code!
78-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
79-
exit /b 1
80-
81-
:mainEnd
82-
if "%OS%"=="Windows_NT" endlocal
83-
84-
:omega
1+
@if "%DEBUG%" == "" @echo off
2+
@rem ##########################################################################
3+
@rem
4+
@rem Gradle startup script for Windows
5+
@rem
6+
@rem ##########################################################################
7+
8+
@rem Set local scope for the variables with windows NT shell
9+
if "%OS%"=="Windows_NT" setlocal
10+
11+
set DIRNAME=%~dp0
12+
if "%DIRNAME%" == "" set DIRNAME=.
13+
set APP_BASE_NAME=%~n0
14+
set APP_HOME=%DIRNAME%
15+
16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS=
18+
19+
@rem Find java.exe
20+
if defined JAVA_HOME goto findJavaFromJavaHome
21+
22+
set JAVA_EXE=java.exe
23+
%JAVA_EXE% -version >NUL 2>&1
24+
if "%ERRORLEVEL%" == "0" goto init
25+
26+
echo.
27+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28+
echo.
29+
echo Please set the JAVA_HOME variable in your environment to match the
30+
echo location of your Java installation.
31+
32+
goto fail
33+
34+
:findJavaFromJavaHome
35+
set JAVA_HOME=%JAVA_HOME:"=%
36+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37+
38+
if exist "%JAVA_EXE%" goto init
39+
40+
echo.
41+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42+
echo.
43+
echo Please set the JAVA_HOME variable in your environment to match the
44+
echo location of your Java installation.
45+
46+
goto fail
47+
48+
:init
49+
@rem Get command-line arguments, handling Windows variants
50+
51+
if not "%OS%" == "Windows_NT" goto win9xME_args
52+
53+
:win9xME_args
54+
@rem Slurp the command line arguments.
55+
set CMD_LINE_ARGS=
56+
set _SKIP=2
57+
58+
:win9xME_args_slurp
59+
if "x%~1" == "x" goto execute
60+
61+
set CMD_LINE_ARGS=%*
62+
63+
:execute
64+
@rem Setup the command line
65+
66+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
67+
68+
@rem Execute Gradle
69+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
70+
71+
:end
72+
@rem End local scope for the variables with windows NT shell
73+
if "%ERRORLEVEL%"=="0" goto mainEnd
74+
75+
:fail
76+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
77+
rem the _cmd.exe /c_ return code!
78+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
79+
exit /b 1
80+
81+
:mainEnd
82+
if "%OS%"=="Windows_NT" endlocal
83+
84+
:omega

‎mediation/AppLovin/source/plugin/Assets/Plugins/Android/GoogleMobileAdsAppLovinMediation/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.google.unity.mediation.AppLovin">
44

5+
<uses-sdk
6+
android:minSdkVersion="14"
7+
android:targetSdkVersion="26" />
8+
59
<application>
610

711
<!--<meta-data

‎mediation/Chartboost/source/plugin/Assets/Plugins/Android/GoogleMobileAdsChartboostMediation/AndroidManifest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.google.unity.mediation.chartboost">
44

5+
<uses-sdk
6+
android:minSdkVersion="14"
7+
android:targetSdkVersion="26" />
8+
59
<application>
610
<activity
711
android:name="com.chartboost.sdk.CBImpressionActivity"
@@ -11,4 +15,4 @@
1115
android:configChanges="keyboardHidden|orientation|screenSize" />
1216
</application>
1317

14-
</manifest>
18+
</manifest>

‎mediation/IronSource/source/plugin/Assets/Plugins/Android/GoogleMobileAdsChartboostMediation/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.google.unity.mediation.ironsource">
44

5+
<uses-sdk
6+
android:minSdkVersion="14"
7+
android:targetSdkVersion="26" />
8+
59
<application>
610
<activity android:name="com.ironsource.sdk.controller.ControllerActivity"
711
android:configChanges="orientation|screenSize"

‎mediation/Maio/source/plugin/Assets/Plugins/Android/GoogleMobileAdsMaioMediation/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.google.unity.mediation.maio">
44

5+
<uses-sdk
6+
android:minSdkVersion="14"
7+
android:targetSdkVersion="26" />
8+
59
<application>
610
<activity
711
android:name="jp.maio.sdk.android.AdFullscreenActivity"

‎mediation/MoPub/source/plugin/Assets/Plugins/Android/GoogleMobileAdsMoPubMediation/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.google.unity.mediation.inmobi">
55

6+
<uses-sdk
7+
android:minSdkVersion="16"
8+
android:targetSdkVersion="26" />
9+
610
<application>
711
<activity
812
android:name="com.mopub.common.privacy.ConsentDialogActivity"

‎mediation/Tapjoy/source/plugin/Assets/Plugins/Android/GoogleMobileAdsTapjoyMediation/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.google.unity.mediation.Tapjoy">
44

5+
<uses-sdk
6+
android:minSdkVersion="14"
7+
android:targetSdkVersion="26" />
8+
59
<application>
610

711
<activity

‎mediation/Vungle/source/android-library/gradle/wrapper/gradle-wrapper.jar

84 Bytes
Binary file not shown.

‎mediation/Vungle/source/android-library/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Nov 02 14:27:25 PDT 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 commit comments

Comments
 (0)